From b99b9d68e9c12f12de5051e261016ecf913deb36 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Wed, 15 Nov 2023 14:03:31 -0800 Subject: [PATCH] chore: don't pin packager, @electron/get -> 3.0.0 --- package.json | 4 +-- packages/api/cli/package.json | 2 +- packages/api/core/package.json | 4 +-- packages/api/core/src/api/import.ts | 2 +- packages/plugin/webpack/package.json | 2 +- packages/utils/types/package.json | 2 +- yarn.lock | 47 +++------------------------- 7 files changed, 12 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index bca088aaf1..f105076306 100644 --- a/package.json +++ b/package.json @@ -36,10 +36,10 @@ "@aws-sdk/lib-storage": "^3.28.0", "@aws-sdk/types": "^3.25.0", "@doyensec/electronegativity": "^1.9.1", - "@electron/get": "^2.0.0", + "@electron/get": "^3.0.0", "@electron/osx-sign": "^1.0.5", "@electron/rebuild": "^3.2.10", - "@electron/packager": "18.0.0", + "@electron/packager": "^18.0.0", "@malept/cross-spawn-promise": "^2.0.0", "@octokit/core": "^3.2.4", "@octokit/plugin-retry": "^3.0.9", diff --git a/packages/api/cli/package.json b/packages/api/cli/package.json index ac55ecfc75..e43b5c2e12 100644 --- a/packages/api/cli/package.json +++ b/packages/api/cli/package.json @@ -19,7 +19,7 @@ "dependencies": { "@electron-forge/core": "6.4.2", "@electron-forge/shared-types": "6.4.2", - "@electron/get": "^2.0.0", + "@electron/get": "^3.0.0", "chalk": "^4.0.0", "commander": "^4.1.1", "debug": "^4.3.1", diff --git a/packages/api/core/package.json b/packages/api/core/package.json index 2034124079..c6d34b4c59 100644 --- a/packages/api/core/package.json +++ b/packages/api/core/package.json @@ -51,8 +51,8 @@ "@electron-forge/template-webpack": "6.4.2", "@electron-forge/template-webpack-typescript": "6.4.2", "@electron-forge/tracer": "6.4.2", - "@electron/get": "^2.0.0", - "@electron/packager": "18.0.0", + "@electron/get": "^3.0.0", + "@electron/packager": "^18.0.0", "@electron/rebuild": "^3.2.10", "@malept/cross-spawn-promise": "^2.0.0", "chalk": "^4.0.0", diff --git a/packages/api/core/src/api/import.ts b/packages/api/core/src/api/import.ts index b8a3de1375..031dbc1453 100644 --- a/packages/api/core/src/api/import.ts +++ b/packages/api/core/src/api/import.ts @@ -267,4 +267,4 @@ export default autoTrace( await runner.run(); } -); \ No newline at end of file +); diff --git a/packages/plugin/webpack/package.json b/packages/plugin/webpack/package.json index 05ef61a55d..93f51ff319 100644 --- a/packages/plugin/webpack/package.json +++ b/packages/plugin/webpack/package.json @@ -11,7 +11,7 @@ "test": "xvfb-maybe mocha --config ../../../.mocharc.js test/**/*_spec.ts test/*_spec.ts" }, "devDependencies": { - "@electron/packager": "18.0.0", + "@electron/packager": "^18.0.0", "@malept/cross-spawn-promise": "^2.0.0", "@types/node": "^18.0.3", "chai": "^4.3.3", diff --git a/packages/utils/types/package.json b/packages/utils/types/package.json index 8f85d181af..8fb2af59e1 100644 --- a/packages/utils/types/package.json +++ b/packages/utils/types/package.json @@ -9,7 +9,7 @@ "typings": "dist/index.d.ts", "dependencies": { "@electron-forge/tracer": "6.4.2", - "@electron/packager": "18.0.0", + "@electron/packager": "^18.0.0", "@electron/rebuild": "^3.2.10", "listr2": "^5.0.3" }, diff --git a/yarn.lock b/yarn.lock index 0627d94972..baa7091b67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1213,22 +1213,6 @@ fs-extra "^9.0.1" minimist "^1.2.5" -"@electron/get@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.0.tgz#d991e68dc089fc66b521ec3ca4021515482bef91" - integrity sha512-d0XfNGayKLrYRqddW4f2Zdjaj71LfvZlCnUN8ojyNMr7WD8v6B+fqdCV8Etnwn/vUfFWFwMk/HtLEFZy01h4tQ== - dependencies: - debug "^4.1.1" - env-paths "^2.2.0" - fs-extra "^8.1.0" - got "^11.8.5" - progress "^2.0.3" - semver "^6.2.0" - sumchecker "^3.0.1" - optionalDependencies: - global-agent "^3.0.0" - global-tunnel-ng "^2.7.1" - "@electron/get@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@electron/get/-/get-3.0.0.tgz#2b0c794b98902d0bc5218546872c1379bef68aa2" @@ -1284,7 +1268,7 @@ minimist "^1.2.6" plist "^3.0.5" -"@electron/packager@18.0.0": +"@electron/packager@^18.0.0": version "18.0.0" resolved "https://registry.yarnpkg.com/@electron/packager/-/packager-18.0.0.tgz#073e2b82be44b1bd5e186992ad92f9e41461aad4" integrity sha512-OihHRTSkMiAuiZISN8h6azFRXgWqLWY/S1OpGru3sBB9Q4lQ0gD3WbqP7MSpFKEFcOozDvIB4LZUyAsfJIRQBg== @@ -4718,7 +4702,7 @@ concat-stream@^2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" -config-chain@^1.1.11, config-chain@^1.1.12: +config-chain@^1.1.12: version "1.1.13" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== @@ -5475,7 +5459,7 @@ encode-utf8@^1.0.3: resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda" integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw== -encodeurl@^1.0.2, encodeurl@~1.0.2: +encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= @@ -7140,16 +7124,6 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" -global-tunnel-ng@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" - globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -8492,7 +8466,7 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== -lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: +lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -9546,14 +9520,6 @@ npm-bundled@^2.0.0: dependencies: npm-normalize-package-bin "^2.0.0" -npm-conf@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== - dependencies: - config-chain "^1.1.11" - pify "^3.0.0" - npm-install-checks@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234" @@ -11952,11 +11918,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"