@lvce-editor/shared-process 0.15.17 → 0.15.19

package/config/builtinCommands.json

@@ -230,6 +230,10 @@
     "id": "RebuildNodePty.rebuildNodePty",
     "label": "Developer: Rebuild Node Pty"
   },
+  {
+    "id": "DebugSharedProcess.debugSharedProcess",
+    "label": "Developer: Debug Shared Process"
+  },
   {
     "id": "Window.reload",
     "label": "Window: Reload",

package/extensions/builtin.language-basics-dart/src/tokenizeDart.js

@@ -43,9 +43,10 @@ export const hasArrayReturn = true
 
 const RE_KEYWORD =
   /^(?:abstract|as|assert|async|await|break|case|catch|class|const|continue|covariant|default|deferred|do|dynamic|else|enum|export|extends|extension|external|factory|false|final|finally|for|Function|get|hide|if|implements|import|in|interface|is|late|library|mixin|new|null|on|operator|part|required|rethrow|return|set|show|static|super|switch|sync|this|throw|true|try|typedef|var|void|while|with|yield)\b/
+
 const RE_WHITESPACE = /^\s+/
 const RE_VARIABLE_NAME = /^[a-zA-Z]+/
-const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>]/
+const RE_PUNCTUATION = /^[:,;\{\}\[\]\.=\(\)>+<]/
 const RE_QUOTE_SINGLE = /^'/
 const RE_QUOTE_DOUBLE = /^"/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/

package/extensions/builtin.language-basics-html/src/tokenizeHtml.js

@@ -89,6 +89,7 @@ const RE_SCRIPT_CONTENT_END = /^<\/script/
 const RE_STYLE_CONTENT = /^..*?(?=(?:<\/(?:style|head))|$)/s
 const RE_STYLE_CONTENT_END = /^<\/style/
 const RE_STYLE_CONTENT_END_2 = /^<\/head/
+const RE_TYPE = /^[^\s\>]+/
 
 export const initialLineState = {
   state: State.TopLevelContent,
@@ -98,6 +99,8 @@ export const initialLineState = {
   embeddedLanguageStart: 0,
   embeddedLanguageEnd: 0,
   embeddedState: undefined,
+  specialTag: false,
+  type: '',
 }
 
 /**
@@ -150,6 +153,54 @@ const getEmbeddedContentState = (tag) => {
   }
 }
 
+/**
+ * @param {string} value
+ */
+const unquote = (value) => {
+  for (const quote of ["'", '"']) {
+    if (value.startsWith(quote) && value.endsWith(quote)) {
+      return value.slice(1, -1)
+    }
+  }
+  return value
+}
+
+/**
+ *
+ * @param {string} value
+ */
+const getType = (value) => {
+  const unquotedValue = unquote(value)
+  switch (unquotedValue) {
+    case 'text/javascript':
+    case 'text/x-javascript':
+    case 'text/jscript':
+    case 'text/livescript':
+    case 'text/babel':
+    case 'text/ecmascript':
+    case 'text/x-ecmascript':
+    case 'application/x-javascript':
+    case 'application/javascript':
+    case 'application/x-ecmascript':
+    case 'application/ecmascript':
+    case 'module':
+      return 'javascript'
+    case 'text/x-handlebars':
+    case 'text/x-handlebars-template':
+    case 'text/handlebars-template':
+    case 'text/template':
+    case 'text/x-template':
+    case 'text/ng-template':
+    case 'text/x-ng-template':
+      return 'html'
+    case 'application/json':
+    case 'application/ld+json':
+      return 'json'
+    default:
+      return ''
+  }
+}
+
 /**
  *
  * @param {string} line
@@ -166,6 +217,9 @@ export const tokenizeLine = (line, lineState) => {
   let embeddedLanguage = lineState.embeddedLanguage
   let embeddedLanguageStart = lineState.embeddedLanguageStart
   let embeddedLanguageEnd = lineState.embeddedLanguageEnd
+  let specialTag = lineState.specialTag
+  let attributeName = ''
+  let type = ''
   while (index < line.length) {
     const part = line.slice(index)
     switch (state) {
@@ -198,6 +252,7 @@ export const tokenizeLine = (line, lineState) => {
           token = TokenType.TagName
           state = State.InsideOpeningTag
           tag = next[0]
+          specialTag = tag === 'script' || tag === 'style'
         } else if ((next = part.match(RE_SLASH))) {
           token = TokenType.PunctuationTag
           state = State.AfterClosingTagAngleBrackets
@@ -219,12 +274,15 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          const embeddedLanguageId = type || getEmbeddedLangageId(tag)
           if (embeddedLanguageId) {
             state = getEmbeddedContentState(tag)
             embeddedLanguage = embeddedLanguageId
             embeddedLanguageStart = index + next[0].length
           }
+          specialTag = false
+          type = ''
+          attributeName = ''
         } else if ((next = part.match(RE_EXCLAMATION_MARK))) {
           token = TokenType.PunctuationTag
           state = State.InsideOpeningTag
@@ -281,18 +339,22 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ATTRIBUTE_NAME))) {
           token = TokenType.AttributeName
           state = State.AfterAttributeName
+          attributeName = next[0]
         } else if ((next = part.match(RE_SELF_CLOSING))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
         } else if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          const embeddedLanguageId = type || getEmbeddedLangageId(tag)
           if (embeddedLanguageId) {
             state = getEmbeddedContentState(tag)
             embeddedLanguage = embeddedLanguageId
             embeddedLanguageStart = index + next[0].length
           }
+          specialTag = false
+          type = ''
+          attributeName = ''
         } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
           token = TokenType.Punctuation
           state = State.InsideDoubleQuoteString
@@ -314,12 +376,15 @@ export const tokenizeLine = (line, lineState) => {
         if ((next = part.match(RE_ANGLE_BRACKET_CLOSE))) {
           token = TokenType.PunctuationTag
           state = State.TopLevelContent
-          const embeddedLanguageId = getEmbeddedLangageId(tag)
+          const embeddedLanguageId = type || getEmbeddedLangageId(tag)
           if (embeddedLanguageId) {
             state = getEmbeddedContentState(tag)
             embeddedLanguage = embeddedLanguageId
             embeddedLanguageStart = index + next[0].length
           }
+          specialTag = false
+          type = ''
+          attributeName = ''
         } else if ((next = part.match(RE_EQUAL_SIGN))) {
           token = TokenType.Punctuation
           state = State.AfterAttributeEqualSign
@@ -345,6 +410,13 @@ export const tokenizeLine = (line, lineState) => {
         }
         break
       case State.AfterAttributeEqualSign:
+        if (specialTag && attributeName === 'type') {
+          const valueMatch = part.match(RE_TYPE)
+          if (valueMatch) {
+            const value = valueMatch[0]
+            type = getType(value)
+          }
+        }
         if ((next = part.match(RE_DOUBLE_QUOTE))) {
           token = TokenType.PunctuationString
           state = State.InsideDoubleQuoteString
@@ -473,5 +545,7 @@ export const tokenizeLine = (line, lineState) => {
     embeddedLanguage,
     embeddedLanguageStart,
     embeddedLanguageEnd,
+    specialTag,
+    type,
   }
 }

package/extensions/builtin.language-basics-javascript/src/tokenizeJavaScript.js

@@ -89,6 +89,7 @@ export const TokenMap = {
 
 const RE_KEYWORD =
   /^(?:as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|finally|for|from|function|if|implements|import|in|Infinity|instanceof|interface|let|new|null|of|package|private|protected|public|return|super|switch|static|this|throw|try|true|typeof|undefined|var|void|while|with|yield)\b/
+
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
 const RE_SQUARE_OPEN = /^\[/
@@ -97,6 +98,7 @@ const RE_COMMA = /^,/
 const RE_COLON = /^:/
 const RE_NUMERIC =
   /^((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)\b/
+
 const RE_NUMERIC_OCTAL = /0(?:o|O)?[0-7][0-7_]*(n)?\b/
 const RE_LINE_COMMENT_START = /^\/\//
 const RE_LINE_COMMENT_CONTENT = /^[^\n]+/
@@ -128,6 +130,7 @@ const RE_STRING_ESCAPE = /^\\./
 const RE_SHEBANG = /^#!.*/
 const RE_FUNCTION_CALL_NAME =
   /^[\w]+(?=\s*(\(|\=\s*(?:async\s*)?function|\=\s*(?:async\s*)?\())/
+
 const RE_DECORATOR = /^@\w+/
 const RE_BACKSLASH = /^\\/
 const RE_DOLLAR_CURLY_OPEN = /^\$\{/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.15.17",
+  "version": "0.15.19",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.21.4",
-    "@lvce-editor/extension-host": "0.15.17",
-    "@lvce-editor/extension-host-helper-process": "0.15.17",
-    "@lvce-editor/pty-host": "0.15.17",
+    "@lvce-editor/extension-host": "0.15.19",
+    "@lvce-editor/extension-host-helper-process": "0.15.19",
+    "@lvce-editor/pty-host": "0.15.19",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",
@@ -28,11 +28,7 @@
     "lines-and-columns": "^2.0.3",
     "p-queue": "^7.3.4",
     "parse-json": "^7.0.0",
-    "symlink-dir": "^5.1.1",
-    "tail": "^2.2.6",
     "tar-fs": "^2.1.1",
-    "tmp-promise": "^3.0.3",
-    "trash": "^8.1.1",
     "ws": "^8.13.0",
     "xdg-basedir": "^5.1.0"
   },
@@ -40,6 +36,10 @@
     "extract-zip": "^2.0.1",
     "keytar": "^7.9.0",
     "vscode-ripgrep-with-github-api-error-fix": "^2.8.0",
-    "open": "^9.1.0"
+    "open": "^9.1.0",
+    "symlink-dir": "^5.1.1",
+    "tmp-promise": "^3.0.3",
+    "trash": "^8.1.1",
+    "tail": "^2.2.6"
   }
 }

package/src/parts/AttachDebugger/AttachDebugger.ipc.js

@@ -0,0 +1,7 @@
+import * as AttachDebugger from './AttachDebugger.js'
+
+export const name = 'AttachDebugger'
+
+export const Commands = {
+  attachDebugger: AttachDebugger.attachDebugger,
+}

package/src/parts/AttachDebugger/AttachDebugger.js

@@ -0,0 +1,6 @@
+import * as Process from '../Process/Process.js'
+import * as Signal from '../Signal/Signal.js'
+
+export const attachDebugger = (pid) => {
+  Process.kill(pid, Signal.SIGUSR1)
+}

package/src/parts/Callback/Callback.js

@@ -1,48 +1,39 @@
+import * as Id from '../Id/Id.js'
+
 export const state = {
   callbacks: Object.create(null),
   onceListeners: new Set(),
-  id: 2,
-}
-
-export const register = (resolve, reject) => {
-  state.callbacks[++state.id] = {
-    resolve,
-    reject,
-  }
-  return state.id
 }
 
-export const unregister = (id) => {
-  delete state.callbacks[id]
+export const registerPromise = () => {
+  const id = Id.create()
+  const promise = new Promise((resolve, reject) => {
+    state.callbacks[id] = { resolve, reject }
+  })
+  return { id, promise }
 }
 
 // TODO merge resolve and resolveEmpty
 export const resolve = (id, args) => {
-  if (!(id in state.callbacks)) {
+  const { callbacks } = state
+  if (!(id in callbacks)) {
     console.warn(`callback ${id} may already be disposed`)
     return
   }
-  state.callbacks[id].resolve(args)
-}
-
-export const resolveEmpty = (id) => {
-  if (!(id in state.callbacks)) {
-    console.warn(`callback (resolved) ${id} may already be disposed`)
-    return
-  }
-  state.callbacks[id].resolve()
+  callbacks[id].resolve(args)
+  delete callbacks[id]
 }
 
 export const reject = (id, error) => {
-  if (!(id in state.callbacks)) {
+  const { callbacks } = state
+  if (!(id in callbacks)) {
     console.warn(`callback (rejected) ${id} may already be disposed`)
     return
   }
-  state.callbacks[id].reject(error)
+  callbacks[id].reject(error)
+  delete callbacks[id]
 }
 
 export const isAllEmpty = () => {
-  return (
-    Object.keys(state.callbacks).length === 0 && state.onceListeners.size === 0
-  )
+  return Object.keys(state.callbacks).length === 0 && state.onceListeners.size === 0
 }

package/src/parts/Character/Character.js

@@ -0,0 +1,11 @@
+export const Backslash = '\\'
+export const Dash = '-'
+export const Dot = '.'
+export const EmptyString = ''
+export const NewLine = '\n'
+export const OpenAngleBracket = '<'
+export const Slash = '/'
+export const Space = ' '
+export const Tab = '\t'
+export const Underline = '_'
+export const T = 't'

package/src/parts/CleanStack/CleanStack.js

@@ -7,6 +7,7 @@ const RE_GET_RESPONSE = /^\s*at async getResponse/
 const RE_WEBSOCKET_HANDLE_MESSAGE = /^\s*at async WebSocket.handleMessage/
 const RE_EXECUTE_COMMAND_ASYNC = /^\s*at executeCommandAsync/
 const RE_HANDLE_OTHER_MESSAGES_FROM_MESSAGE_PORT = /^\s*at async MessagePort\.handleOtherMessagesFromMessagePort/
+const RE_ASSERT = /^\s*at .*\/Assert\.js/
 
 const isInternalLine = (line) => {
   return line.includes('node:') || RE_AT_PROMISE_INDEX.test(line) || line.includes('node_modules/ws')
@@ -18,6 +19,9 @@ const isRelevantLine = (line) => {
 
 const isApplicationUsefulLine = (line, index) => {
   if (index === 0) {
+    if (RE_ASSERT.test(line)) {
+      return false
+    }
     return true
   }
   if (RE_GET_RESPONSE.test(line)) {

package/src/parts/CommandNotFoundError/CommandNotFoundError.js

@@ -1,8 +1,9 @@
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as ProcessDisplayName from '../ProcessDisplayName/ProcessDisplayName.js'
 
 export class CommandNotFoundError extends Error {
   constructor(id) {
-    super(`command ${id} not found`)
+    super(`command ${id} not found in ${ProcessDisplayName.processDisplayName}`)
     this.name = 'CommandNotFoundError'
     this.code = ErrorCodes.E_COMMAND_NOT_FOUND
   }

package/src/parts/Configuration/Configuration.js

@@ -1,6 +1,6 @@
-import { readFile } from 'node:fs/promises'
+import * as Character from '../Character/Character.js'
 import { writeFile } from '../FileSystem/FileSystem.js'
-import * as ReadJson from '../JsonFile/JsonFile.js'
+import * as JsonFile from '../JsonFile/JsonFile.js'
 
 let settings
 let settingsPromise
@@ -9,7 +9,7 @@ const readSettings = async () => {
   // TODO allow jsonc
   if (!settings) {
     if (!settingsPromise) {
-      settingsPromise = ReadJson.readJson('/tmp/settings.json')
+      settingsPromise = JsonFile.readJson('/tmp/settings.json')
     }
     await settingsPromise
   }
@@ -18,10 +18,7 @@ const readSettings = async () => {
 
 const writeSettings = async () => {
   // TODO jsonc
-  await writeFile(
-    '/tmp/settings.json',
-    JSON.stringify(settings, null, 2) + '\n'
-  )
+  await writeFile('/tmp/settings.json', JSON.stringify(settings, null, 2) + Character.NewLine)
 }
 
 export const get = async (key) => {

package/src/parts/CreateCpuProfile/CreateCpuProfile.js

@@ -0,0 +1,59 @@
+import { writeFile } from 'fs/promises'
+import got from 'got'
+import { tmpdir } from 'os'
+import { join } from 'path'
+import { WebSocket } from 'ws'
+import * as DevtoolsProtocolRpc from '../DevtoolsProtocolRpc/DevtoolsProtocolRpc.js'
+
+const createConnection = (webSocketDebuggerUrl) => {
+  const webSocket = new WebSocket(webSocketDebuggerUrl)
+  // console.log({ webSocket })
+  return {
+    on(event, listener) {
+      if (event === 'message') {
+        const wrappedListener = (string) => {
+          listener(JSON.parse(string))
+        }
+        webSocket.on(event, wrappedListener)
+      } else {
+        webSocket.on(event, listener)
+      }
+    },
+    send(message) {
+      webSocket.send(JSON.stringify(message))
+    },
+  }
+}
+
+export const createCpuProfile = async (pid) => {
+  // AttachDebugger.attachDebugger(pid)
+  const response = await got('http://localhost:9229/json/list').json()
+  const first = response[0]
+  const webSocketDebuggerUrl = first.webSocketDebuggerUrl
+  const ipc = createConnection(webSocketDebuggerUrl)
+
+  await new Promise((r) => {
+    ipc.on('open', r)
+  })
+  const rpc = DevtoolsProtocolRpc.create(ipc)
+  const result = await rpc.invoke('Debugger.enable')
+  const debuggerId = result.result.debuggerId
+  console.log({ debuggerId })
+  const p = await rpc.invoke('Profiler.enable')
+  await rpc.invoke('Profiler.start')
+  await new Promise((r) => {
+    setTimeout(r, 10000)
+  })
+  const profileResult = await rpc.invoke('Profiler.stop')
+  console.log({ profileResult })
+  const profile = profileResult.result.profile
+  const profilePath = join(tmpdir(), 'node-profile.cpuprofile')
+  const profileString = JSON.stringify(profile)
+  await writeFile(profilePath, profileString)
+  console.log('finished')
+  // const value = await rpc.invoke('Runtime.evaluate', {
+  //   expression: '1+1',
+  // })
+  // await rpc.invoke('Debugger.pause')
+  // console.log({ value })
+}

package/src/parts/DestroySocket/DestroySocket.js

@@ -0,0 +1,5 @@
+export const destroySocket = (socket) => {
+  try {
+    socket.destroy()
+  } catch {}
+}

package/src/parts/DevtoolsProtocolRpc/DevtoolsProtocolRpc.js

@@ -0,0 +1,32 @@
+const Id = {
+  id: 1,
+  create() {
+    return this.id++
+  },
+}
+
+export const create = (ipc) => {
+  const callbacks = Object.create(null)
+  const handleMessage = (message) => {
+    if ('result' in message) {
+      const callback = callbacks[message.id]
+      callback(message)
+      delete callbacks[message.id]
+    }
+  }
+  ipc.on('message', handleMessage)
+  return {
+    invoke(method, params = {}) {
+      const id = Id.create()
+      const promise = new Promise((resolve, reject) => {
+        callbacks[id] = resolve
+      })
+      ipc.send({
+        method,
+        id,
+        params,
+      })
+      return promise
+    },
+  }
+}

package/src/parts/ElectronInitialize/ElectronInitialize.js

@@ -1,40 +1,11 @@
-import * as Callback from '../Callback/Callback.js'
-import * as Command from '../Command/Command.js'
-import * as GetResponse from '../GetResponse/GetResponse.js'
+import * as HandleIpc from '../HandleIpc/HandleIpc.js'
+import * as IpcChild from '../IpcChild/IpcChild.js'
+import * as IpcChildType from '../IpcChildType/IpcChildType.js'
 
-export const electronInitialize = (port, folder) => {
-  // TODO handle error
-  const fakeSocket = {
-    send: port.postMessage.bind(port),
-    on(event, listener) {
-      switch (event) {
-        case 'close':
-          port.on('close', listener)
-          break
-        case 'message':
-          port.on('message', listener)
-          break
-        default:
-          console.warn('socket event not implemented', event, listener)
-          break
-      }
-    },
-  }
-  const handleOtherMessagesFromMessagePort = async (message) => {
-    // console.log('got port message', message)
-    if (message.result) {
-      Callback.resolve(message.id, message.result)
-    } else if (message.method) {
-      if (message.id) {
-        const response = await GetResponse.getResponse(message, fakeSocket)
-        port.postMessage(response)
-      } else {
-        console.warn(`[shared process] sending messages without id is deprecated: ${message.method}`)
-        Command.execute(message.method, fakeSocket, ...message.params)
-      }
-    } else {
-      console.warn('unknown message', message)
-    }
-  }
-  port.on('message', handleOtherMessagesFromMessagePort)
+export const electronInitialize = async (port, folder) => {
+  const ipc = await IpcChild.listen({
+    method: IpcChildType.NodeMessagePort,
+    messagePort: port,
+  })
+  HandleIpc.handleIpc(ipc)
 }

package/src/parts/ErrorHandling/ErrorHandling.js

@@ -1,11 +1,10 @@
+import * as Character from '../Character/Character.js'
 import * as ExitCode from '../ExitCode/ExitCode.js'
+import * as GetNewLineIndex from '../GetNewLineIndex/GetNewLineIndex.js'
 import * as IsIgnoredError from '../IsIgnoredError/IsIgnoredError.js'
-import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
 import * as Logger from '../Logger/Logger.js'
 import * as PrettyError from '../PrettyError/PrettyError.js'
 import * as Process from '../Process/Process.js'
-import * as Socket from '../Socket/Socket.js'
-import * as GetNewLineIndex from '../GetNewLineIndex/GetNewLineIndex.js'
 
 export const state = {
   seenErrors: [],
@@ -30,17 +29,17 @@ export const handleError = (error) => {
   }
   state.seenErrors.push(error.message)
   const prettyError = preparePrettyError(error)
-  Socket.send({
-    jsonrpc: JsonRpcVersion.Two,
-    method: /* Dialog.showErrorDialogWithOptions */ 'Dialog.showMessage',
-    params: [
-      {
-        message: prettyError.message,
-        codeFrame: prettyError.codeFrame,
-        stack: prettyError.stack,
-      },
-    ],
-  })
+  // Socket.send({
+  //   jsonrpc: JsonRpcVersion.Two,
+  //   method: /* Dialog.showErrorDialogWithOptions */ 'Dialog.showMessage',
+  //   params: [
+  //     {
+  //       message: prettyError.message,
+  //       codeFrame: prettyError.codeFrame,
+  //       stack: prettyError.stack,
+  //     },
+  //   ],
+  // })
   printPrettyError(prettyError)
 }
 
@@ -64,6 +63,6 @@ export const handleUncaughtExceptionMonitor = (error, origin) => {
     return
   }
   const prettyError = PrettyError.prepare(error)
-  Logger.error(prettyError.codeFrame + '\n' + prettyError.stack + '\n')
+  Logger.error(prettyError.codeFrame + Character.NewLine + prettyError.stack + Character.NewLine)
   Process.setExitCode(ExitCode.Error)
 }

package/src/parts/ExportStatic/ExportStatic.js

@@ -119,13 +119,8 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
-    `getColorThemeUrlWeb = (colorThemeId) => {
-      return \`/extensions/builtin.theme-\${colorThemeId}/color-theme.json\`;
-    };`,
-    `const getColorThemeUrlWeb = (colorThemeId) => {
-      const assetDir = getAssetDir()
-      return \`\${assetDir}/themes/\${colorThemeId}.json\`
-    }`
+    `return \`\${assetDir}/extensions/builtin.theme-\${colorThemeId}/color-theme.json\``,
+    `return \`\${assetDir}/themes/\${colorThemeId}.json\``
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'extension-host-worker', 'dist', 'extensionHostWorkerMain.js'),
@@ -134,13 +129,8 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),
-    `getIconThemeUrl = (iconThemeId) => {
-      return \`/extensions/builtin.\${iconThemeId}/icon-theme.json\`;
-    }`,
-    `getIconThemeUrl = (iconThemeId) => {
-      const assetDir = getAssetDir()
-      return \`\${assetDir}/icon-themes/\${iconThemeId}.json\`
-    }`
+    `return \`\${assetDir}/extensions/builtin.\${iconThemeId}/icon-theme.json\``,
+    `return \`\${assetDir}/icon-themes/\${iconThemeId}.json\``
   )
   await replace(
     Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'),

package/src/parts/GetActualPath/GetActualPath.js

@@ -0,0 +1,8 @@
+import { fileURLToPath } from 'node:url'
+
+export const getActualPath = (fileUri) => {
+  if (fileUri.startsWith('file://')) {
+    return fileURLToPath(fileUri)
+  }
+  return fileUri
+}