From 35e85c41ea64c9b3082fc5e73582ad0317d0724f Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 21 Oct 2021 20:34:12 +0000 Subject: [PATCH 1/4] Revert "Add platform." This reverts commit 6310f73bbded91cfadc64c08d9be503bf2f633cc. --- build/gulpfile.vscode.server.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build/gulpfile.vscode.server.js b/build/gulpfile.vscode.server.js index ccb8f2559f6a7..48f8ef32368ea 100644 --- a/build/gulpfile.vscode.server.js +++ b/build/gulpfile.vscode.server.js @@ -49,9 +49,11 @@ const vscodeServerResources = [ // Base 'out-build/vs/base/**/*', - - // Platform - 'out-build/vs/platform/**/*', + 'out-build/vs/base/node/languagePacks.js', + 'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}', + 'out-build/vs/base/browser/ui/codicons/codicon/**', + 'out-build/vs/base/parts/sandbox/electron-browser/preload.js', + 'out-build/vs/platform/environment/node/userDataPath.js', // Workbench 'out-build/vs/code/browser/workbench/service-worker.js', From 9a43416261094a4dd00b8a1860ee117ec5265554 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 21 Oct 2021 20:34:20 +0000 Subject: [PATCH 2/4] Revert "Add all common files." This reverts commit 66ac45b69d0161f1fc418166eed4affb6e949d9d. --- build/gulpfile.vscode.server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/gulpfile.vscode.server.js b/build/gulpfile.vscode.server.js index 48f8ef32368ea..0cd03d516c000 100644 --- a/build/gulpfile.vscode.server.js +++ b/build/gulpfile.vscode.server.js @@ -48,7 +48,7 @@ const vscodeServerResources = [ 'out-build/bootstrap-window.js', // Base - 'out-build/vs/base/**/*', + 'out-build/vs/base/common/**/*', 'out-build/vs/base/node/languagePacks.js', 'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}', 'out-build/vs/base/browser/ui/codicons/codicon/**', From 4d0dc1b0024dabde858f03f511082bebee3a8c42 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 21 Oct 2021 20:34:26 +0000 Subject: [PATCH 3/4] Revert "Add common files." This reverts commit c1eb071574b93f64b1cc4df55824bfc928d8a2fe. --- build/gulpfile.vscode.server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/gulpfile.vscode.server.js b/build/gulpfile.vscode.server.js index 0cd03d516c000..4ea2b2afd7cf1 100644 --- a/build/gulpfile.vscode.server.js +++ b/build/gulpfile.vscode.server.js @@ -48,7 +48,7 @@ const vscodeServerResources = [ 'out-build/bootstrap-window.js', // Base - 'out-build/vs/base/common/**/*', + 'out-build/vs/base/common/performance.js', 'out-build/vs/base/node/languagePacks.js', 'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}', 'out-build/vs/base/browser/ui/codicons/codicon/**', From 10c042ed315b1b0e36ec1db6923749ce0c211594 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 21 Oct 2021 21:13:06 +0000 Subject: [PATCH 4/4] Improve comment on resources array --- build/gulpfile.vscode.server.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/build/gulpfile.vscode.server.js b/build/gulpfile.vscode.server.js index 4ea2b2afd7cf1..5b81b64de9d8e 100644 --- a/build/gulpfile.vscode.server.js +++ b/build/gulpfile.vscode.server.js @@ -30,11 +30,11 @@ const REPO_ROOT = path.dirname(__dirname); const commit = util.getVersion(REPO_ROOT); const BUILD_ROOT = path.dirname(REPO_ROOT); -// Put files here that need to be packaged that are not already in the entry -// points or included by the entry points. The optimize step bundles code into -// each entry point that imports it but more interestingly adding files here -// that would normally get bundled causes the bundling to fail resulting in -// "multiple top-level define" errors from the loader. +// Put files here that need to be packaged that are not entry points or imported +// by an entry point. The optimize step bundles each entry point into a single +// file and for some reason adding files here that would normally get bundled +// causes them (and their imports) not to get bundled. In the worst case this +// can cause multiple top-level define errors, other times it causes 404s. const vscodeServerResources = [ // Bootstrap 'out-build/main.js', @@ -48,12 +48,10 @@ const vscodeServerResources = [ 'out-build/bootstrap-window.js', // Base - 'out-build/vs/base/common/performance.js', - 'out-build/vs/base/node/languagePacks.js', - 'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}', - 'out-build/vs/base/browser/ui/codicons/codicon/**', - 'out-build/vs/base/parts/sandbox/electron-browser/preload.js', - 'out-build/vs/platform/environment/node/userDataPath.js', + 'out-build/vs/base/**/*', + + // Platform + 'out-build/vs/platform/**/*', // Workbench 'out-build/vs/code/browser/workbench/service-worker.js',