Skip to content

Commit 18e19d2

Browse files
authored
fix: minor build fixes (#5039)
* Regenerate last opened patch The lines were a bit off. * Remove packaged .gitignore files Fixes #4964. * Remove extra Node binary This gets overidden in the standalone but it was getting uselessly included in the npm package.
1 parent 326a1d1 commit 18e19d2

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

ci/build/build-release.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,12 @@ EOF
7777

7878
bundle_vscode() {
7979
mkdir -p "$VSCODE_OUT_PATH"
80-
rsync ./lib/vscode-reh-web-*/ "$VSCODE_OUT_PATH"
80+
81+
# - Some extensions have a .gitignore which excludes their built source from
82+
# the npm package so exclude any .gitignore files.
83+
# - Exclude Node as we will add it ourselves for the standalone and will not
84+
# need it for the npm package.
85+
rsync -avh --exclude .gitignore --exclude /node ./lib/vscode-reh-web-*/ "$VSCODE_OUT_PATH"
8186

8287
# Add the commit, date, our name, links, and enable telemetry. This just makes
8388
# telemetry available; telemetry can still be disabled by flag or setting.

patches/last-opened.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Index: code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
1010
===================================================================
1111
--- code-server.orig/lib/vscode/src/vs/code/browser/workbench/workbench.ts
1212
+++ code-server/lib/vscode/src/vs/code/browser/workbench/workbench.ts
13-
@@ -350,19 +350,6 @@ class WorkspaceProvider implements IWork
13+
@@ -410,19 +410,6 @@ class WorkspaceProvider implements IWork
1414
workspace = { folderUri: URI.revive(config.folderUri) };
1515
} else if (config.workspaceUri) {
1616
workspace = { workspaceUri: URI.revive(config.workspaceUri) };

0 commit comments

Comments
 (0)