Merge branch 'master' into update_node-uuid_1.4.8

Author: m4dcoder

package.json

@@ -71,11 +71,12 @@
     "acorn": "^6.4.1",
     "axios": "^0.24.0",
     "elliptic": "^6.5.4",
+    "glob-parent": "^6.0.2",
     "js-yaml": "^3.13.1",
     "kind-of": "^6.0.3",
     "lodash": "4.17.21",
     "lodash.template": "^4.5.0",
-    "minimatch": "^3.0.2",
+    "minimatch": "^3.0.4",
     "mixin-deep": "^1.3.2",
     "moment": "2.24.0",
     "node": "^14.16.1",
@@ -87,6 +88,7 @@
     "react-redux": "7.0.2",
     "redux": "^4.0.1",
     "set-value": "^4.1.0",
+    "trim-newlines": "^4.0.2",
     "tar": "^6.1.11",
     "urijs": "^1.19.7",
     "websocket-extensions": "^0.1.4"

yarn.lock

@@ -5527,6 +5527,13 @@ glob-parent@^5.0.0:
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+    
 glob-stream@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
@@ -7995,7 +8002,7 @@ [email protected]:
     lru-cache "2"
     sigmund "~1.0.0"
 
-[email protected], minimatch@^3.0.2, minimatch@^3.0.4:
+[email protected], minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -11891,6 +11898,11 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
+trim-newlines@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.0.2.tgz#d6aaaf6a0df1b4b536d183879a6b939489808c7c"
+  integrity sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==
+  
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"