fix(renderer-app): monaco-editor load failed in windows system (#999)

netless-io · Oct 14, 2021 · 388ea3f · 388ea3f
1 parent dd1069e
commit 388ea3f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/desktop/renderer-app/src/tasks/init-register-apps.ts b/desktop/renderer-app/src/tasks/init-register-apps.ts
@@ -7,7 +7,7 @@ const registerApps = async (): Promise<void> => {
         appOptions: {
             loader: {
                 paths: {
-                    vs: `file://${getVSPath()}`,
+                    vs: getVSPath(),
                 },
             },
         },
@@ -23,14 +23,18 @@ export const initRegisterApps = async (): Promise<void> => {
 };
 
 const getVSPath = (): string => {
+    let vsPath;
     if (process.env.NODE_ENV === "production") {
-        return path.join(__dirname, "static", "monaco-editor", "min", "vs");
-    }
+        vsPath = path.join(__dirname, "static", "monaco-editor", "min", "vs");
+    } else {
+        const nodeModulesName = "node_modules";
+        const nodeModulesEndIndexByPath =
+            __dirname.indexOf(nodeModulesName) + nodeModulesName.length;
 
-    const nodeModulesName = "node_modules";
-    const nodeModulesEndIndexByPath = __dirname.indexOf(nodeModulesName) + nodeModulesName.length;
+        const rootNodeModulesPath = __dirname.slice(0, nodeModulesEndIndexByPath);
 
-    const rootNodeModulesPath = __dirname.slice(0, nodeModulesEndIndexByPath);
+        vsPath = path.join(rootNodeModulesPath, "monaco-editor", "min", "vs");
+    }
 
-    return path.join(rootNodeModulesPath, "monaco-editor", "min", "vs");
+    return `file:///${vsPath.replace(/\\/g, "/")}`;
 };