fix(entries): update default entry module id

Author: Codpoe

packages/entries/src/constants.ts

@@ -3,7 +3,9 @@ import path from 'upath';
 export const DEFAULT_HTML_PATH = path.resolve(__dirname, '../default.html');
 
 export const DEFAULT_ENTRY_MODULE_ID =
-  '/@conventional-entries/default-entry.jsx';
+  'virtual:conventional-entries/default-entry.jsx';
+
+export const RESOLVED_DEFAULT_ENTRY_MODULE_ID = '\0' + DEFAULT_ENTRY_MODULE_ID;
 
 export const HEAD_INJECT_RE = /([ \t]*)<\/head>/i;
 export const HEAD_PREPEND_INJECT_RE = /([ \t]*)<head[^>]*>/i;

packages/entries/src/html.ts

@@ -214,11 +214,11 @@ function getEntryClientPath(entry: Entry): string {
     );
 
     if (fs.existsSync(entryClientPath)) {
-      return entryClientPath;
+      return `/@fs/${entryClientPath}`;
     }
   }
 
-  return `${DEFAULT_ENTRY_MODULE_ID}?routePath=${entry.routePath}`;
+  return `/@id/${DEFAULT_ENTRY_MODULE_ID}?routePath=${entry.routePath}`;
 }
 
 function injectEntryScript(html: string, entry: Entry): string {
@@ -230,7 +230,7 @@ function injectEntryScript(html: string, entry: Entry): string {
   return injectHtml(
     html,
     'body',
-    `<script type="module" src="/@fs/${getEntryClientPath(entry)}"></script>`
+    `<script type="module" src="${getEntryClientPath(entry)}"></script>`
   );
 }
 

packages/entries/src/index.ts

@@ -5,7 +5,11 @@ import fg from 'fast-glob';
 import mm from 'micromatch';
 import { Entry, UserConfig, UserEntryConfigItem } from './types';
 import { flattenPath, normalizeRoutePath, toArray } from './utils';
-import { DEFAULT_ENTRY_MODULE_ID, DEFAULT_HTML_PATH } from './constants';
+import {
+  DEFAULT_ENTRY_MODULE_ID,
+  DEFAULT_HTML_PATH,
+  RESOLVED_DEFAULT_ENTRY_MODULE_ID,
+} from './constants';
 import {
   minifyHtml,
   prettifyHtml,
@@ -15,6 +19,8 @@ import {
 
 export * from './types';
 
+export { DEFAULT_ENTRY_MODULE_ID, RESOLVED_DEFAULT_ENTRY_MODULE_ID };
+
 function getHtmlOutDir(root: string) {
   const nodeModulesDir = path.resolve(root, 'node_modules');
 
@@ -237,11 +243,14 @@ export function conventionalEntries(userConfig: UserConfig = {}): Plugin[] {
       },
       resolveId(source) {
         if (source.startsWith(DEFAULT_ENTRY_MODULE_ID)) {
-          return source;
+          return source.replace(
+            DEFAULT_ENTRY_MODULE_ID,
+            RESOLVED_DEFAULT_ENTRY_MODULE_ID
+          );
         }
       },
       async load(id) {
-        if (id.startsWith(DEFAULT_ENTRY_MODULE_ID)) {
+        if (id.startsWith(RESOLVED_DEFAULT_ENTRY_MODULE_ID)) {
           const query = new URLSearchParams(id.split('?')[1]);
           const routePath = normalizeRoutePath(query.get('routePath') || '/');
           const entry = entries.find(entry => entry.routePath === routePath);