fix: handle prefixed virtual ids in pages filter hooks

Agent-Logs-Url: https://github.com/ElMassimo/iles/sessions/2f29b5ee-5bf6-4265-aed8-abd9fd19681f

Co-authored-by: ElMassimo <1158253+ElMassimo@users.noreply.github.com>

Author: Copilot

packages/iles/src/node/build/islands.ts

@@ -56,34 +56,21 @@ export async function bundleIslands (config: AppConfig, islandsByPath: IslandsBy
 }
 
 function virtualEntrypointsPlugin (root: string, entrypoints: Record<string, string>): Plugin {
-  const escapeRegex = (value: string) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-  const entryIds = Object.keys(entrypoints)
-  const entrypointIdFilter = entryIds.length > 0
-    ? new RegExp(`^(?:${entryIds.map(escapeRegex).join('|')})$`)
-    : /^$/
-  const turboIdFilter = /(?:^|[\\/])iles[\\/]turbo(?:\?|$)/
-
   return {
     name: 'iles:entrypoints',
-    resolveId: {
-      filter: { id: [entrypointIdFilter, turboIdFilter] },
-      handler (id, importer) {
-        if (id in entrypoints)
-          return VIRTUAL_PREFIX + id
+    resolveId (id, importer) {
+      if (id in entrypoints)
+        return VIRTUAL_PREFIX + id
 
-        if (relative(root, id.split('?', 2)[0]) === VIRTUAL_TURBO_ID)
-          return VIRTUAL_TURBO_ID
-      },
+      if (relative(root, id.split('?', 2)[0]) === VIRTUAL_TURBO_ID)
+        return VIRTUAL_TURBO_ID
     },
-    load: {
-      filter: { id: { include: [/^virtual_ile_/, VIRTUAL_TURBO_ID] } },
-      async handler (id) {
-        if (id.startsWith(VIRTUAL_PREFIX))
-          return entrypoints[id.slice(VIRTUAL_PREFIX.length)]
+    async load (id) {
+      if (id.startsWith(VIRTUAL_PREFIX))
+        return entrypoints[id.slice(VIRTUAL_PREFIX.length)]
 
-        if (id === VIRTUAL_TURBO_ID)
-          return await fs.readFile(TURBO_SCRIPT_PATH, 'utf-8')
-      },
+      if (id === VIRTUAL_TURBO_ID)
+        return await fs.readFile(TURBO_SCRIPT_PATH, 'utf-8')
     },
   }
 }

packages/pages/src/pages.ts

@@ -8,7 +8,8 @@ import { MODULE_ID } from './types'
 
 export * from './types'
 
-const moduleIdRegex = new RegExp(`^${MODULE_ID.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`)
+const escapedModuleId = MODULE_ID.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+const moduleIdRegex = new RegExp(`^(?:\\0|/@id/)?${escapedModuleId}(?:\\?.*)?$`)
 
 /**
  * An iles module that injects remark plugins to parse pages and expose it
@@ -68,14 +69,14 @@ export default function IlesPages (): any {
       resolveId: {
         filter: { id: moduleIdRegex },
         async handler (id) {
-          if (id === MODULE_ID)
+          if (moduleIdRegex.test(id))
             return MODULE_ID
         },
       },
       load: {
-        filter: { id: MODULE_ID },
+        filter: { id: moduleIdRegex },
         async handler (id) {
-          if (id === MODULE_ID)
+          if (moduleIdRegex.test(id))
             return generatedRoutes ||= await api.generateRoutesModule()
         },
       },