Merge pull request #8567 from QwikDev/fix-server-fns

fix(router - server-fns.ts): dynamicallyImportedIdResolutions don't exist in rolldown

Author: wmertens

packages/qwik-router/src/buildtime/vite/plugin.ts

@@ -435,7 +435,7 @@ function serverFnsPlugin(buildContextRef: BuildContextRef): Plugin {
       if (!ctx) {
         return;
       }
-      const moduleIds = await collectServerFnModuleIds(ctx, RESOLVED_ID, (id) => this.load({ id }));
+      const moduleIds = await collectServerFnModuleIds(ctx, RESOLVED_ID, this);
       for (let i = 0; i < moduleIds.length; i++) {
         serverFnModules.add(moduleIds[i]);
       }

packages/qwik-router/src/buildtime/vite/server-fns.ts

@@ -1,22 +1,19 @@
 import type { Rollup } from 'vite';
 import type { RoutingContext } from '../types';
 
-type ServerFnModuleInfo = Pick<
-  Rollup.ModuleInfo,
-  'code' | 'dynamicallyImportedIdResolutions' | 'id' | 'importedIdResolutions'
->;
-
+export type ServerFnPluginContext = Pick<Rollup.PluginContext, 'resolve' | 'load'>;
+export type ServerFnRoutingContext = Pick<RoutingContext, 'layouts' | 'routes' | 'serverPlugins'>;
 export async function collectServerFnModuleIds(
-  ctx: Pick<RoutingContext, 'layouts' | 'routes' | 'serverPlugins'>,
+  routingContext: ServerFnRoutingContext,
   resolvedVirtualId: string,
-  loadModule: (id: string) => Promise<ServerFnModuleInfo>
+  pluginContext: ServerFnPluginContext
 ) {
   const serverFnModules = new Set<string>();
   const queuedModuleIds = new Set<string>();
   const seenModuleIds = new Set<string>();
-  const routes = ctx.routes;
-  const layouts = ctx.layouts;
-  const serverPlugins = ctx.serverPlugins;
+  const routes = routingContext.routes;
+  const layouts = routingContext.layouts;
+  const serverPlugins = routingContext.serverPlugins;
 
   for (let i = 0; i < routes.length; i++) {
     const route = routes[i];
@@ -42,18 +39,25 @@ export async function collectServerFnModuleIds(
     }
     seenModuleIds.add(id);
 
-    const moduleInfo = await loadModule(id);
-    if (moduleInfo.code?.includes('serverQrl(')) {
+    const resolved = await pluginContext.resolve(id, undefined, { skipSelf: true });
+    if (!resolved || resolved.external) {
+      continue;
+    }
+
+    const moduleInfo = await pluginContext.load({ id: resolved.id });
+    if (moduleInfo.code == null) {
+      continue;
+    }
+
+    if (moduleInfo.code.includes('serverQrl(')) {
       serverFnModules.add(moduleInfo.id);
     }
 
-    const resolvedImports = moduleInfo.importedIdResolutions.concat(
-      moduleInfo.dynamicallyImportedIdResolutions
-    );
+    const resolvedImports = moduleInfo.importedIds.concat(moduleInfo.dynamicallyImportedIds);
     for (let i = 0; i < resolvedImports.length; i++) {
       const resolvedImport = resolvedImports[i];
-      if (!resolvedImport.external && !seenModuleIds.has(resolvedImport.id)) {
-        queuedModuleIds.add(resolvedImport.id);
+      if (resolvedImport && !seenModuleIds.has(resolvedImport)) {
+        queuedModuleIds.add(resolvedImport);
       }
     }
   }

packages/qwik-router/src/buildtime/vite/server-fns.unit.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
-import type { BuiltLayout, BuiltRoute, BuiltServerPlugin, RoutingContext } from '../types';
-import { collectServerFnModuleIds } from './server-fns';
+import type { BuiltLayout, BuiltRoute, BuiltServerPlugin } from '../types';
+import { collectServerFnModuleIds, type ServerFnRoutingContext } from './server-fns';
 
 describe('collectServerFnModuleIds', () => {
   it('walks the reachable module graph and collects modules containing serverQrl', async () => {
@@ -12,59 +12,53 @@ describe('collectServerFnModuleIds', () => {
         {
           id: '/app/routes/index.tsx',
           code: 'export default component$(() => null);',
-          importedIdResolutions: [
-            { id: '/app/shared.ts', external: false },
-            { id: '/node_modules/@qwik.dev/core/index.mjs', external: false },
-          ],
-          dynamicallyImportedIdResolutions: [{ id: '/app/lazy.ts', external: false }],
+          importedIds: ['/app/shared.ts', '/node_modules/@qwik.dev/core/index.mjs'],
+          dynamicallyImportedIds: ['/app/lazy.ts'],
         },
       ],
       [
         '/app/layout.tsx',
         {
           id: '/app/layout.tsx',
           code: 'export default component$(() => null);',
-          importedIdResolutions: [{ id: '/app/shared.ts', external: false }],
-          dynamicallyImportedIdResolutions: [],
+          importedIds: ['/app/shared.ts'],
+          dynamicallyImportedIds: [],
         },
       ],
       [
         '/app/shared.ts',
         {
           id: '/app/shared.ts',
           code: 'export const shared = true;',
-          importedIdResolutions: [
-            { id: resolvedVirtualId, external: false },
-            { id: 'node:fs', external: true },
-          ],
-          dynamicallyImportedIdResolutions: [],
+          importedIds: [resolvedVirtualId],
+          dynamicallyImportedIds: [],
         },
       ],
       [
         '/app/lazy.ts',
         {
           id: '/app/lazy.ts',
           code: 'export const fn = serverQrl(() => null);',
-          importedIdResolutions: [],
-          dynamicallyImportedIdResolutions: [],
+          importedIds: [],
+          dynamicallyImportedIds: [],
         },
       ],
       [
         '/node_modules/@qwik.dev/core/index.mjs',
         {
           id: '/node_modules/@qwik.dev/core/index.mjs',
           code: 'export {};',
-          importedIdResolutions: [],
-          dynamicallyImportedIdResolutions: [],
+          importedIds: [],
+          dynamicallyImportedIds: [],
         },
       ],
       [
         '/app/plugin.ts',
         {
           id: '/app/plugin.ts',
           code: 'export const pluginFn = serverQrl(() => null);',
-          importedIdResolutions: [],
-          dynamicallyImportedIdResolutions: [],
+          importedIds: [],
+          dynamicallyImportedIds: [],
         },
       ],
     ]);
@@ -92,20 +86,25 @@ describe('collectServerFnModuleIds', () => {
       filePath: '/app/plugin.ts',
       ext: 'ts',
     };
-    const ctx: Pick<RoutingContext, 'layouts' | 'routes' | 'serverPlugins'> = {
+    const ctx: ServerFnRoutingContext = {
       routes: [route],
       layouts: [layout],
       serverPlugins: [serverPlugin],
     };
 
-    const serverFnModules = await collectServerFnModuleIds(ctx, resolvedVirtualId, async (id) => {
-      loads.push(id);
-      const moduleInfo = modules.get(id);
-      if (!moduleInfo) {
-        throw new Error(`Unexpected module load: ${id}`);
-      }
-      return moduleInfo as any;
-    });
+    const pluginContext = {
+      resolve: async (id: string) => ({ id, external: false }) as any,
+      load: async ({ id }: { id: string }) => {
+        loads.push(id);
+        const moduleInfo = modules.get(id);
+        if (!moduleInfo) {
+          throw new Error(`Unexpected module load: ${id}`);
+        }
+        return moduleInfo as any;
+      },
+    };
+
+    const serverFnModules = await collectServerFnModuleIds(ctx, resolvedVirtualId, pluginContext);
 
     expect(serverFnModules.sort()).toEqual(['/app/lazy.ts', '/app/plugin.ts']);
     expect(loads).toEqual([