diff --git a/client/package.json b/client/package.json index 816500fa43..2c720a1024 100644 --- a/client/package.json +++ b/client/package.json @@ -45,7 +45,7 @@ "auto-launch": "^5.0.5", "cordova-plugin-splashscreen": "^6.0.0", "cordova-plugin-statusbar": "^2.2.3", - "electron-updater": "^5.0.5", + "electron-updater": "^6.3.0", "fs-extra": "^11.2.0", "lit": "^2.2.2", "ShadowsocksConfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.1", diff --git a/package-lock.json b/package-lock.json index 73049e944a..40f6e02f65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,10 +80,10 @@ "auto-launch": "^5.0.5", "cordova-plugin-splashscreen": "^6.0.0", "cordova-plugin-statusbar": "^2.2.3", - "electron-updater": "^5.0.5", + "electron-updater": "^6.3.0", "fs-extra": "^11.2.0", "lit": "^2.2.2", - "ShadowsocksConfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.1", + "ShadowsocksConfig": "git+ssh://git@github.com/Jigsaw-Code/outline-shadowsocksconfig.git#6d01c4b1beae3a3bc2a1074e5e310dfa023be57d", "socks": "^1.1.10", "sudo-prompt": "^9.2.1", "uuidv4": "^4.0.0", @@ -114,12 +114,12 @@ "copy-webpack-plugin": "^5.1.1", "cordova-android": "^11.0.0", "cordova-browser": "~6.0.0", - "cordova-ios": "github:apache/cordova-ios#1a5cd45e2243b239b5045a0ade9d2da1d779b72a", + "cordova-ios": "git+ssh://git@github.com/apache/cordova-ios.git#1a5cd45e2243b239b5045a0ade9d2da1d779b72a", "cordova-lib": "^11.0.0", - "cordova-osx": "github:apache/cordova-osx", - "cordova-plugin-clipboard": "github:Jigsaw-Code/outline-cordova-plugin-clipboard#v2.0.0", + "cordova-osx": "git+ssh://git@github.com/apache/cordova-osx.git#16b56e4a9297c5195a06a57450aeb983e7053184", + "cordova-plugin-clipboard": "git+ssh://git@github.com/Jigsaw-Code/outline-cordova-plugin-clipboard.git#8cc5101b7a264122c71f7f3a3cb5744a8fad8498", "cordova-plugin-outline": "file:src/cordova/plugin", - "cordova-webintent": "github:cordova-misc/cordova-webintent#v2.0.0", + "cordova-webintent": "git+ssh://git@github.com/cordova-misc/cordova-webintent.git#6c045cece3e49e4dd061d56fc15569053e9a0c4a", "css-loader": "^5.0.1", "deepmerge": "^4.3.1", "electron": "19.1.9", @@ -9561,7 +9561,8 @@ "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==" + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", + "dev": true }, "node_modules/@types/send": { "version": "0.17.4", @@ -13103,6 +13104,7 @@ "version": "9.1.1", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz", "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==", + "dev": true, "dependencies": { "debug": "^4.3.4", "sax": "^1.2.4" @@ -17525,19 +17527,30 @@ "dev": true }, "node_modules/electron-updater": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.3.0.tgz", - "integrity": "sha512-iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.3.0.tgz", + "integrity": "sha512-3Xlezhk+dKaSQrOnkQNqCGiuGSSUPO9BV9TQZ4Iig6AyTJ4FzJONE5gFFc382sY53Sh9dwJfzKsA3DxRHt2btw==", "dependencies": { - "@types/semver": "^7.3.6", - "builder-util-runtime": "9.1.1", - "fs-extra": "^10.0.0", + "builder-util-runtime": "9.2.5", + "fs-extra": "^10.1.0", "js-yaml": "^4.1.0", "lazy-val": "^1.0.5", "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", - "semver": "^7.3.5", - "typed-emitter": "^2.1.0" + "semver": "^7.3.8", + "tiny-typed-emitter": "^2.1.0" + } + }, + "node_modules/electron-updater/node_modules/builder-util-runtime": { + "version": "9.2.5", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz", + "integrity": "sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==", + "dependencies": { + "debug": "^4.3.4", + "sax": "^1.2.4" + }, + "engines": { + "node": ">=12.0.0" } }, "node_modules/electron-updater/node_modules/fs-extra": { @@ -32442,14 +32455,6 @@ "aproba": "^1.1.1" } }, - "node_modules/rxjs": { - "version": "7.5.6", - "license": "Apache-2.0", - "optional": true, - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/safe-array-concat": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", @@ -34924,6 +34929,11 @@ "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", "dev": true }, + "node_modules/tiny-typed-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", + "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==" + }, "node_modules/tinyspy": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz", @@ -35477,13 +35487,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/typed-emitter": { - "version": "2.1.0", - "license": "MIT", - "optionalDependencies": { - "rxjs": "*" - } - }, "node_modules/typedarray": { "version": "0.0.6", "dev": true, @@ -37702,10 +37705,10 @@ "@polymer/polymer": "^3.5.1", "@sentry/electron": "^4.17.0", "@webcomponents/webcomponentsjs": "^2.8.0", - "circle-flags": "github:HatScripts/circle-flags", + "circle-flags": "git+ssh://git@github.com/HatScripts/circle-flags.git#7b0dc8acd3b1c5994281832b9f03cc7c537617c5", "clipboard-polyfill": "^2.8.6", "dotenv": "~8.2.0", - "electron-updater": "^4.6.5", + "electron-updater": "^6.3.0", "express": "^4.18.2", "google-auth-library": "^8.9.0", "intl-messageformat": "^7.8.4", @@ -38670,18 +38673,6 @@ "ajv": "^8.8.2" } }, - "server_manager/node_modules/builder-util-runtime": { - "version": "8.9.2", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz", - "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==", - "dependencies": { - "debug": "^4.3.2", - "sax": "^1.2.4" - }, - "engines": { - "node": ">=12.0.0" - } - }, "server_manager/node_modules/commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", @@ -38857,39 +38848,6 @@ "node": ">=8" } }, - "server_manager/node_modules/electron-updater": { - "version": "4.6.5", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.5.tgz", - "integrity": "sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==", - "dependencies": { - "@types/semver": "^7.3.6", - "builder-util-runtime": "8.9.2", - "fs-extra": "^10.0.0", - "js-yaml": "^4.1.0", - "lazy-val": "^1.0.5", - "lodash.escaperegexp": "^4.1.2", - "lodash.isequal": "^4.5.0", - "semver": "^7.3.5" - } - }, - "server_manager/node_modules/electron-updater/node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==" - }, - "server_manager/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, "server_manager/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -43613,19 +43571,19 @@ "copy-webpack-plugin": "^5.1.1", "cordova-android": "^11.0.0", "cordova-browser": "~6.0.0", - "cordova-ios": "github:apache/cordova-ios#1a5cd45e2243b239b5045a0ade9d2da1d779b72a", + "cordova-ios": "git+ssh://git@github.com/apache/cordova-ios.git#1a5cd45e2243b239b5045a0ade9d2da1d779b72a", "cordova-lib": "^11.0.0", - "cordova-osx": "github:apache/cordova-osx", - "cordova-plugin-clipboard": "github:Jigsaw-Code/outline-cordova-plugin-clipboard#v2.0.0", + "cordova-osx": "git+ssh://git@github.com/apache/cordova-osx.git#16b56e4a9297c5195a06a57450aeb983e7053184", + "cordova-plugin-clipboard": "git+ssh://git@github.com/Jigsaw-Code/outline-cordova-plugin-clipboard.git#8cc5101b7a264122c71f7f3a3cb5744a8fad8498", "cordova-plugin-outline": "file:src/cordova/plugin", "cordova-plugin-splashscreen": "^6.0.0", "cordova-plugin-statusbar": "^2.2.3", - "cordova-webintent": "github:cordova-misc/cordova-webintent#v2.0.0", + "cordova-webintent": "git+ssh://git@github.com/cordova-misc/cordova-webintent.git#6c045cece3e49e4dd061d56fc15569053e9a0c4a", "css-loader": "^5.0.1", "deepmerge": "^4.3.1", "electron": "19.1.9", "electron-builder": "^23.6.0", - "electron-updater": "^5.0.5", + "electron-updater": "^6.3.0", "eslint": "^8.15.0", "eslint-import-resolver-typescript": "^3.4.0", "eslint-plugin-compat": "^4.0.2", @@ -43657,7 +43615,7 @@ "replace-in-file": "^6.3.5", "rimraf": "^2.7.1", "rmfr": "^2.0.0", - "ShadowsocksConfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.1", + "ShadowsocksConfig": "git+ssh://git@github.com/Jigsaw-Code/outline-shadowsocksconfig.git#6d01c4b1beae3a3bc2a1074e5e310dfa023be57d", "socks": "^1.1.10", "style-loader": "^2.0.0", "sudo-prompt": "^9.2.1", @@ -44152,7 +44110,7 @@ "@types/request": "^2.47.1", "@types/semver": "^5.5.0", "@webcomponents/webcomponentsjs": "^2.8.0", - "circle-flags": "github:HatScripts/circle-flags", + "circle-flags": "git+ssh://git@github.com/HatScripts/circle-flags.git#7b0dc8acd3b1c5994281832b9f03cc7c537617c5", "clipboard-polyfill": "^2.8.6", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", @@ -44161,7 +44119,7 @@ "electron-builder": "^24.9.1", "electron-notarize": "^1.2.1", "electron-to-chromium": "^1.4.328", - "electron-updater": "^4.6.5", + "electron-updater": "^6.3.0", "express": "^4.18.2", "google-auth-library": "^8.9.0", "gulp": "^4.0.0", @@ -45096,15 +45054,6 @@ "fast-deep-equal": "^3.1.3" } }, - "builder-util-runtime": { - "version": "8.9.2", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz", - "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==", - "requires": { - "debug": "^4.3.2", - "sax": "^1.2.4" - } - }, "commander": { "version": "10.0.1", "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", @@ -45202,38 +45151,6 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, - "electron-updater": { - "version": "4.6.5", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.5.tgz", - "integrity": "sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==", - "requires": { - "@types/semver": "^7.3.6", - "builder-util-runtime": "8.9.2", - "fs-extra": "^10.0.0", - "js-yaml": "^4.1.0", - "lazy-val": "^1.0.5", - "lodash.escaperegexp": "^4.1.2", - "lodash.isequal": "^4.5.0", - "semver": "^7.3.5" - }, - "dependencies": { - "@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==" - } - } - }, - "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, "glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -47769,7 +47686,8 @@ "@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==" + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", + "dev": true }, "@types/send": { "version": "0.17.4", @@ -50429,6 +50347,7 @@ "version": "9.1.1", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz", "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==", + "dev": true, "requires": { "debug": "^4.3.4", "sax": "^1.2.4" @@ -53639,21 +53558,29 @@ "dev": true }, "electron-updater": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.3.0.tgz", - "integrity": "sha512-iKEr7yQBcvnQUPnSDYGSWC9t0eF2YbZWeYYYZzYxdl+HiRejXFENjYMnYjoOm2zxyD6Cr2JTHZhp9pqxiXuCOw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.3.0.tgz", + "integrity": "sha512-3Xlezhk+dKaSQrOnkQNqCGiuGSSUPO9BV9TQZ4Iig6AyTJ4FzJONE5gFFc382sY53Sh9dwJfzKsA3DxRHt2btw==", "requires": { - "@types/semver": "^7.3.6", - "builder-util-runtime": "9.1.1", - "fs-extra": "^10.0.0", + "builder-util-runtime": "9.2.5", + "fs-extra": "^10.1.0", "js-yaml": "^4.1.0", "lazy-val": "^1.0.5", "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", - "semver": "^7.3.5", - "typed-emitter": "^2.1.0" + "semver": "^7.3.8", + "tiny-typed-emitter": "^2.1.0" }, "dependencies": { + "builder-util-runtime": { + "version": "9.2.5", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz", + "integrity": "sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==", + "requires": { + "debug": "^4.3.4", + "sax": "^1.2.4" + } + }, "fs-extra": { "version": "10.1.0", "requires": { @@ -64527,13 +64454,6 @@ "aproba": "^1.1.1" } }, - "rxjs": { - "version": "7.5.6", - "optional": true, - "requires": { - "tslib": "^2.1.0" - } - }, "safe-array-concat": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", @@ -66397,6 +66317,11 @@ "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", "dev": true }, + "tiny-typed-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", + "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==" + }, "tinyspy": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz", @@ -66795,12 +66720,6 @@ "possible-typed-array-names": "^1.0.0" } }, - "typed-emitter": { - "version": "2.1.0", - "requires": { - "rxjs": "*" - } - }, "typedarray": { "version": "0.0.6", "dev": true diff --git a/server_manager/package.json b/server_manager/package.json index 8dc70ae6a6..95a81672ca 100644 --- a/server_manager/package.json +++ b/server_manager/package.json @@ -57,7 +57,7 @@ "circle-flags": "github:HatScripts/circle-flags", "clipboard-polyfill": "^2.8.6", "dotenv": "~8.2.0", - "electron-updater": "^4.6.5", + "electron-updater": "^6.3.0", "express": "^4.18.2", "google-auth-library": "^8.9.0", "intl-messageformat": "^7.8.4",