Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Investigate Electron 3.0.x #56149

Merged
merged 175 commits into from
Dec 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
142ae0b
update to 3.0.0-beta.3
bpasero Jul 18, 2018
1a5470d
update d.ts files; rename NodeBuffer => Buffer
bpasero Jul 18, 2018
f5a1754
update to 3.0.0-beta.4
bpasero Aug 9, 2018
ea86c79
undo invalid change
bpasero Aug 9, 2018
eda6aab
Merge branch 'master' into electron-3.0.x
bpasero Aug 9, 2018
3046abe
remove some Electron 2.0.x specific workarounds
bpasero Aug 9, 2018
3820b7b
pinch zoom is now disabled by default
bpasero Aug 9, 2018
71f009f
update vscode-nsfw
bpasero Aug 10, 2018
966d4f7
change vscode-nsfw
bpasero Aug 10, 2018
c44f5cc
update smoke test electron version
bpasero Aug 10, 2018
dbed34e
streams: use destroy() over close()
bpasero Aug 10, 2018
f9abe0a
workaround broken tests
bpasero Aug 10, 2018
a61a99d
bump distro and OSS
bpasero Aug 10, 2018
14ce6e9
try to bump node version for build
bpasero Aug 10, 2018
6253a7e
update macOS build to use node.js 10.8.0
bpasero Aug 10, 2018
ec24e88
fix extension tests
bpasero Aug 10, 2018
c657e5a
use node.js 10.2.1 for all builds
bpasero Aug 10, 2018
e75faa5
remove nsfw from dev dependencies
bpasero Aug 10, 2018
90ea2b7
back to node 8.x for build
bpasero Aug 10, 2018
5a8976d
Revert "back to node 8.x for build"
bpasero Aug 10, 2018
d9b8ba0
update distro
bpasero Aug 10, 2018
1d66ce8
disable test run on macOS prod build for now
bpasero Aug 10, 2018
198d785
bump distro
bpasero Aug 10, 2018
99f43cd
ensure proper nsfw dep
bpasero Aug 10, 2018
154143b
Merge branch 'master' into electron-3.0.x
bpasero Aug 10, 2018
43a2c95
fix more native dependencies
bpasero Aug 11, 2018
a8746ed
Merge branch 'master' into electron-3.0.x
bpasero Aug 11, 2018
0c57317
temp disable failing test
bpasero Aug 11, 2018
55b5f80
fix packages
bpasero Aug 11, 2018
932b387
update deps
bpasero Aug 11, 2018
2882780
fix deps
bpasero Aug 11, 2018
b713d2f
Merge branch 'master' into electron-3.0.x
bpasero Aug 11, 2018
da112d5
update deps
bpasero Aug 11, 2018
acdabe2
enable macOS unit tests again
bpasero Aug 11, 2018
7abdb21
fix deprecated buffer use
bpasero Aug 12, 2018
aa159f8
Electron 3.0.0.beta.5
bpasero Aug 14, 2018
e6caa88
Merge branch 'master' into electron-3.0.x
bpasero Aug 14, 2018
52217e5
Merge branch 'master' into electron-3.0.x
bpasero Aug 16, 2018
ca84a06
Merge branch 'master' into electron-3.0.x
bpasero Aug 16, 2018
bec8bc0
bump deps
bpasero Aug 16, 2018
ed4e679
fix tree accidentally treating auxclick as click
bpasero Aug 16, 2018
8621072
improve overlay cleanup scheduler (fixes flicker seen with Electron 3…
bpasero Aug 16, 2018
57d0175
update distro
bpasero Aug 16, 2018
7f6f08d
Merge branch 'master' into electron-3.0.x
bpasero Aug 17, 2018
0ed4ecd
remove obsolete disableBlinkFeatures: 'Auxclick'
bpasero Aug 17, 2018
3a8acff
update to Electron 3.0 beta 6
bpasero Aug 21, 2018
fc21719
Merge branch 'master' into electron-3.0.x
bpasero Aug 21, 2018
7e645d9
Merge branch 'master' into electron-3.0.x
bpasero Aug 22, 2018
a5cda44
fix compile
bpasero Aug 22, 2018
dc09320
Merge branch 'master' into electron-3.0.x
bpasero Aug 22, 2018
10ab19c
Merge branch 'master' into electron-3.0.x
bpasero Aug 22, 2018
6907adf
Merge branch 'master' into electron-3.0.x
bpasero Aug 23, 2018
26bfd35
workaround #56994
bpasero Aug 23, 2018
c9363b4
Merge branch 'master' into electron-3.0.x
bpasero Aug 25, 2018
f93db6c
Merge branch 'master' into electron-3.0.x
bpasero Aug 27, 2018
2343ebd
Merge branch 'master' into electron-3.0.x
bpasero Aug 27, 2018
ed7cff1
Merge branch 'master' into electron-3.0.x
bpasero Aug 28, 2018
94da724
Merge branch 'master' into electron-3.0.x
bpasero Aug 28, 2018
6f4cd5b
do not use backgroundColor to find shared process (causes flicker)
bpasero Aug 29, 2018
d8eb099
fix flicker on windows from shared process background color
bpasero Aug 29, 2018
34a635e
webview - bubble up keyboard events (workaround for #56988)
bpasero Aug 29, 2018
17c39de
bump electron to 3.0.0-beta.8
bpasero Aug 29, 2018
f582d07
webview - fix deprecation
bpasero Aug 29, 2018
c96d82b
webview - fix another deprecation
bpasero Aug 29, 2018
6986040
Merge branch 'master' into electron-3.0.x
bpasero Aug 30, 2018
88469e3
Merge branch 'master' into electron-3.0.x
bpasero Aug 30, 2018
aab1760
Merge branch 'master' into electron-3.0.x
bpasero Aug 31, 2018
7f6ad1c
Merge branch 'master' into electron-3.0.x
bpasero Aug 31, 2018
883208e
Merge branch 'master' into electron-3.0.x
bpasero Aug 31, 2018
d376917
debt - handle SIGPIPE on more processes
bpasero Aug 31, 2018
4e2572b
Merge branch 'master' into electron-3.0.x
bpasero Aug 31, 2018
135032b
workaround more webview focus issues (for #56988)
bpasero Sep 2, 2018
65f17de
webview - use proper way to focus()
bpasero Sep 2, 2018
366ef82
debt - avoid window-focus/blur and use native focus events instead
bpasero Sep 2, 2018
5d790fa
webview - restore previous focus method
bpasero Sep 3, 2018
a7af774
Merge branch 'master' into electron-3.0.x
bpasero Sep 3, 2018
5f1e440
Merge branch 'master' into electron-3.0.x
bpasero Sep 3, 2018
344c9a4
Merge branch 'master' into electron-3.0.x
bpasero Sep 3, 2018
893c5b1
Merge branch 'master' into electron-3.0.x
bpasero Sep 4, 2018
786029f
webview - improve focus tracking (do not rely on DOM events)
bpasero Sep 5, 2018
afd69d6
Merge branch 'master' into electron-3.0.x
bpasero Sep 6, 2018
7ac168e
bump to electron 3.0.0-beta.9
bpasero Sep 6, 2018
e5fdcc6
update deps
bpasero Sep 6, 2018
3ca7663
Merge branch 'master' into electron-3.0.x
bpasero Sep 8, 2018
6cdfc71
update electron@3.0.0-beta.10
bpasero Sep 8, 2018
c47790a
webview - do not rely on DOM focus for certain commands (for #56988)
bpasero Sep 10, 2018
4001cf6
Merge branch 'master' into electron-3.0.x
bpasero Sep 10, 2018
86ff36a
Merge branch 'master' into electron-3.0.x
bpasero Sep 11, 2018
61ee09f
update to electron@3.0.0-beta.11
bpasero Sep 12, 2018
8e2dd7a
Merge branch 'master' into electron-3.0.x
bpasero Sep 13, 2018
cf31c06
electron@3.0.0-beta.12
bpasero Sep 13, 2018
780ab7f
Merge branch 'master' into electron-3.0.x
bpasero Sep 15, 2018
7c66e08
Merge branch 'master' into electron-3.0.x
bpasero Sep 17, 2018
3bf603b
Merge branch 'master' into electron-3.0.x
bpasero Sep 18, 2018
961a8c6
update to beta 13
bpasero Sep 18, 2018
845c26a
Merge branch 'master' into electron-3.0.x
bpasero Sep 18, 2018
270d372
Merge branch 'master' into electron-3.0.x
bpasero Sep 19, 2018
58c0266
update to electron 3.0.0
bpasero Sep 19, 2018
b2baeb2
Merge branch 'master' into electron-3.0.x
bpasero Sep 19, 2018
440fbaf
Merge branch 'master' into electron-3.0.x
bpasero Sep 20, 2018
922e65c
Merge branch 'master' into electron-3.0.x
bpasero Sep 21, 2018
1cc92ec
Merge branch 'master' into electron-3.0.x
bpasero Sep 23, 2018
200e0c6
Merge branch 'master' into electron-3.0.x
bpasero Sep 25, 2018
a03247c
Merge branch 'master' into electron-3.0.x
bpasero Sep 25, 2018
256fd82
Merge branch 'master' into electron-3.0.x
bpasero Sep 26, 2018
a7293d8
Merge branch 'master' into electron-3.0.x
bpasero Sep 27, 2018
45498d9
update to Electron 3.0.1
bpasero Sep 27, 2018
5a736c2
Merge branch 'master' into electron-3.0.x
bpasero Sep 28, 2018
b0ba222
Merge branch 'master' into electron-3.0.x
bpasero Sep 28, 2018
7611bd7
electron@3.0.2
bpasero Oct 1, 2018
a5569fa
Merge branch 'master' into electron-3.0.x
bpasero Oct 1, 2018
20f9326
revert build changes (node.js version)
bpasero Oct 1, 2018
b3a1f56
Merge branch 'master' into electron-3.0.x
bpasero Oct 1, 2018
07ccefb
Merge branch 'master' into electron-3.0.x
bpasero Oct 1, 2018
1e9d106
try with: enable mojave dark mode support
bpasero Oct 1, 2018
fd3cdd1
Merge branch 'master' into electron-3.0.x
bpasero Oct 1, 2018
f28f62c
Merge branch 'master' into electron-3.0.x
bpasero Oct 2, 2018
2c73728
Merge branch 'master' into electron-3.0.x
bpasero Oct 3, 2018
46162f1
Merge branch 'master' into electron-3.0.x
bpasero Oct 5, 2018
654616a
fix types
bpasero Oct 5, 2018
1e13a54
electron 3.0.3
bpasero Oct 8, 2018
7396ead
Merge branch 'master' into electron-3.0.x
bpasero Oct 8, 2018
878fda8
Merge branch 'master' into electron-3.0.x
bpasero Oct 10, 2018
72d44e9
Merge branch 'master' into electron-3.0.x
bpasero Oct 11, 2018
d277190
electron@3.0.4
bpasero Oct 11, 2018
93ec24a
Merge branch 'master' into electron-3.0.x
bpasero Oct 15, 2018
6a6e9dc
Merge branch 'master' into electron-3.0.x
bpasero Oct 16, 2018
d62c2ee
Merge branch 'master' into electron-3.0.x
bpasero Oct 16, 2018
6aad960
Merge branch 'master' into electron-3.0.x
bpasero Oct 16, 2018
b828d01
fix deps
bpasero Oct 16, 2018
27ee5c2
Merge branch 'master' into electron-3.0.x
bpasero Oct 17, 2018
d2bb600
Merge branch 'master' into electron-3.0.x
bpasero Oct 22, 2018
e313dd6
Merge branch 'master' into electron-3.0.x
bpasero Oct 24, 2018
af07c91
Merge branch 'master' into electron-3.0.x
bpasero Oct 24, 2018
e047488
Merge branch 'master' into electron-3.0.x
bpasero Oct 25, 2018
8e2bc2b
bump electron@3.0.6
bpasero Oct 25, 2018
72250eb
Merge branch 'master' into electron-3.0.x
bpasero Oct 25, 2018
d41e54e
Merge branch 'master' into electron-3.0.x
bpasero Oct 29, 2018
4a1278a
Merge branch 'master' into electron-3.0.x
bpasero Oct 30, 2018
8fc99c6
Merge branch 'master' into electron-3.0.x
bpasero Oct 30, 2018
a19e0f8
Merge branch 'master' into electron-3.0.x
bpasero Oct 31, 2018
21eeb49
Merge branch 'master' into electron-3.0.x
bpasero Nov 18, 2018
4537099
bump electron@3.0.9
bpasero Nov 18, 2018
e382363
fix strict null issue
bpasero Nov 18, 2018
2d2a651
Merge branch 'master' into electron-3.0.x
bpasero Nov 19, 2018
f0907c0
Merge branch 'master' into electron-3.0.x
bpasero Nov 20, 2018
250e936
Merge branch 'master' into electron-3.0.x
bpasero Nov 20, 2018
80dc742
reset format
bpasero Nov 20, 2018
aa89c96
Merge branch 'master' into electron-3.0.x
bpasero Nov 21, 2018
6312280
bump electron@3.0.10
bpasero Nov 21, 2018
af0dabe
Merge branch 'master' into electron-3.0.x
bpasero Nov 22, 2018
daf132f
Merge branch 'master' into electron-3.0.x
bpasero Nov 23, 2018
88ed62a
Merge branch 'master' into electron-3.0.x
bpasero Nov 26, 2018
d8d1726
Merge branch 'master' into electron-3.0.x
bpasero Nov 26, 2018
21e4e05
Merge branch 'master' into electron-3.0.x
bpasero Nov 26, 2018
790b0c9
Merge branch 'master' into electron-3.0.x
bpasero Nov 27, 2018
50ef5ec
Merge branch 'master' into electron-3.0.x
bpasero Nov 28, 2018
d2ec6a6
fix strict null issue
bpasero Nov 28, 2018
cb0ab52
Merge branch 'master' into electron-3.0.x
bpasero Nov 29, 2018
c4a2aab
Merge branch 'master' into electron-3.0.x
bpasero Nov 30, 2018
57d85c2
Merge branch 'master' into electron-3.0.x
bpasero Dec 1, 2018
74dc2b1
Merge branch 'master' into electron-3.0.x
bpasero Dec 4, 2018
79ee5d1
Merge branch 'master' into electron-3.0.x
bpasero Dec 4, 2018
f166e2e
webview - print error when revive fails
bpasero Dec 4, 2018
e89c9d0
Merge branch 'master' into electron-3.0.x
bpasero Dec 5, 2018
c94d218
electron 3.0.x - try to fix keybindings in webviews (#64417)
bpasero Dec 5, 2018
c83388a
Merge branch 'master' into electron-3.0.x
bpasero Dec 5, 2018
efb3a37
Merge branch 'master' into electron-3.0.x
bpasero Dec 6, 2018
531c340
Merge branch 'master' into electron-3.0.x
bpasero Dec 7, 2018
82ecda2
Merge branch 'master' into electron-3.0.x
bpasero Dec 10, 2018
887199a
Merge branch 'master' into electron-3.0.x
bpasero Dec 10, 2018
26ff012
bump @types/node => ^10.12.12
bpasero Dec 10, 2018
d3442e5
:lipstick:
bpasero Dec 10, 2018
4f63aa8
Merge branch 'master' into electron-3.0.x
bpasero Dec 10, 2018
a479eea
update distro
bpasero Dec 10, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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