Skip to content

Commit

Permalink
Update to Electron 3.0.10 (#56149)
Browse files Browse the repository at this point in the history
* 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 #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 #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 #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 [email protected]

* webview - do not rely on DOM focus for certain commands (for #56988)

* update to [email protected]

* [email protected]

* update to beta 13

* update to electron 3.0.0

* update to Electron 3.0.1

* [email protected]

* revert build changes (node.js version)

* try with: enable mojave dark mode support

* fix types

* electron 3.0.3

* [email protected]

* fix deps

* bump [email protected]

* bump [email protected]

* fix strict null issue

* reset format

* bump [email protected]

* fix strict null issue

* webview - print error when revive fails

* electron 3.0.x - try to fix keybindings in webviews (#64417)

* bump @types/node => ^10.12.12

* 💄

* update distro
  • Loading branch information
bpasero authored Dec 10, 2018
1 parent b97740c commit 0bcf5cf
Show file tree
Hide file tree
Showing 25 changed files with 919 additions and 501 deletions.
2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
disturl "https://atom.io/download/electron"
target "2.0.12"
target "3.0.10"
runtime "electron"
16 changes: 8 additions & 8 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "chromium",
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
"commitHash": "7accc8730b0f99b5e7c0702ea89d1fa7c17bfe33"
"commitHash": "164c37e3f235134c88e80fac2a182cfba3f07f00"
}
},
"licenseDetail": [
Expand Down Expand Up @@ -40,45 +40,45 @@
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
],
"isOnlyProductionDependency": true,
"version": "61.0.3163.100"
"version": "66.0.3359.181"
},
{
"component": {
"type": "git",
"git": {
"name": "libchromiumcontent",
"repositoryUrl": "https://github.com/electron/libchromiumcontent",
"commitHash": "ccdb085454b0a387ee96e0f81a7ca9a8ce07a710"
"commitHash": "d9e39391cfae447a84e276a402342cf8b4b5bcba"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
"version": "61.0.3163.100"
"version": "66.0.3359.181"
},
{
"component": {
"type": "git",
"git": {
"name": "nodejs",
"repositoryUrl": "https://github.com/nodejs/node",
"commitHash": "8a44289089a08b7b19fa3c4651b5f1f5d1edd71b"
"commitHash": "5cbb905c1af7cea2d709932d59827d7c6d03ef4a"
}
},
"isOnlyProductionDependency": true,
"version": "8.9.3"
"version": "10.2.0"
},
{
"component": {
"type": "git",
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
"commitHash": "d281859cf59f12c7107a540a9f4cba0ecf5eff41"
"commitHash": "4305657858592be2b44c95ae7af53c627dcdc5e7"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
"version": "2.0.12"
"version": "3.0.10"
},
{
"component": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.31.0",
"distro": "573bd4fedabe1c0bcebeb1e683109079ae560312",
"distro": "2fc810c2f29040b34dbeab2be175a22cca2624db",
"author": {
"name": "Microsoft Corporation"
},
Expand Down Expand Up @@ -63,7 +63,7 @@
"@types/keytar": "^4.0.1",
"@types/minimist": "^1.2.0",
"@types/mocha": "2.2.39",
"@types/node": "^8.9.1",
"@types/node": "^10.12.12",
"@types/semver": "^5.5.0",
"@types/sinon": "^1.16.36",
"@types/webpack": "^4.4.10",
Expand Down
3 changes: 1 addition & 2 deletions src/bootstrap-window.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ exports.load = function (modulePaths, resultCallback, options) {
// Enable ASAR support
bootstrap.enableASARSupport(path.join(configuration.appRoot, 'node_modules'));

// disable pinch zoom & apply zoom level early to avoid glitches
// Apply zoom level early to avoid glitches
const zoomLevel = configuration.zoomLevel;
webFrame.setVisualZoomLevelLimits(1, 1);
if (typeof zoomLevel === 'number' && zoomLevel !== 0) {
webFrame.setZoomLevel(zoomLevel);
}
Expand Down
4 changes: 1 addition & 3 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,8 @@ function onReady() {
*/
function configureCommandlineSwitches(cliArgs, nodeCachedDataDir) {

// TODO@Ben Electron 2.0.x: prevent localStorage migration from SQLite to LevelDB due to issues
app.commandLine.appendSwitch('disable-mojo-local-storage');

// Force pre-Chrome-60 color profile handling (for https://github.com/Microsoft/vscode/issues/51791)
// TODO@Ben check if future versions of Electron still support this flag
app.commandLine.appendSwitch('disable-features', 'ColorCorrectRendering');

// Support JS Flags
Expand Down
Loading

0 comments on commit 0bcf5cf

Please sign in to comment.