diff --git a/package-lock.json b/package-lock.json index 53f559bd..a69f5f72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1777,9 +1777,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "15.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz", - "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==" + "version": "16.11.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.29.tgz", + "integrity": "sha512-9dDdonLyPJQJ/kdOlDxAah+bTI+u2ccF3k62FErhquDuggoCX6piWez7j7o6yNE+rP2IRcZVQ6Tw4N0P38+rWA==" }, "node_modules/@types/node-fetch": { "version": "2.5.12", @@ -6856,14 +6856,14 @@ } }, "node_modules/electron": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-13.3.0.tgz", - "integrity": "sha512-d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA==", + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-18.1.0.tgz", + "integrity": "sha512-P55wdHNTRMo7a/agC84ZEZDYEK/pTBcQdlp8lFbHcx3mO4Kr+Im/J5p2uQgiuXtown31HqNh2paL3V0p+E6rpQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@electron/get": "^1.0.1", - "@types/node": "^14.6.2", + "@electron/get": "^1.13.0", + "@types/node": "^16.11.26", "extract-zip": "^1.0.3" }, "bin": { @@ -7130,12 +7130,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "node_modules/electron/node_modules/@types/node": { - "version": "14.17.32", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz", - "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==", - "dev": true - }, "node_modules/elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -21808,7 +21802,7 @@ "@polymer/paper-tooltip": "^3.0.0", "@sentry/electron": "^2", "@webcomponents/webcomponentsjs": "^2.0.0", - "circle-flags": "git+ssh://git@github.com/HatScripts/circle-flags.git#f1913a16694e8d19daa88d59e61886b762313c2d", + "circle-flags": "https://github.com/HatScripts/circle-flags", "clipboard-polyfill": "^2.4.6", "dotenv": "~8.2.0", "electron-updater": "^4.1.2", @@ -21822,7 +21816,7 @@ "web-animations-js": "^2.3.1" }, "devDependencies": { - "@types/node": "^15.12.2", + "@types/node": "^16.11.29", "@types/node-forge": "^0.6.9", "@types/polymer": "^1.2.9", "@types/puppeteer": "^5.4.2", @@ -21830,7 +21824,7 @@ "@types/semver": "^5.5.0", "copy-webpack-plugin": "^5.1.1", "css-loader": "^3.5.3", - "electron": "13.3.0", + "electron": "18.1.0", "electron-builder": "~22.10.5", "electron-icon-maker": "^0.0.4", "electron-notarize": "^0.2.1", @@ -21863,7 +21857,7 @@ "ip-regex": "^4.1.0", "js-yaml": "^3.12.0", "node-fetch": "^2.6.7", - "outline-shadowsocksconfig": "git+ssh://git@github.com/Jigsaw-Code/outline-shadowsocksconfig.git#add590ed57277653d02dd2031ae301500ae881e1", + "outline-shadowsocksconfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.0", "prom-client": "^11.1.3", "randomstring": "^1.1.5", "restify": "^8.5.1", @@ -23465,9 +23459,9 @@ "dev": true }, "@types/node": { - "version": "15.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz", - "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==" + "version": "16.11.29", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.29.tgz", + "integrity": "sha512-9dDdonLyPJQJ/kdOlDxAah+bTI+u2ccF3k62FErhquDuggoCX6piWez7j7o6yNE+rP2IRcZVQ6Tw4N0P38+rWA==" }, "@types/node-fetch": { "version": "2.5.12", @@ -27598,22 +27592,14 @@ } }, "electron": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-13.3.0.tgz", - "integrity": "sha512-d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA==", + "version": "18.1.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-18.1.0.tgz", + "integrity": "sha512-P55wdHNTRMo7a/agC84ZEZDYEK/pTBcQdlp8lFbHcx3mO4Kr+Im/J5p2uQgiuXtown31HqNh2paL3V0p+E6rpQ==", "dev": true, "requires": { - "@electron/get": "^1.0.1", - "@types/node": "^14.6.2", + "@electron/get": "^1.13.0", + "@types/node": "^16.11.26", "extract-zip": "^1.0.3" - }, - "dependencies": { - "@types/node": { - "version": "14.17.32", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.32.tgz", - "integrity": "sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==", - "dev": true - } } }, "electron-builder": { @@ -33532,19 +33518,19 @@ "@polymer/paper-toast": "^3.0.0", "@polymer/paper-tooltip": "^3.0.0", "@sentry/electron": "^2", - "@types/node": "^15.12.2", + "@types/node": "^16.11.29", "@types/node-forge": "^0.6.9", "@types/polymer": "^1.2.9", "@types/puppeteer": "^5.4.2", "@types/request": "^2.47.1", "@types/semver": "^5.5.0", "@webcomponents/webcomponentsjs": "^2.0.0", - "circle-flags": "git+ssh://git@github.com/HatScripts/circle-flags.git#f1913a16694e8d19daa88d59e61886b762313c2d", + "circle-flags": "https://github.com/HatScripts/circle-flags", "clipboard-polyfill": "^2.4.6", "copy-webpack-plugin": "^5.1.1", "css-loader": "^3.5.3", "dotenv": "~8.2.0", - "electron": "13.3.0", + "electron": "18.1.0", "electron-builder": "~22.10.5", "electron-icon-maker": "^0.0.4", "electron-notarize": "^0.2.1", @@ -33600,7 +33586,7 @@ "ip-regex": "^4.1.0", "js-yaml": "^3.12.0", "node-fetch": "^2.6.7", - "outline-shadowsocksconfig": "git+ssh://git@github.com/Jigsaw-Code/outline-shadowsocksconfig.git#add590ed57277653d02dd2031ae301500ae881e1", + "outline-shadowsocksconfig": "github:Jigsaw-Code/outline-shadowsocksconfig#v0.2.0", "prom-client": "^11.1.3", "randomstring": "^1.1.5", "restify": "^8.5.1", diff --git a/src/server_manager/electron_app/index.ts b/src/server_manager/electron_app/index.ts index aaf2838f..220a7305 100644 --- a/src/server_manager/electron_app/index.ts +++ b/src/server_manager/electron_app/index.ts @@ -74,7 +74,6 @@ function createMainWindow() { webPreferences: { nodeIntegration: false, preload: path.join(__dirname, 'preload.js'), - nativeWindowOpen: true, webviewTag: false, }, }); diff --git a/src/server_manager/electron_app/tsconfig.json b/src/server_manager/electron_app/tsconfig.json index 7bf1a31b..fb3d3aa7 100644 --- a/src/server_manager/electron_app/tsconfig.json +++ b/src/server_manager/electron_app/tsconfig.json @@ -1,11 +1,11 @@ { "compilerOptions": { - "target": "es2016", + "target": "es2021", "removeComments": false, "noImplicitAny": true, "module": "commonjs", "rootDir": ".", - "lib": ["dom", "es2016"] + "lib": ["dom", "es2021"] }, "include": ["*.ts", "../types/*.d.ts"], "exclude": ["node_modules"], diff --git a/src/server_manager/package.json b/src/server_manager/package.json index c3bf45c6..c9970bdc 100644 --- a/src/server_manager/package.json +++ b/src/server_manager/package.json @@ -70,7 +70,7 @@ "PUPPETEER_CHROMIUM_REVISION": "870763" }, "devDependencies": { - "@types/node": "^15.12.2", + "@types/node": "^16.11.29", "@types/node-forge": "^0.6.9", "@types/polymer": "^1.2.9", "@types/puppeteer": "^5.4.2", @@ -78,7 +78,7 @@ "@types/semver": "^5.5.0", "copy-webpack-plugin": "^5.1.1", "css-loader": "^3.5.3", - "electron": "13.3.0", + "electron": "18.1.0", "electron-builder": "~22.10.5", "electron-icon-maker": "^0.0.4", "electron-notarize": "^0.2.1",