bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update import paths

This commit is contained in:
Asher 2024-10-16 19:49:04 -08:00
parent e4ceeabe69
commit 5eb1d84e48
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
4 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/insecure-notification.diff
View File

@ -17,9 +17,9 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
--- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
+++ code-server/lib/vscode/src/vs/workbench/browser/client.ts +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
@@ -1,7 +1,10 @@ @@ -1,7 +1,10 @@
import { Disposable } from 'vs/base/common/lifecycle'; import { Disposable } from "../../base/common/lifecycle.js";
+import { localize } from 'vs/nls'; +import { localize } from '../../nls.js';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; +import { INotificationService, Severity } from '../../platform/notification/common/notification.js';
export class CodeServerClient extends Disposable { export class CodeServerClient extends Disposable {
constructor ( constructor (

14
patches/integration.diff
View File

@ -126,7 +126,7 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
--- /dev/null --- /dev/null
+++ code-server/lib/vscode/src/vs/workbench/browser/client.ts +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
+import { Disposable } from 'vs/base/common/lifecycle'; +import { Disposable } from "../../base/common/lifecycle.js";
+ +
+export class CodeServerClient extends Disposable { +export class CodeServerClient extends Disposable {
+ constructor ( + constructor (
@ -276,12 +276,20 @@ Index: code-server/lib/vscode/src/server-main.js
=================================================================== ===================================================================
--- code-server.orig/lib/vscode/src/server-main.js --- code-server.orig/lib/vscode/src/server-main.js
+++ code-server/lib/vscode/src/server-main.js +++ code-server/lib/vscode/src/server-main.js
@@ -339,4 +339,7 @@ function prompt(question) { @@ -339,4 +339,15 @@ function prompt(question) {
}); });
} }
-start(); -start();
+export default async function loadCodeWithNls() { +async function loadCodeWithNls() {
+ const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname }); + const nlsConfiguration = await resolveNLSConfiguration({ userLocale: 'en', osLocale: 'en', commit: product.commit, userDataPath: '', nlsMetadataPath: __dirname });
+ return loadCode(nlsConfiguration); + return loadCode(nlsConfiguration);
+} +}
+
+// This alias prevents the name getting mangled during obfuscation which would
+// make it difficult to import.
+export { loadCodeWithNls as loadCodeWithNls };
+
+if (!process.env.CODE_SERVER_PARENT_PID) {
+ start();
+}

16
patches/logout.diff
View File

@ -53,14 +53,14 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
--- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
+++ code-server/lib/vscode/src/vs/workbench/browser/client.ts +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
@@ -1,11 +1,15 @@ @@ -1,11 +1,15 @@
import { Disposable } from 'vs/base/common/lifecycle'; import { Disposable } from "../../base/common/lifecycle.js";
import { localize } from 'vs/nls'; import { localize } from '../../nls.js';
+import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; +import { MenuId, MenuRegistry } from '../../platform/actions/common/actions.js';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands'; +import { CommandsRegistry } from '../../platform/commands/common/commands.js';
import { ILogService } from 'vs/platform/log/common/log'; import { ILogService } from '../../platform/log/common/log.js';
import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { INotificationService, Severity } from '../../platform/notification/common/notification.js';
import { IProductService } from 'vs/platform/product/common/productService'; import { IProductService } from '../../platform/product/common/productService.js';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; import { IStorageService, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
export class CodeServerClient extends Disposable { export class CodeServerClient extends Disposable {
+ static LOGOUT_COMMAND_ID = 'code-server.logout'; + static LOGOUT_COMMAND_ID = 'code-server.logout';

12
patches/update-check.diff
View File

@ -13,12 +13,12 @@ Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
--- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts --- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
+++ code-server/lib/vscode/src/vs/workbench/browser/client.ts +++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
@@ -1,10 +1,16 @@ @@ -1,10 +1,16 @@
import { Disposable } from 'vs/base/common/lifecycle'; import { Disposable } from "../../base/common/lifecycle.js";
import { localize } from 'vs/nls'; import { localize } from '../../nls.js';
+import { ILogService } from 'vs/platform/log/common/log'; +import { ILogService } from '../../platform/log/common/log.js';
import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { INotificationService, Severity } from '../../platform/notification/common/notification.js';
+import { IProductService } from 'vs/platform/product/common/productService'; +import { IProductService } from '../../platform/product/common/productService.js';
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'; +import { IStorageService, StorageScope, StorageTarget } from '../../platform/storage/common/storage.js';
export class CodeServerClient extends Disposable { export class CodeServerClient extends Disposable {
constructor ( constructor (