feat: support workbench html in electron-browser dir

close #51

Author: subframe7536

src/manager/base.ts

@@ -5,11 +5,13 @@ import fs from 'node:fs'
 import { readFileSync, writeFileSync } from 'atomically'
 
 import { log } from '../logger'
+import { promptWarn } from '../utils'
 
 export interface FileManager {
   hasBakFile: boolean
   reload: () => Promise<void>
   rollback: () => Promise<void>
+  skipAll?: () => Promisable<string | false | undefined>
 }
 
 export abstract class BaseFileManager implements FileManager {
@@ -22,24 +24,41 @@ export abstract class BaseFileManager implements FileManager {
     return fs.existsSync(this.bakPath)
   }
 
+  skipAll?: (() => Promisable<string | undefined | false>) | undefined
+
   async reload() {
-    if (!this.hasBakFile) {
-      log.warn(`Backup file [${this.bakPath}] does not exist, backuping...`)
-      fs.cpSync(this.srcPath, this.bakPath)
-      log.info(`Create backup file [${this.bakPath}]`)
-    }
-    const newContent = await this.patch(readFileSync(this.bakPath, 'utf-8'))
-    writeFileSync(this.srcPath, newContent)
-    log.info(`Config reload [${this.srcPath}]`)
+    await this.skipable(async () => {
+      if (!this.hasBakFile) {
+        log.warn(`Backup file [${this.bakPath}] does not exist, backuping...`)
+        fs.cpSync(this.srcPath, this.bakPath)
+        log.info(`Create backup file [${this.bakPath}]`)
+      }
+      const newContent = await this.patch(readFileSync(this.bakPath, 'utf-8'))
+      writeFileSync(this.srcPath, newContent)
+      log.info(`Config reload [${this.srcPath}]`)
+    })
   }
 
   async rollback() {
-    if (!this.hasBakFile) {
-      log.warn(`Backup file [${this.bakPath}] does not exist, skip rollback`)
-    } else {
-      writeFileSync(this.srcPath, readFileSync(this.bakPath, 'utf-8'))
-      log.info(`Config rollback [${this.srcPath}]`)
+    await this.skipable(() => {
+      if (!this.hasBakFile) {
+        log.warn(`Backup file [${this.bakPath}] does not exist, skip rollback`)
+      } else {
+        writeFileSync(this.srcPath, readFileSync(this.bakPath, 'utf-8'))
+        log.info(`Config rollback [${this.srcPath}]`)
+      }
+    })
+  }
+
+  async skipable(fn: () => Promisable<void>) {
+    let skipMessage
+    // eslint-disable-next-line no-cond-assign
+    if (skipMessage = await this.skipAll?.()) {
+      promptWarn(skipMessage)
+      return
     }
+
+    await fn()
   }
 
   abstract patch(content: string): Promisable<string>

src/manager/external.ts

@@ -250,6 +250,9 @@ const entryCSS = '<link rel="stylesheet" href="../../../workbench/workbench.desk
 export class ExternalFileManager extends BaseFileManager {
   constructor() {
     super(htmlPath, htmlBakPath)
+    if (!htmlPath) {
+      this.skipAll = () => 'No workbench html found, external resouces are disabled'
+    }
   }
 
   async patch(content: string): Promise<string> {

src/path.ts

@@ -116,13 +116,13 @@ export const productJSONPath = getProductJSONPath('json')
 
 export const productJSONBakPath = getProductJSONPath('json', `${version}.${bakExt}`)
 
-const sandboxPath = path.join(
-  baseDir,
-  'vs',
-  'code',
-  'electron-sandbox',
-  'workbench',
-)
+const workbenchHtmlDir = (() => {
+  const base = path.join(baseDir, 'vs', 'code', 'electron-sandbox')
+  if (fs.existsSync(base)) {
+    return path.join(base, 'workbench')
+  }
+  return path.join(path.dirname(base), 'electron-browser', 'workbench')
+})()
 
 export const htmlPath = (() => {
   const WORKBENCH_NAMES = [
@@ -132,13 +132,12 @@ export const htmlPath = (() => {
     'workbench-dev.esm',
   ]
   for (const name of WORKBENCH_NAMES) {
-    const result = path.join(sandboxPath, `${name}.html`)
+    const result = path.join(workbenchHtmlDir, `${name}.html`)
     if (fs.existsSync(result)) {
       return result
     }
   }
-  log.warn('No html found, use default html path')
-  return path.join(sandboxPath, `${WORKBENCH_NAMES[0]}.html`)
+  return ''
 })()
 
 export const htmlBakPath = htmlPath.replace('.html', `.${bakExt}.html`)
@@ -147,7 +146,7 @@ export const externalCssName = 'external.css'
 export const externalJsName = 'external.js'
 export const externalJsModuleName = 'external.module.js'
 
-export const externalCssPath = path.join(sandboxPath, externalCssName)
-export const externalJsPath = path.join(sandboxPath, externalJsName)
-export const externalJsModulePath = path.join(sandboxPath, externalJsModuleName)
-export const externalCacheInfoPath = path.join(sandboxPath, 'external.cache.json')
+export const externalCssPath = path.join(workbenchHtmlDir, externalCssName)
+export const externalJsPath = path.join(workbenchHtmlDir, externalJsName)
+export const externalJsModulePath = path.join(workbenchHtmlDir, externalJsModuleName)
+export const externalCacheInfoPath = path.join(workbenchHtmlDir, 'external.cache.json')