From d37f7789f3efaf5e8c9a26342c1578dbe06bf1d2 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 5 Apr 2023 22:15:58 +0200 Subject: [PATCH 1/2] adopt product overrides --- src/server/workbench.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/server/workbench.ts b/src/server/workbench.ts index f9969ad..1dba0bc 100644 --- a/src/server/workbench.ts +++ b/src/server/workbench.ts @@ -34,7 +34,7 @@ function asJSON(value: unknown): string { } class Workbench { - constructor(readonly baseUrl: string, readonly dev: boolean, readonly esm: boolean, private readonly builtInExtensions: IScannedBuiltinExtension[] = []) { } + constructor(readonly baseUrl: string, readonly dev: boolean, readonly esm: boolean, private readonly builtInExtensions: IScannedBuiltinExtension[] = [], private readonly productOverrides: string = '') { } async render(workbenchWebConfiguration: IWorkbenchOptions): Promise { const values: { [key: string]: string } = { @@ -42,6 +42,7 @@ class Workbench { WORKBENCH_AUTH_SESSION: '', WORKBENCH_WEB_BASE_URL: this.baseUrl, WORKBENCH_BUILTIN_EXTENSIONS: asJSON(this.builtInExtensions), + WORKBENCH_PRODUCT_OVERRIDES: this.productOverrides, WORKBENCH_MAIN: this.getMain() }; @@ -133,7 +134,8 @@ export default function (config: IConfig): Router.Middleware { router.use(async (ctx, next) => { if (config.build.type === 'sources') { const builtInExtensions = await getScannedBuiltinExtensions(config.build.location); - ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/sources`, true, config.esm, builtInExtensions); + const productOverrides = await getProductOverridesContent(config.build.location); + ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/sources`, true, config.esm, builtInExtensions, productOverrides); } else if (config.build.type === 'static') { ctx.state.workbench = new Workbench(`${ctx.protocol}://${ctx.host}/static/build`, false, config.esm); } else if (config.build.type === 'cdn') { @@ -157,3 +159,11 @@ export default function (config: IConfig): Router.Middleware { return router.routes(); } + +async function getProductOverridesContent(vsCodeDevLocation: string): Promise { + try { + return (await fs.readFile(path.join(vsCodeDevLocation, 'product.overrides.json'))).toString(); + } catch (e) { + return ''; + } +} From 83fe5dc11bda544c08b1e6e5b4d1998565b26ca2 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 5 Apr 2023 22:16:18 +0200 Subject: [PATCH 2/2] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9bbd1b..c1fc8b9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@vscode/test-web", - "version": "0.0.38", + "version": "0.0.39", "scripts": { "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample", "compile": "tsc -p ./ && yarn compile-fs-provider",