From ad5993b94f6caf5f29f09d1d5a6ff6f9974a5832 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 3 Mar 2021 20:58:33 +0100 Subject: [PATCH] bumepd node-abi --- app/package.json | 5 ++++- app/patches/node-abi+2.19.3.patch | 12 ------------ app/yarn.lock | 9 ++++++++- package.json | 2 +- patches/node-abi+2.19.3.patch | 12 ------------ yarn.lock | 8 ++++---- 6 files changed, 17 insertions(+), 31 deletions(-) delete mode 100644 app/patches/node-abi+2.19.3.patch delete mode 100644 patches/node-abi+2.19.3.patch diff --git a/app/package.json b/app/package.json index 5a62f3a9..618d764d 100644 --- a/app/package.json +++ b/app/package.json @@ -50,7 +50,7 @@ "devDependencies": { "@types/mz": "0.0.32", "@types/node": "14.14.14", - "node-abi": "2.19.3", + "node-abi": "^2.19.3", "source-map-support": "^0.5.19" }, "peerDependencies": { @@ -61,5 +61,8 @@ "terminus-settings": "*", "terminus-ssh": "*", "terminus-terminal": "*" + }, + "resolutions": { + "*/node-abi": "^2.20.0" } } diff --git a/app/patches/node-abi+2.19.3.patch b/app/patches/node-abi+2.19.3.patch deleted file mode 100644 index 991eab73..00000000 --- a/app/patches/node-abi+2.19.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/node-abi/abi_registry.json b/node_modules/node-abi/abi_registry.json -index bc1436d..630c1b7 100644 ---- a/node_modules/node-abi/abi_registry.json -+++ b/node_modules/node-abi/abi_registry.json -@@ -94,6 +94,6 @@ - "future": true, - "lts": false, - "runtime": "electron", -- "target": "12.0.0-nightly.20201013" -+ "target": "12.0.0" - } - ] diff --git a/app/yarn.lock b/app/yarn.lock index 7b3e48ca..1cc7393a 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -2108,7 +2108,14 @@ ngx-toastr@^12.0.1: dependencies: tslib "^1.10.0" -node-abi@2.19.3, node-abi@^2.7.0: +node-abi@^2.19.3, node-abi@^2.20.0: + version "2.20.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.20.0.tgz#0659ee1a4a04dacabd3ac4429fac6297ed58e92e" + integrity sha512-6ldtfVR5l3RS8D0aT+lj/uM2Vv/PGEkeWzt2tl8DFBsGY/IuVnAIHl+dG6C14NlWClVv7Rn2+ZDvox+35Hx2Kg== + dependencies: + semver "^5.4.1" + +node-abi@^2.7.0: version "2.19.3" resolved "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz" integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg== diff --git a/package.json b/package.json index 6589f7cb..e5d0fb85 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "yaml-loader": "0.6.0" }, "resolutions": { - "*/node-abi": "^2.19.3", + "*/node-abi": "^2.20.0", "**/graceful-fs": "^4.2.4" }, "scripts": { diff --git a/patches/node-abi+2.19.3.patch b/patches/node-abi+2.19.3.patch deleted file mode 100644 index 991eab73..00000000 --- a/patches/node-abi+2.19.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/node-abi/abi_registry.json b/node_modules/node-abi/abi_registry.json -index bc1436d..630c1b7 100644 ---- a/node_modules/node-abi/abi_registry.json -+++ b/node_modules/node-abi/abi_registry.json -@@ -94,6 +94,6 @@ - "future": true, - "lts": false, - "runtime": "electron", -- "target": "12.0.0-nightly.20201013" -+ "target": "12.0.0" - } - ] diff --git a/yarn.lock b/yarn.lock index a1f7c25b..44b25b0e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5290,9 +5290,9 @@ no-case@^3.0.4: tslib "^2.0.3" node-abi@^2.19.2, node-abi@^2.19.3: - version "2.19.3" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d" - integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg== + version "2.20.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.20.0.tgz#0659ee1a4a04dacabd3ac4429fac6297ed58e92e" + integrity sha512-6ldtfVR5l3RS8D0aT+lj/uM2Vv/PGEkeWzt2tl8DFBsGY/IuVnAIHl+dG6C14NlWClVv7Rn2+ZDvox+35Hx2Kg== dependencies: semver "^5.4.1" @@ -7212,7 +7212,7 @@ semver-diff@^3.1.1: "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: