Skip to content

Commit 029e992

Browse files
deepak1556Benjamin Pasero
deepak1556
authored and
Benjamin Pasero
committed
chore: Update to Electron 6.x (microsoft#75802)
1 parent 64980ea commit 029e992

17 files changed

Lines changed: 1408 additions & 573 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 "4.2.10"
2+
target "6.0.9"
33
runtime "electron"

‎build/azure-pipelines/linux/product-build-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ steps:
100100

101101
- script: |
102102
set -e
103-
DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
103+
DISPLAY=:10 ./scripts/test.sh --build --tfs --no-sandbox "Unit Tests"
104104
displayName: Run unit tests
105105
condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
106106

‎build/npm/preinstall.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ if (!/yarn\.js$|yarnpkg$/.test(process.env['npm_execpath'])) {
3131
if (err) {
3232
console.error('');
3333
process.exit(1);
34-
}
34+
}

‎cgmanifest.json‎

Lines changed: 6 additions & 6 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": "c6a08e5368de4352903e702cde750b33239a50ab"
9+
"commitHash": "91f08db83c2ce8c722ddf0911ead8f7c473bedfa"
1010
}
1111
},
1212
"licenseDetail": [
@@ -40,32 +40,32 @@
4040
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141
],
4242
"isOnlyProductionDependency": true,
43-
"version": "69.0.3497.128"
43+
"version": "76.0.3809.146"
4444
},
4545
{
4646
"component": {
4747
"type": "git",
4848
"git": {
4949
"name": "nodejs",
5050
"repositoryUrl": "https://github.com/nodejs/node",
51-
"commitHash": "8c70b2084ce5f76ea1e3b3c4ccdeee4483fe338b"
51+
"commitHash": "64219741218aa87e259cf8257596073b8e747f0a"
5252
}
5353
},
5454
"isOnlyProductionDependency": true,
55-
"version": "10.11.0"
55+
"version": "12.4.0"
5656
},
5757
{
5858
"component": {
5959
"type": "git",
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "4e4c7527c63fcf27dffaeb58bde996b8d859c0ed"
63+
"commitHash": "407747b48c47cdeed156a73dde1c47609470c95a"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "4.2.10"
68+
"version": "6.0.9"
6969
},
7070
{
7171
"component": {

‎remote/.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "http://nodejs.org/dist"
2-
target "10.11.0"
2+
target "12.4.0"
33
runtime "node"

‎scripts/test-integration.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
88
else
99
ROOT=$(dirname $(dirname $(readlink -f $0)))
1010
VSCODEUSERDATADIR=`mktemp -d 2>/dev/null`
11+
LINUX_NO_SANDBOX="--no-sandbox" # workaround Electron 6 issue on Linux when running tests in container
1112
fi
1213

1314
cd $ROOT
@@ -33,16 +34,16 @@ else
3334
fi
3435

3536
# Integration tests in AMD
36-
./scripts/test.sh --runGlob **/*.integrationTest.js "$@"
37+
./scripts/test.sh $LINUX_NO_SANDBOX --runGlob **/*.integrationTest.js "$@"
3738

3839
# Tests in the extension host
39-
"$INTEGRATION_TEST_ELECTRON_PATH" $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
40-
"$INTEGRATION_TEST_ELECTRON_PATH" $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
41-
"$INTEGRATION_TEST_ELECTRON_PATH" $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
42-
"$INTEGRATION_TEST_ELECTRON_PATH" $ROOT/extensions/markdown-language-features/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
40+
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-api-tests/testWorkspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
41+
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-api-tests/testworkspace.code-workspace --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/workspace-tests --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
42+
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
43+
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/markdown-language-features/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/markdown-language-features --extensionTestsPath=$ROOT/extensions/markdown-language-features/out/test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
4344

4445
mkdir -p $ROOT/extensions/emmet/test-fixtures
45-
"$INTEGRATION_TEST_ELECTRON_PATH" $ROOT/extensions/emmet/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
46+
"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_NO_SANDBOX $ROOT/extensions/emmet/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test --disable-telemetry --disable-crash-reporter --disable-updates --disable-extensions --skip-getting-started --disable-inspect --user-data-dir=$VSCODEUSERDATADIR
4647
rm -rf $ROOT/extensions/emmet/test-fixtures
4748

4849
# Remote Integration Tests

‎src/bootstrap.js‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ process.on('SIGPIPE', () => {
2121
//#endregion
2222

2323
//#region Add support for redirecting the loading of node modules
24+
2425
exports.injectNodeModuleLookupPath = function (injectPath) {
2526
if (!injectPath) {
2627
throw new Error('Missing injectPath');
@@ -36,18 +37,16 @@ exports.injectNodeModuleLookupPath = function (injectPath) {
3637
const originalResolveLookupPaths = Module._resolveLookupPaths;
3738

3839
// @ts-ignore
39-
Module._resolveLookupPaths = function (moduleName, parent, newReturn) {
40-
const result = originalResolveLookupPaths(moduleName, parent, newReturn);
41-
42-
const paths = newReturn ? result : result[1];
40+
Module._resolveLookupPaths = function (moduleName, parent) {
41+
const paths = originalResolveLookupPaths(moduleName, parent);
4342
for (let i = 0, len = paths.length; i < len; i++) {
4443
if (paths[i] === nodeModulesPath) {
4544
paths.splice(i, 0, injectPath);
4645
break;
4746
}
4847
}
4948

50-
return result;
49+
return paths;
5150
};
5251
};
5352
//#endregion
@@ -71,19 +70,18 @@ exports.enableASARSupport = function (nodeModulesPath) {
7170

7271
// @ts-ignore
7372
const originalResolveLookupPaths = Module._resolveLookupPaths;
74-
// @ts-ignore
75-
Module._resolveLookupPaths = function (request, parent, newReturn) {
76-
const result = originalResolveLookupPaths(request, parent, newReturn);
7773

78-
const paths = newReturn ? result : result[1];
74+
// @ts-ignore
75+
Module._resolveLookupPaths = function (request, parent) {
76+
const paths = originalResolveLookupPaths(request, parent);
7977
for (let i = 0, len = paths.length; i < len; i++) {
8078
if (paths[i] === NODE_MODULES_PATH) {
8179
paths.splice(i, 0, NODE_MODULES_ASAR_PATH);
8280
break;
8381
}
8482
}
8583

86-
return result;
84+
return paths;
8785
};
8886
};
8987
//#endregion

‎src/main.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const paths = require('./paths');
1717
// @ts-ignore
1818
const product = require('../product.json');
1919
// @ts-ignore
20-
const app = require('electron').app;
20+
const { app, protocol } = require('electron');
2121

2222
// Enable portable support
2323
const portable = bootstrap.configurePortable();
@@ -33,6 +33,11 @@ app.setPath('userData', userDataPath);
3333
// Update cwd based on environment and platform
3434
setCurrentWorkingDirectory();
3535

36+
// Register custom schemes with privileges
37+
protocol.registerSchemesAsPrivileged([
38+
{ scheme: 'vscode-resource', privileges: { secure: true, supportFetchAPI: true, corsEnabled: true } }
39+
]);
40+
3641
// Global app listeners
3742
registerListeners();
3843

0 commit comments

Comments
 (0)