fix(other): window path bug

soybeanjs · Sep 8, 2023 · 986b2cf · 986b2cf
1 parent 7427077
commit 986b2cf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/packages/core/src/core/options.ts b/packages/core/src/core/options.ts
@@ -1,4 +1,5 @@
 import type { ElegantRouterOption } from '../types';
+import { normalizeWindowsPath } from './path';
 
 /**
  * create the plugin options
@@ -24,7 +25,7 @@ export function createPluginOptions(options?: Partial<ElegantRouterOption>): Ele
   };
 
   // normalize the path if it is windows
-  opts.cwd = opts.cwd.replace(/\\/g, '/');
+  opts.cwd = normalizeWindowsPath(opts.cwd);
 
   return opts;
 }
diff --git a/packages/core/src/core/path.ts b/packages/core/src/core/path.ts
@@ -9,3 +9,11 @@ import path from 'node:path';
 export function getFullPathOfPageGlob(glob: string, pageDir: string, cwd: string) {
   return path.posix.join(cwd, pageDir, glob);
 }
+
+/**
+ * get the full path of the page glob
+ * @param normalPath  the normal path
+ */
+export function normalizeWindowsPath(normalPath: string) {
+  return normalPath.replace(/\\/g, '/');
+}
diff --git a/packages/core/src/core/watcher.ts b/packages/core/src/core/watcher.ts
@@ -1,5 +1,6 @@
 import { watch } from 'chokidar';
 import { log } from './log';
+import { normalizeWindowsPath } from './path';
 
 export function setupWatcher(
   watchDir: string,
@@ -14,9 +15,11 @@ export function setupWatcher(
   });
 
   const stacks: string[] = [];
+
   function addStack(path: string) {
     stacks.push(path);
   }
+
   function clearStack() {
     stacks.length = 0;
   }
@@ -41,11 +44,13 @@ export function setupWatcher(
     log('watcher ready', 'start', showLog);
   });
   watcher.on('add', path => {
-    addStack(path);
+    const normalPath = normalizeWindowsPath(path);
+    addStack(normalPath);
     handleStack();
   });
   watcher.on('unlink', path => {
-    addStack(path);
+    const normalPath = normalizeWindowsPath(path);
+    addStack(normalPath);
     handleStack();
   });