Merge pull request #618 from CodinGame/fix-product-config

[FIX] Properly inject product configuration

Author: CGNonofr

rollup/rollup.config.ts

@@ -125,7 +125,7 @@ export default (args: Record<string, string>): rollup.RollupOptions => {
         external,
         transformers: [typeDedupReplaceTransformer]
       }),
-      resolveVscodePlugin(),
+      resolveVscodePlugin(vscodeVersion, vscodeCommit),
       vscodeLocalizationPlugin(),
       typescript({
         noEmitOnError: true,
@@ -148,9 +148,6 @@ export default (args: Record<string, string>): rollup.RollupOptions => {
         }
       }),
       replace({
-        VSCODE_VERSION: JSON.stringify(vscodeVersion),
-        VSCODE_REF: JSON.stringify(vscodeRef),
-        VSCODE_COMMIT: JSON.stringify(vscodeCommit),
         BUILD_ID: JSON.stringify(`${vscodeRef}-${crypto.randomUUID()}`),
         'globalThis.require': 'undefined',
         preventAssignment: true

rollup/tools/vscode.ts

@@ -14,6 +14,11 @@ import {
   VSCODE_DIR,
   VSCODE_SRC_DIR
 } from './config.js'
+import { dataToEsm } from '@rollup/pluginutils'
+
+const product = JSON.parse(
+  fs.readFileSync(new URL('../../vscode/product.json', import.meta.url).pathname).toString()
+)
 
 const { firstBy } = thenby
 
@@ -112,7 +117,12 @@ function getMemberExpressionPath(
   return null
 }
 
-export function transformVSCodeCode(id: string, code: string): string {
+export function transformVSCodeCode(
+  id: string,
+  code: string,
+  vscodeVersion?: string,
+  vscodeCommit?: string
+): string {
   // HACK: assign typescript decorator result to a decorated class field so rollup doesn't remove them
   // before:
   // __decorate([
@@ -129,6 +139,26 @@ export function transformVSCodeCode(id: string, code: string): string {
     '$2.__decorator = $1'
   )
 
+  /**
+   * Replace default product file by product.json file content
+   */
+  if (id.endsWith('vs/platform/product/common/product.js')) {
+    patchedCode = dataToEsm(
+      {
+        ...product,
+        quality: 'stable',
+        version: vscodeVersion,
+        commit: vscodeCommit,
+        date: new Date().toISOString()
+      },
+      {
+        compact: false,
+        namedExports: false,
+        preferConst: false
+      }
+    )
+  }
+
   let cssImportCounter = 0
   const ast = recast.parse(patchedCode, {
     parser: babylonParser
@@ -321,7 +351,7 @@ function resolveVscode(importee: string, importer?: string) {
   return undefined
 }
 
-export function resolveVscodePlugin(): rollup.Plugin {
+export function resolveVscodePlugin(vscodeVersion?: string, vscodeCommit?: string): rollup.Plugin {
   return {
     name: 'resolve-vscode',
     resolveId: (importeeUrl, importer) => {
@@ -345,7 +375,7 @@ export function resolveVscodePlugin(): rollup.Plugin {
       }
 
       const content = (await fs.promises.readFile(id)).toString('utf-8')
-      return transformVSCodeCode(id, content)
+      return transformVSCodeCode(id, content, vscodeVersion, vscodeCommit)
     }
   }
 }

scripts/install-vscode

@@ -81,7 +81,7 @@ NODE_OPTIONS=--max-old-space-size=8192 npx tsc --declaration --importHelpers --o
 find ./ \( -name '*.js' -o -name '*.d.ts' -o -name '*.ttf' -o -name '*.css' -o -name '*.mp3' -o -name '*.scm' -o -name '*.svg' -o -name '*.png' -o -name '*.html' -o -name '*.sh' -o -name '*.zsh' -o -name '*.ps1' \) -exec rsync -R \{\} "$output_directory/src" \;
 
 cd ..
-cp package.json $output_directory
+cp package.json product.json $output_directory
 # Copy editor types
 cp out-monaco-editor-core/esm/vs/editor/editor.api.d.ts $output_directory/src/vs/editor/editor.api.d.ts
 

src/extension.api.ts

@@ -23,6 +23,7 @@ import * as editorOptions from 'vs/editor/common/config/editorOptions'
 import * as uri from 'vs/base/common/uri'
 import * as telemetry from 'vs/platform/telemetry/common/telemetryUtils'
 import { defaultApi } from './localExtensionHost.js'
+import deprecatedProduct from 'vs/platform/product/common/product'
 
 function createProxy<T extends keyof typeof vscode>(key: T): (typeof vscode)[T] {
   return new Proxy(
@@ -42,7 +43,7 @@ function createProxy<T extends keyof typeof vscode>(key: T): (typeof vscode)[T]
 }
 
 const api: typeof vscode = {
-  version: VSCODE_VERSION,
+  version: deprecatedProduct.version,
   tasks: createProxy('tasks'),
   notebooks: createProxy('notebooks'),
   scm: createProxy('scm'),

src/missing-services.ts

@@ -1342,8 +1342,8 @@ registerSingleton(IPathService, PathService, InstantiationType.Delayed)
 class ProductService implements IProductService {
   readonly _serviceBrand = undefined
 
-  version = VSCODE_VERSION
-  commit = VSCODE_COMMIT
+  version = 'unknown'
+  commit = 'unknown'
   quality = 'oss'
   nameShort = 'Code - OSS Dev'
   nameLong = 'Code - OSS Dev'

src/services.ts

@@ -21,7 +21,6 @@ import type {
   IWorkbenchConstructionOptions,
   IWorkspaceProvider
 } from 'vs/workbench/browser/web.api'
-import type { IProductConfiguration } from 'vs/base/common/product'
 import {
   type ILazyWorkbenchContributionInstantiation,
   type IOnEditorWorkbenchContributionInstantiation,
@@ -50,6 +49,8 @@ import getLayoutServiceOverride from './service-override/layout'
 import getHostServiceOverride from './service-override/host'
 import getBaseServiceOverride from './service-override/base'
 import { injectCss } from './css'
+import deprecatedProduct from 'vs/platform/product/common/product'
+import { mixin } from 'vs/base/common/objects'
 
 declare global {
   interface Window {
@@ -76,22 +77,13 @@ export async function initialize(
   injectCss(container)
   initializeWorkbench(container, configuration, env)
 
+  const productService: IProductService = mixin(
+    { _serviceBrand: undefined, ...deprecatedProduct },
+    configuration.productConfiguration
+  )
+
   const instantiationService = StandaloneServices.initialize({
-    [IProductService.toString()]: <Partial<IProductConfiguration>>{
-      version: VSCODE_VERSION,
-      quality: 'stable',
-      commit: VSCODE_COMMIT,
-      nameShort: 'Code - OSS',
-      nameLong: 'Code - OSS',
-      applicationName: 'code-oss',
-      dataFolderName: '.vscode-oss',
-      urlProtocol: 'code-oss',
-      reportIssueUrl: 'https://github.com/microsoft/vscode/issues/new',
-      licenseName: 'MIT',
-      licenseUrl: 'https://github.com/microsoft/vscode/blob/main/LICENSE.txt',
-      serverApplicationName: 'code-server-oss',
-      ...(configuration.productConfiguration ?? {})
-    },
+    [IProductService.toString()]: productService,
     ...getLayoutServiceOverride(), // Always override layout service to break cyclic dependency with ICodeEditorService
     ...getEnvironmentServiceOverride(),
     ...getExtensionsServiceOverride(),

src/types.d.ts

@@ -1,6 +1,3 @@
-declare const VSCODE_VERSION: string
-declare const VSCODE_REF: string
-declare const VSCODE_COMMIT: string
 declare const BUILD_ID: string
 
 declare module 'vs/platform/accessibilitySignal/browser/media/*.mp3' {