Merge pull request #241 from CodinGame/improve-asset-management

Improve asset management

.github/workflows/release.yml

@@ -1,8 +1,6 @@
 name: Release
 
-on:
-  push:
-    branches: [main]
+on: workflow_dispatch
 
 permissions:
   contents: write      # to be able to publish a GitHub release

rollup/rollup.config.ts

@@ -559,10 +559,7 @@ export default (args: Record<string, string>): rollup.RollupOptions[] => {
         return '[name].js'
       },
       chunkFileNames: '[name].js',
-      hoistTransitiveImports: false,
-      paths: {
-        'monaco-editor': 'monaco-editor/esm/vs/editor/editor.api.js'
-      }
+      hoistTransitiveImports: false
     }],
     input,
     plugins: [

src/assets.ts

@@ -1,21 +1,7 @@
-let assetUrls: Record<string, string | (() => string)> = {}
-export function registerAssets (assets: Record<string, string | (() => string)>): void {
-  assetUrls = {
-    ...assetUrls,
-    ...assets
-  }
-}
+import { FileAccess } from 'vs/base/common/network'
 
-function toUrl (name: string): string | undefined {
-  let url = assetUrls[name]
-  if (typeof url === 'function') {
-    url = url()
+export function registerAssets (assets: Record<string, string | (() => string)>): void {
+  for (const [moduleId, url] of Object.entries(assets)) {
+    FileAccess.registerAppResourcePathUrl(moduleId, url)
   }
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  return new URL(url ?? '', globalThis.location?.href ?? import.meta.url).toString()
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-(globalThis as any).monacoRequire = {
-  toUrl
 }

src/server/bootstrap-fork.ts

@@ -1,5 +1,4 @@
 import { createRequire } from 'node:module'
-import { registerAssets } from '../assets'
 
 const entrypoints: Record<string, () => Promise<void>> = {
   'vs/workbench/api/node/extensionHostProcess': async () => { await import('vs/workbench/api/node/extensionHostProcess') },
@@ -10,9 +9,6 @@ const entrypoints: Record<string, () => Promise<void>> = {
 
 const require = createRequire(import.meta.url)
 
-// just to create globalThis.monacoRequire
-registerAssets({})
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ;(globalThis as any)._VSCODE_NODE_MODULES = new Proxy(Object.create(null), { get: (_target, mod) => require(String(mod)) })