Skip to content

Commit 0bcf5cf

Browse files
bpaserobpasero
authored
Update to Electron 3.0.10 (microsoft#56149)
* update to 3.0.0-beta.3 * update d.ts files; rename NodeBuffer => Buffer * update to 3.0.0-beta.4 * undo invalid change * remove some Electron 2.0.x specific workarounds * pinch zoom is now disabled by default * update vscode-nsfw * change vscode-nsfw * update smoke test electron version * streams: use destroy() over close() * workaround broken tests * bump distro and OSS * try to bump node version for build * update macOS build to use node.js 10.8.0 * fix extension tests * use node.js 10.2.1 for all builds * remove nsfw from dev dependencies * back to node 8.x for build * Revert "back to node 8.x for build" This reverts commit 90ea2b7. * update distro * disable test run on macOS prod build for now * bump distro * ensure proper nsfw dep * fix more native dependencies * temp disable failing test * fix packages * update deps * fix deps * update deps * enable macOS unit tests again * fix deprecated buffer use * Electron 3.0.0.beta.5 * bump deps * fix tree accidentally treating auxclick as click * improve overlay cleanup scheduler (fixes flicker seen with Electron 3.0.x) * update distro * remove obsolete disableBlinkFeatures: 'Auxclick' * update to Electron 3.0 beta 6 * fix compile * workaround microsoft#56994 * do not use backgroundColor to find shared process (causes flicker) * fix flicker on windows from shared process background color * webview - bubble up keyboard events (workaround for microsoft#56988) * bump electron to 3.0.0-beta.8 * webview - fix deprecation * webview - fix another deprecation * debt - handle SIGPIPE on more processes * workaround more webview focus issues (for microsoft#56988) * webview - use proper way to focus() * debt - avoid window-focus/blur and use native focus events instead * webview - restore previous focus method * webview - improve focus tracking (do not rely on DOM events) * bump to electron 3.0.0-beta.9 * update deps * update electron@3.0.0-beta.10 * webview - do not rely on DOM focus for certain commands (for microsoft#56988) * update to electron@3.0.0-beta.11 * electron@3.0.0-beta.12 * update to beta 13 * update to electron 3.0.0 * update to Electron 3.0.1 * electron@3.0.2 * revert build changes (node.js version) * try with: enable mojave dark mode support * fix types * electron 3.0.3 * electron@3.0.4 * fix deps * bump electron@3.0.6 * bump electron@3.0.9 * fix strict null issue * reset format * bump electron@3.0.10 * fix strict null issue * webview - print error when revive fails * electron 3.0.x - try to fix keybindings in webviews (microsoft#64417) * bump @types/node => ^10.12.12 * 💄 * update distro
1 parent b97740c commit 0bcf5cf

25 files changed

Lines changed: 919 additions & 501 deletions

File tree

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "2.0.12"
2+
target "3.0.10"
33
runtime "electron"

‎cgmanifest.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "chromium",
88
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
9-
"commitHash": "7accc8730b0f99b5e7c0702ea89d1fa7c17bfe33"
9+
"commitHash": "164c37e3f235134c88e80fac2a182cfba3f07f00"
1010
}
1111
},
1212
"licenseDetail": [
@@ -40,45 +40,45 @@
4040
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141
],
4242
"isOnlyProductionDependency": true,
43-
"version": "61.0.3163.100"
43+
"version": "66.0.3359.181"
4444
},
4545
{
4646
"component": {
4747
"type": "git",
4848
"git": {
4949
"name": "libchromiumcontent",
5050
"repositoryUrl": "https://github.com/electron/libchromiumcontent",
51-
"commitHash": "ccdb085454b0a387ee96e0f81a7ca9a8ce07a710"
51+
"commitHash": "d9e39391cfae447a84e276a402342cf8b4b5bcba"
5252
}
5353
},
5454
"isOnlyProductionDependency": true,
5555
"license": "MIT",
56-
"version": "61.0.3163.100"
56+
"version": "66.0.3359.181"
5757
},
5858
{
5959
"component": {
6060
"type": "git",
6161
"git": {
6262
"name": "nodejs",
6363
"repositoryUrl": "https://github.com/nodejs/node",
64-
"commitHash": "8a44289089a08b7b19fa3c4651b5f1f5d1edd71b"
64+
"commitHash": "5cbb905c1af7cea2d709932d59827d7c6d03ef4a"
6565
}
6666
},
6767
"isOnlyProductionDependency": true,
68-
"version": "8.9.3"
68+
"version": "10.2.0"
6969
},
7070
{
7171
"component": {
7272
"type": "git",
7373
"git": {
7474
"name": "electron",
7575
"repositoryUrl": "https://github.com/electron/electron",
76-
"commitHash": "d281859cf59f12c7107a540a9f4cba0ecf5eff41"
76+
"commitHash": "4305657858592be2b44c95ae7af53c627dcdc5e7"
7777
}
7878
},
7979
"isOnlyProductionDependency": true,
8080
"license": "MIT",
81-
"version": "2.0.12"
81+
"version": "3.0.10"
8282
},
8383
{
8484
"component": {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.31.0",
4-
"distro": "573bd4fedabe1c0bcebeb1e683109079ae560312",
4+
"distro": "2fc810c2f29040b34dbeab2be175a22cca2624db",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -63,7 +63,7 @@
6363
"@types/keytar": "^4.0.1",
6464
"@types/minimist": "^1.2.0",
6565
"@types/mocha": "2.2.39",
66-
"@types/node": "^8.9.1",
66+
"@types/node": "^10.12.12",
6767
"@types/semver": "^5.5.0",
6868
"@types/sinon": "^1.16.36",
6969
"@types/webpack": "^4.4.10",

‎src/bootstrap-window.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ exports.load = function (modulePaths, resultCallback, options) {
5151
// Enable ASAR support
5252
bootstrap.enableASARSupport(path.join(configuration.appRoot, 'node_modules'));
5353

54-
// disable pinch zoom & apply zoom level early to avoid glitches
54+
// Apply zoom level early to avoid glitches
5555
const zoomLevel = configuration.zoomLevel;
56-
webFrame.setVisualZoomLevelLimits(1, 1);
5756
if (typeof zoomLevel === 'number' && zoomLevel !== 0) {
5857
webFrame.setZoomLevel(zoomLevel);
5958
}

‎src/main.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,8 @@ function onReady() {
147147
*/
148148
function configureCommandlineSwitches(cliArgs, nodeCachedDataDir) {
149149

150-
// TODO@Ben Electron 2.0.x: prevent localStorage migration from SQLite to LevelDB due to issues
151-
app.commandLine.appendSwitch('disable-mojo-local-storage');
152-
153150
// Force pre-Chrome-60 color profile handling (for https://github.com/Microsoft/vscode/issues/51791)
151+
// TODO@Ben check if future versions of Electron still support this flag
154152
app.commandLine.appendSwitch('disable-features', 'ColorCorrectRendering');
155153

156154
// Support JS Flags

0 commit comments

Comments
 (0)