fix(core): improve initial custom route detection when using __route

ref vitebook#28
logustra · Feb 7, 2022 · 934c18c · 934c18c
1 parent 679d500
commit 934c18c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/core/src/node/app/create/resolvePages.ts b/packages/core/src/node/app/create/resolvePages.ts
@@ -7,7 +7,7 @@ import {
   ServerPage,
   stripImportQuotesFromJson,
 } from '../../../shared';
-import { fs, globby, readRecentlyChangedFile } from '../../utils/fs';
+import { globby, readRecentlyChangedFile } from '../../utils/fs';
 import { logger } from '../../utils/logger';
 import { path } from '../../utils/path';
 import type { App } from '../App';
@@ -138,7 +138,7 @@ export async function filePathToRoute(
   app: App,
   filePath: string,
 ): Promise<string> {
-  const fileContent = (await fs.readFile(filePath)).toString();
+  const fileContent = (await readRecentlyChangedFile(filePath)).toString();
   const fileExt = path.extname(filePath);
 
   let configuredRoute;

diff --git a/packages/core/src/node/app/vite/dev/corePlugin.ts b/packages/core/src/node/app/vite/dev/corePlugin.ts
@@ -228,14 +228,19 @@ function startWatchingPages(app: App, server: ViteDevServer) {
     .on(
       'change',
       debounce(async (filePath) => {
+        await resolvePendingChanges?.();
+
         await resolvePages(app, 'add', [
           resolveRelativePath(app.dirs.root.path, filePath),
         ]);
 
         const newRoutes = JSON.stringify(app.pages.map((page) => page.route));
 
         if (newRoutes !== prevRoutes) {
-          server.ws.send({ type: 'full-reload' });
+          server.watcher.emit('change', virtualModuleRequestPath.pages);
+          setTimeout(() => {
+            server.ws.send({ type: 'full-reload' });
+          }, 100);
         }
 
         prevRoutes = newRoutes;