From 7a1331fc97514994f69f1c7895500030e222951b Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 29 Mar 2022 15:04:27 +0000 Subject: [PATCH 1/3] Regenerate last opened patch The lines were a bit off. --- patches/last-opened.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/last-opened.diff b/patches/last-opened.diff index 650c67258945..83fafe291f89 100644 --- a/patches/last-opened.diff +++ b/patches/last-opened.diff @@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts =================================================================== --- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts +++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts -@@ -350,19 +350,6 @@ class WorkspaceProvider implements IWork +@@ -410,19 +410,6 @@ class WorkspaceProvider implements IWork workspace = { folderUri: URI.revive(config.folderUri) }; } else if (config.workspaceUri) { workspace = { workspaceUri: URI.revive(config.workspaceUri) }; From f13ff1f26aee79da85f873b5eb1ea77bbaac7744 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 29 Mar 2022 15:05:06 +0000 Subject: [PATCH 2/3] Remove packaged .gitignore files Fixes #4964. --- ci/build/build-release.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index 5d687ee3baef..acc964715b07 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -77,7 +77,10 @@ EOF bundle_vscode() { mkdir -p "$VSCODE_OUT_PATH" - rsync ./lib/vscode-reh-web-*/ "$VSCODE_OUT_PATH" + + # - Some extensions have a .gitignore which excludes their built source from + # the npm package so exclude any .gitignore files. + rsync -avh --exclude .gitignore ./lib/vscode-reh-web-*/ "$VSCODE_OUT_PATH" # Add the commit, date, our name, links, and enable telemetry. This just makes # telemetry available; telemetry can still be disabled by flag or setting. From d374e03ab49bbf667377d2dc8fdab30658d8483f Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 29 Mar 2022 16:30:06 +0000 Subject: [PATCH 3/3] Remove extra Node binary This gets overidden in the standalone but it was getting uselessly included in the npm package. --- ci/build/build-release.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh index acc964715b07..53e13a557e75 100755 --- a/ci/build/build-release.sh +++ b/ci/build/build-release.sh @@ -80,7 +80,9 @@ bundle_vscode() { # - Some extensions have a .gitignore which excludes their built source from # the npm package so exclude any .gitignore files. - rsync -avh --exclude .gitignore ./lib/vscode-reh-web-*/ "$VSCODE_OUT_PATH" + # - Exclude Node as we will add it ourselves for the standalone and will not + # need it for the npm package. + rsync -avh --exclude .gitignore --exclude /node ./lib/vscode-reh-web-*/ "$VSCODE_OUT_PATH" # Add the commit, date, our name, links, and enable telemetry. This just makes # telemetry available; telemetry can still be disabled by flag or setting.