Skip to content

Commit 53c2f32

Browse files
authored
Update Code to 1.139.1 (#8021)
* Update Code to 1.139.1 * Bump proxy-addr to 2.0.8 * Add preinstall setup to build Already had this in the release build step, not sure why it is not in the main build step. But we started getting errors building native modules in ci, and this seems to be why. * Fix quick input It types too quickly, before the input is visible.
1 parent 8a7bf87 commit 53c2f32

14 files changed

Lines changed: 48 additions & 24 deletions

‎.github/workflows/build.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ jobs:
156156
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
157157
DISABLE_V8_COMPILE_CACHE: 1
158158
VERSION: 0.0.0
159+
VSCODE_ARCH: x64
159160
VSCODE_TARGET: linux-x64
160161
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
161162
ELECTRON_SKIP_BINARY_DOWNLOAD: 1
@@ -179,13 +180,13 @@ jobs:
179180
cache-dependency-path: |
180181
package-lock.json
181182
test/package-lock.json
182-
- run: SKIP_SUBMODULE_DEPS=1 npm ci
183-
- run: npm run build
183+
184184
# Get Code's git hash. When this changes it means the content is
185185
# different and we need to rebuild.
186186
- name: Get latest lib/vscode rev
187187
id: vscode-rev
188188
run: echo "rev=$(git rev-parse HEAD:./lib/vscode)" >> $GITHUB_OUTPUT
189+
189190
# We need to rebuild when we have a new version of Code, when any of the
190191
# patches changed, or when the code-server version changes (since it gets
191192
# embedded into the code). Use VSCODE_CACHE_VERSION to force a rebuild.
@@ -198,10 +199,21 @@ jobs:
198199
- name: Build vscode
199200
if: steps.cache-vscode.outputs.cache-hit != 'true'
200201
run: |
201-
pushd lib/vscode
202+
cd lib/vscode/build
203+
npm ci
204+
cd ..
205+
source ./build/azure-pipelines/linux/setup-env.sh
206+
# Run preinstall script before root dependencies are installed
207+
# so that v8 headers are patched correctly for native modules.
208+
node build/npm/preinstall.ts
202209
npm ci
203-
popd
210+
cd ../..
204211
npm run build:vscode
212+
213+
# Build the code-server wrapper.
214+
- run: SKIP_SUBMODULE_DEPS=1 npm ci
215+
- run: npm run build
216+
205217
# Push up an artifact containing the linux-x64 release.
206218
- run: KEEP_MODULES=1 npm run release
207219
- run: tar -czf package.tar.gz release

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.18.1
1+
24.20.0

‎CHANGELOG.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,17 @@ Code v99.99.999
2222

2323
## Unreleased
2424

25+
Code v1.139.1
26+
27+
### Changed
28+
29+
- Update to Code 1.139.1
30+
2531
### Fixed
2632

27-
- `--idle-timeout-seconds` was only validated when passed as `--idle-timeout-seconds=<value>`;
28-
values of 60 or less passed as `--idle-timeout-seconds <value>` were silently accepted.
33+
- `--idle-timeout-seconds` was only validated when passed as
34+
`--idle-timeout-seconds=<value>`; values of 60 or less passed as
35+
`--idle-timeout-seconds <value>` were silently accepted.
2936

3037
## [4.138.0](https://github.com/coder/code-server/releases/tag/v4.138.0) - 2026-09-19
3138

‎lib/vscode‎

Submodule vscode updated 1480 files

‎package-lock.json‎

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎patches/copilot.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts
4444
import watcher from './watch/index.ts';
4545

4646
import { createRequire } from 'module';
47-
@@ -491,6 +492,116 @@ export function packageCopilotExtensionS
47+
@@ -487,6 +488,116 @@ export function packageCopilotExtensionS
4848
).pipe(util2.setExecutableBit(['**/*.sh']));
4949
}
5050

‎patches/display-language.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts
5656
import type { INLSConfiguration } from '../../nls.js';
5757
@@ -33,7 +35,94 @@ export async function getNLSConfiguratio
5858
if (!result) {
59-
result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, userDataPath, nlsMetadataPath });
59+
result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, nlsMetadataHash: product.nlsMetadataHash, userDataPath, nlsMetadataPath });
6060
nlsConfigurationCache.set(cacheKey, result);
6161
+ // If the language pack does not yet exist, it defaults to English, which is
6262
+ // then cached and you have to restart even if you then install the pack.

‎patches/getting-started.diff‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
1919
import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
2020
import { status } from '../../../../base/browser/ui/aria/aria.js';
2121
import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
22-
@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace
22+
@@ -55,7 +55,7 @@ import { IRecentFolder, IRecentWorkspace
2323
import { OpenRecentAction } from '../../../browser/actions/windowActions.js';
2424
import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js';
2525
import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
@@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
2828
import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js';
2929
import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js';
3030
import './gettingStartedColors.js';
31-
@@ -928,6 +928,72 @@ export class GettingStartedPage extends
31+
@@ -930,6 +930,72 @@ export class GettingStartedPage extends
3232
$('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))
3333
);
3434

@@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
101101
const leftColumn = $('.categories-column.categories-column-left', {},);
102102
const rightColumn = $('.categories-column.categories-column-right', {},);
103103

104-
@@ -977,6 +1043,9 @@ export class GettingStartedPage extends
104+
@@ -980,6 +1046,9 @@ export class GettingStartedPage extends
105105
recentList.setLimit(5);
106106
reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
107107
}

‎patches/local-storage.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co
6666
===================================================================
6767
--- code-server.orig/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts
6868
+++ code-server/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts
69-
@@ -148,8 +148,10 @@ export class WorkspaceService extends Di
69+
@@ -150,8 +150,10 @@ export class WorkspaceService extends Di
7070
this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService, uriIdentityService, logService));
7171
this._register(this.workspaceConfiguration.onDidUpdateConfiguration(fromCache => {
7272
this.onWorkspaceConfigurationChanged(fromCache).then(() => {
@@ -79,7 +79,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co
7979
});
8080
}));
8181

82-
@@ -561,6 +563,12 @@ export class WorkspaceService extends Di
82+
@@ -563,6 +565,12 @@ export class WorkspaceService extends Di
8383
previousFolders = this.workspace.folders;
8484
this.workspace.update(workspace);
8585
} else {

‎patches/marketplace.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts
2020
--- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts
2121
+++ code-server/lib/vscode/src/vs/platform/product/common/product.ts
2222
@@ -65,6 +65,17 @@ else if (globalThis._VSCODE_PRODUCT_JSON
23-
Object.assign(product, { copilotVersions: { runtime, sdk } });
23+
Object.assign(product, { copilotVersions: { runtime: packageConfiguration.copilotRuntimeVersion, sdk } });
2424
}
2525
}
2626
+

0 commit comments

Comments
 (0)