diff --git a/.node-version b/.node-version index 8dfc5cb1a..b7179aed0 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -24.18.1 +24.20.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f159ce41..3ae16a877 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,12 @@ Code v99.99.999 ## Unreleased +Code v1.139.0 + +### Changed + +- Update to Code 1.139.0 + ### Fixed - `--idle-timeout-seconds` was only validated when passed as `--idle-timeout-seconds=`; diff --git a/lib/vscode b/lib/vscode index 7debcd0e2..2242ebbb5 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit 7debcd0e2acdea1c52de81bf9ee1620444407dda +Subproject commit 2242ebbb54efeeb0129e08e919e7e8d43033cd83 diff --git a/patches/copilot.diff b/patches/copilot.diff index c66ccdb09..22075a19a 100644 --- a/patches/copilot.diff +++ b/patches/copilot.diff @@ -44,7 +44,7 @@ Index: code-server/lib/vscode/build/lib/extensions.ts import watcher from './watch/index.ts'; import { createRequire } from 'module'; -@@ -491,6 +492,116 @@ export function packageCopilotExtensionS +@@ -487,6 +488,116 @@ export function packageCopilotExtensionS ).pipe(util2.setExecutableBit(['**/*.sh'])); } diff --git a/patches/display-language.diff b/patches/display-language.diff index ee643972d..361bf2f78 100644 --- a/patches/display-language.diff +++ b/patches/display-language.diff @@ -56,7 +56,7 @@ Index: code-server/lib/vscode/src/vs/server/node/remoteLanguagePacks.ts import type { INLSConfiguration } from '../../nls.js'; @@ -33,7 +35,94 @@ export async function getNLSConfiguratio if (!result) { - result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, userDataPath, nlsMetadataPath }); + result = resolveNLSConfiguration({ userLocale: language, osLocale: language, commit: product.commit, nlsMetadataHash: product.nlsMetadataHash, userDataPath, nlsMetadataPath }); nlsConfigurationCache.set(cacheKey, result); + // If the language pack does not yet exist, it defaults to English, which is + // then cached and you have to restart even if you then install the pack. diff --git a/patches/getting-started.diff b/patches/getting-started.diff index a8ba914df..dab9d4144 100644 --- a/patches/getting-started.diff +++ b/patches/getting-started.diff @@ -19,7 +19,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js'; import { status } from '../../../../base/browser/ui/aria/aria.js'; import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js'; -@@ -54,7 +54,7 @@ import { IRecentFolder, IRecentWorkspace +@@ -55,7 +55,7 @@ import { IRecentFolder, IRecentWorkspace import { OpenRecentAction } from '../../../browser/actions/windowActions.js'; import { OpenFileFolderAction, OpenFolderAction, OpenFolderViaWorkspaceAction } from '../../../browser/actions/workspaceActions.js'; import { EditorPane } from '../../../browser/parts/editor/editorPane.js'; @@ -28,7 +28,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro import { IEditorOpenContext, IEditorSerializer } from '../../../common/editor.js'; import { IWebviewElement, IWebviewService } from '../../webview/browser/webview.js'; import './gettingStartedColors.js'; -@@ -928,6 +928,72 @@ export class GettingStartedPage extends +@@ -930,6 +930,72 @@ export class GettingStartedPage extends $('p.subtitle.description', {}, localize({ key: 'gettingStarted.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved")) ); @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro const leftColumn = $('.categories-column.categories-column-left', {},); const rightColumn = $('.categories-column.categories-column-right', {},); -@@ -977,6 +1043,9 @@ export class GettingStartedPage extends +@@ -980,6 +1046,9 @@ export class GettingStartedPage extends recentList.setLimit(5); reset(leftColumn, startList.getDomElement(), recentList.getDomElement()); } diff --git a/patches/local-storage.diff b/patches/local-storage.diff index c42dd189f..7799e532e 100644 --- a/patches/local-storage.diff +++ b/patches/local-storage.diff @@ -66,7 +66,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co =================================================================== --- code-server.orig/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts +++ code-server/lib/vscode/src/vs/workbench/services/configuration/browser/configurationService.ts -@@ -148,8 +148,10 @@ export class WorkspaceService extends Di +@@ -150,8 +150,10 @@ export class WorkspaceService extends Di this.workspaceConfiguration = this._register(new WorkspaceConfiguration(configurationCache, fileService, uriIdentityService, logService)); this._register(this.workspaceConfiguration.onDidUpdateConfiguration(fromCache => { this.onWorkspaceConfigurationChanged(fromCache).then(() => { @@ -79,7 +79,7 @@ Index: code-server/lib/vscode/src/vs/workbench/services/configuration/browser/co }); })); -@@ -561,6 +563,12 @@ export class WorkspaceService extends Di +@@ -563,6 +565,12 @@ export class WorkspaceService extends Di previousFolders = this.workspace.folders; this.workspace.update(workspace); } else { diff --git a/patches/marketplace.diff b/patches/marketplace.diff index efd76c2c0..5e867ee61 100644 --- a/patches/marketplace.diff +++ b/patches/marketplace.diff @@ -20,7 +20,7 @@ Index: code-server/lib/vscode/src/vs/platform/product/common/product.ts --- code-server.orig/lib/vscode/src/vs/platform/product/common/product.ts +++ code-server/lib/vscode/src/vs/platform/product/common/product.ts @@ -65,6 +65,17 @@ else if (globalThis._VSCODE_PRODUCT_JSON - Object.assign(product, { copilotVersions: { runtime, sdk } }); + Object.assign(product, { copilotVersions: { runtime: packageConfiguration.copilotRuntimeVersion, sdk } }); } } + diff --git a/patches/sourcemaps.diff b/patches/sourcemaps.diff index 22ca7ef04..fdf69d39a 100644 --- a/patches/sourcemaps.diff +++ b/patches/sourcemaps.diff @@ -6,7 +6,7 @@ Index: code-server/lib/vscode/build/gulpfile.reh.ts =================================================================== --- code-server.orig/lib/vscode/build/gulpfile.reh.ts +++ code-server/lib/vscode/build/gulpfile.reh.ts -@@ -344,10 +344,15 @@ function packageTask(type: string, platf +@@ -260,10 +260,15 @@ function packageTask(type: string, platf const destination = path.join(BUILD_ROOT, destinationFolderName); return () => { diff --git a/patches/update-check.diff b/patches/update-check.diff index 682faf18b..091f787e8 100644 --- a/patches/update-check.diff +++ b/patches/update-check.diff @@ -101,7 +101,7 @@ Index: code-server/lib/vscode/src/vs/base/common/product.ts readonly version: string; readonly date?: string; -@@ -145,6 +146,7 @@ export interface IProductConfiguration { +@@ -148,6 +149,7 @@ export interface IProductConfiguration { }; readonly extensionsGallery?: {