fix: normalize all routes, error while running in Window environment

sanyuan0704 · Sep 22, 2022 · 7294335 · 7294335
1 parent f5c6a94
commit 7294335
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/node/plugin-routes/RouteService.ts b/src/node/plugin-routes/RouteService.ts
@@ -1,3 +1,4 @@
+import { normalizePath } from 'vite';
 import fastGlob from 'fast-glob';
 import fs from 'fs-extra';
 import { RUNTIME_BUNDLE_OUTDIR } from '../constants';
@@ -42,12 +43,16 @@ export class RouteService {
   }
 
   addRoute(filePath: string) {
-    const fileRelativePath = path.relative(this.scanDir, filePath);
+    const fileRelativePath = normalizePath(
+      path.relative(this.scanDir, filePath)
+    );
     const routePath = normalizeRoutePath(fileRelativePath);
+    const absolutePath = path.join(this.scanDir, fileRelativePath);
+
     this.#routeData.push({
       routePath,
       basePath: this.scanDir,
-      absolutePath: path.join(this.scanDir, fileRelativePath)
+      absolutePath: normalizePath(absolutePath)
     });
   }
 

diff --git a/src/node/plugin-routes/index.ts b/src/node/plugin-routes/index.ts
@@ -1,8 +1,8 @@
 import path from 'path';
 import { PageModule } from '../../shared/types';
 import type { Plugin } from 'vite';
+import { normalizePath } from 'vite';
 import { RouteService } from './RouteService';
-import { normalizePath } from '../utils';
 
 /**
  * How does the conventional route work?

diff --git a/src/node/utils.ts b/src/node/utils.ts
@@ -11,7 +11,3 @@ export const createHash = (info: string): string => {
   }
   return createHashFunc('sha256').update(info).digest('hex').slice(0, 8);
 };
-
-export const normalizePath = (url: string, sep = '/') => {
-  return url.replace(/\\/g, sep);
-};