diff options
| -rw-r--r-- | .yarnrc | 2 | ||||
| -rw-r--r-- | build/builtin/main.js | 3 | ||||
| -rw-r--r-- | cgmanifest.json | 12 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | remote/.yarnrc | 2 | ||||
| -rw-r--r-- | src/vs/platform/issue/electron-main/issueMainService.ts | 1 | ||||
| -rw-r--r-- | src/vs/platform/sharedProcess/electron-main/sharedProcess.ts | 1 | ||||
| -rw-r--r-- | src/vs/platform/windows/electron-main/window.ts | 1 | ||||
| -rw-r--r-- | test/unit/electron/index.js | 3 | ||||
| -rw-r--r-- | yarn.lock | 8 |
10 files changed, 15 insertions, 20 deletions
@@ -1,4 +1,4 @@ disturl "https://electronjs.org/headers" -target "17.4.6" +target "18.0.0-beta.4" runtime "electron" build_from_source "true" diff --git a/build/builtin/main.js b/build/builtin/main.js index b1842e9a595..f4dbc6e8325 100644 --- a/build/builtin/main.js +++ b/build/builtin/main.js @@ -30,8 +30,7 @@ app.once('ready', () => { webPreferences: { nodeIntegration: true, contextIsolation: false, - enableWebSQL: false, - nativeWindowOpen: true + enableWebSQL: false } }); window.setMenuBarVisibility(false); diff --git a/cgmanifest.json b/cgmanifest.json index f87b67727c9..3cca530fade 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "e2aa76f05f3a6ccadbf43e37f5dfc195cc090b6a" + "commitHash": "20d57147be17d551f68ae56b649d7f529cd104bd" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "98.0.4758.141" + "version": "100.0.4894.0" }, { "component": { @@ -48,11 +48,11 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "40ecd5601193c316e62e9216e8a4259130686208" + "commitHash": "acb71eab779fb56bf70e8a9e0cb2e82a089a87de" } }, "isOnlyProductionDependency": true, - "version": "16.13.0" + "version": "16.13.2" }, { "component": { @@ -60,12 +60,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "3a1945bd6c62459a457bd8d0b922259234816e22" + "commitHash": "fc3172dd2a6a0f0e8289a5e72483c66d559b65a2" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "17.4.6" + "version": "18.0.0-beta.4" }, { "component": { diff --git a/package.json b/package.json index 01aa643010c..ce790b16ea6 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "cssnano": "^4.1.11", "debounce": "^1.0.0", "deemon": "^1.4.0", - "electron": "17.4.6", + "electron": "18.0.0-beta.4", "eslint": "8.7.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^19.1.0", diff --git a/remote/.yarnrc b/remote/.yarnrc index 1df1b5f2441..290849a6e63 100644 --- a/remote/.yarnrc +++ b/remote/.yarnrc @@ -1,4 +1,4 @@ disturl "http://nodejs.org/dist" -target "16.13.0" +target "16.13.2" runtime "node" build_from_source "true" diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts index a61b652845a..31884bfdbaa 100644 --- a/src/vs/platform/issue/electron-main/issueMainService.ts +++ b/src/vs/platform/issue/electron-main/issueMainService.ts @@ -335,7 +335,6 @@ export class IssueMainService implements ICommonIssueService { v8CacheOptions: this.environmentMainService.useCodeCache ? 'bypassHeatCheck' : 'none', enableWebSQL: false, spellcheck: false, - nativeWindowOpen: true, zoomFactor: zoomLevelToZoomFactor(options.zoomLevel), sandbox: true, contextIsolation: true diff --git a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts b/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts index 0ccd16e61e5..ade274493b9 100644 --- a/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts +++ b/src/vs/platform/sharedProcess/electron-main/sharedProcess.ts @@ -228,7 +228,6 @@ export class SharedProcess extends Disposable implements ISharedProcess { contextIsolation: false, enableWebSQL: false, spellcheck: false, - nativeWindowOpen: true, images: false, webgl: false } diff --git a/src/vs/platform/windows/electron-main/window.ts b/src/vs/platform/windows/electron-main/window.ts index 257ab928226..2f2ade751d1 100644 --- a/src/vs/platform/windows/electron-main/window.ts +++ b/src/vs/platform/windows/electron-main/window.ts @@ -195,7 +195,6 @@ export class CodeWindow extends Disposable implements ICodeWindow { v8CacheOptions: this.environmentMainService.useCodeCache ? 'bypassHeatCheck' : 'none', enableWebSQL: false, spellcheck: false, - nativeWindowOpen: true, zoomFactor: zoomLevelToZoomFactor(windowSettings?.zoomLevel), // Enable experimental css highlight api https://chromestatus.com/feature/5436441440026624 // Refs https://github.com/microsoft/vscode/issues/140098 diff --git a/test/unit/electron/index.js b/test/unit/electron/index.js index 2c3ad1ab9fc..e9f75612c7d 100644 --- a/test/unit/electron/index.js +++ b/test/unit/electron/index.js @@ -187,8 +187,7 @@ app.on('ready', () => { nodeIntegration: true, contextIsolation: false, enableWebSQL: false, - spellcheck: false, - nativeWindowOpen: true + spellcheck: false } }); diff --git a/yarn.lock b/yarn.lock index a5c203a44df..97fa77cad8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4287,10 +4287,10 @@ electron-to-chromium@^1.4.17: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.45.tgz#cf1144091d6683cbd45a231954a745f02fb24598" integrity sha512-czF9eYVuOmlY/vxyMQz2rGlNSjZpxNQYBe1gmQv7al171qOIhgyO9k7D5AKlgeTCSPKk+LHhj5ZyIdmEub9oNg== -electron@17.4.6: - version "17.4.6" - resolved "https://registry.yarnpkg.com/electron/-/electron-17.4.6.tgz#4837b3adb2636992a33da734a77794dd932fb05c" - integrity sha512-9aPjlyWoVxchD/iw5KcbQ7ZaC5ezxsObBrMbGjpdMmDL5dktI0EkT6x2l2CYPZCi4rQG/6qlPfTZJeVPIIwI2Q== +electron@18.0.0-beta.4: + version "18.0.0-beta.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-18.0.0-beta.4.tgz#68f33aa577cb47a841bd090f0200558ea3c0db73" + integrity sha512-0dlt8srsvuaheRYiKJ5FXdr+7HCysCrCXVrO/b/E0nfythK05ec/DjOL8dWBfdVe2wMMiTST6fMREdHtis8vQg== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" |