rwsdk 0.2.0-alpha.0 → 0.2.0-alpha.10

package/dist/runtime/script.js

@@ -3,7 +3,7 @@ import { env } from "cloudflare:workers";
 export const defineScript = (fn) => {
     const app = defineApp([
         async () => {
-            await fn({ env });
+            await fn({ env: env });
             return new Response("Done!");
         },
     ]);

package/dist/runtime/worker.js

@@ -42,6 +42,11 @@ export const defineApp = (routes) => {
                     ssr: true,
                     databases: new Map(),
                     scriptsToBeLoaded: new Set(),
+                    pageRouteResolved: undefined,
+                };
+                const userResponseInit = {
+                    status: 200,
+                    headers: new Headers(),
                 };
                 const outerRequestInfo = {
                     request,
@@ -50,6 +55,7 @@ export const defineApp = (routes) => {
                     params: {},
                     ctx: {},
                     rw,
+                    response: userResponseInit,
                 };
                 const createPageElement = (requestInfo, Page) => {
                     let pageElement;
@@ -59,16 +65,7 @@ export const defineApp = (routes) => {
                         pageElement = _jsx(Page, { ctx: ctx, params: params });
                     }
                     else {
-                        // context(justinvdm, 24 Apr 2025): We need to wrap the page in a component that throws the response to bubble it up and break out of react rendering context
-                        // This way, we're able to return a response from the page component while still staying within react rendering context
-                        const PageWrapper = async () => {
-                            const result = await Page(requestInfo);
-                            if (result instanceof Response) {
-                                throw result;
-                            }
-                            return result;
-                        };
-                        pageElement = _jsx(PageWrapper, {});
+                        pageElement = _jsx(Page, { ...requestInfo });
                     }
                     if (isSmokeTest) {
                         pageElement = _jsx(SmokeTestWrapper, { children: pageElement });
@@ -97,10 +94,12 @@ export const defineApp = (routes) => {
                         onError,
                     });
                     if (isRSCRequest) {
+                        const responseHeaders = new Headers(userResponseInit.headers);
+                        responseHeaders.set("content-type", "text/x-component; charset=utf-8");
                         return new Response(rscPayloadStream, {
-                            headers: {
-                                "content-type": "text/x-component; charset=utf-8",
-                            },
+                            status: userResponseInit.status,
+                            statusText: userResponseInit.statusText,
+                            headers: responseHeaders,
                         });
                     }
                     let injectRSCPayloadStream;
@@ -120,10 +119,12 @@ export const defineApp = (routes) => {
                     if (injectRSCPayloadStream) {
                         html = html.pipeThrough(injectRSCPayloadStream);
                     }
+                    const responseHeaders = new Headers(userResponseInit.headers);
+                    responseHeaders.set("content-type", "text/html; charset=utf-8");
                     return new Response(html, {
-                        headers: {
-                            "content-type": "text/html; charset=utf-8",
-                        },
+                        status: userResponseInit.status,
+                        statusText: userResponseInit.statusText,
+                        headers: responseHeaders,
                     });
                 };
                 const response = await runWithRequestInfo(outerRequestInfo, async () => new Promise(async (resolve, reject) => {
@@ -143,11 +144,22 @@ export const defineApp = (routes) => {
                 // context(justinvdm, 18 Mar 2025): In some cases, such as a .fetch() call to a durable object instance, or Response.redirect(),
                 // we need to return a mutable response object.
                 const mutableResponse = new Response(response.body, response);
+                // Merge user headers from the legacy headers object
                 for (const [key, value] of userHeaders.entries()) {
                     if (!response.headers.has(key)) {
                         mutableResponse.headers.set(key, value);
                     }
                 }
+                // Merge headers from user response init (these take precedence)
+                if (userResponseInit.headers) {
+                    const userResponseHeaders = new Headers(userResponseInit.headers);
+                    for (const [key, value] of userResponseHeaders.entries()) {
+                        if (!response.headers.has(key)) {
+                            mutableResponse.headers.set(key, value);
+                        }
+                    }
+                }
+                await rw.pageRouteResolved?.promise;
                 return mutableResponse;
             }
             catch (e) {

package/dist/scripts/debug-sync.mjs

@@ -24,108 +24,12 @@ const getPackageManagerInfo = (targetDir) => {
     }
     return pnpmResult;
 };
-/**
- * @summary Workaround for pnpm's local tarball dependency resolution.
- *
- * @description
- * When installing a new version of the SDK from a local tarball (e.g., during
- * development with `rwsync`), pnpm creates a new, uniquely-named directory in
- * the `.pnpm` store (e.g., `rwsdk@file+...`).
- *
- * A challenge arises when other packages list `rwsdk` as a peer dependency.
- * pnpm may not consistently update the symlinks for these peer dependencies
- * to point to the newest `rwsdk` instance. This can result in a state where
- * multiple versions of `rwsdk` coexist in `node_modules`, with some parts of
- * the application using a stale version.
- *
- * This function addresses the issue by:
- * 1. Identifying the most recently installed `rwsdk` instance in the `.pnpm`
- *    store after a `pnpm install` run.
- * 2. Forcefully updating the top-level `node_modules/rwsdk` symlink to point
- *    to this new instance.
- * 3. Traversing all other `rwsdk`-related directories in the `.pnpm` store
- *    and updating their internal `rwsdk` symlinks to also point to the correct
- *    new instance.
- *
- * I am sorry for this ugly hack, I am sure there is a better way, and that it is me
- * doing something wrong. The aim is not to go down this rabbit hole right now
- * -- @justinvdm
- */
-const hackyPnpmSymlinkFix = async (targetDir) => {
-    console.log("💣 Performing pnpm symlink fix...");
-    const pnpmDir = path.join(targetDir, "node_modules", ".pnpm");
-    if (!existsSync(pnpmDir)) {
-        console.log("   🤔 No .pnpm directory found.");
-        return;
-    }
-    try {
-        const entries = await fs.readdir(pnpmDir);
-        // Find ALL rwsdk directories, not just file-based ones, to handle
-        // all kinds of stale peer dependencies.
-        const rwsdkDirs = entries.filter((e) => e.startsWith("rwsdk@"));
-        console.log("   Found rwsdk directories:", rwsdkDirs);
-        if (rwsdkDirs.length === 0) {
-            console.log("   🤔 No rwsdk directories found to hack.");
-            return;
-        }
-        let latestDir = "";
-        let latestMtime = new Date(0);
-        for (const dir of rwsdkDirs) {
-            const fullPath = path.join(pnpmDir, dir);
-            const stats = await fs.stat(fullPath);
-            if (stats.mtime > latestMtime) {
-                latestMtime = stats.mtime;
-                latestDir = dir;
-            }
-        }
-        console.log("   Latest rwsdk directory:", latestDir);
-        if (!latestDir) {
-            console.log("   🤔 Could not determine the latest rwsdk directory.");
-            return;
-        }
-        const goldenSourcePath = path.join(pnpmDir, latestDir, "node_modules", "rwsdk");
-        if (!existsSync(goldenSourcePath)) {
-            console.error(`   ❌ Golden source path does not exist: ${goldenSourcePath}`);
-            return;
-        }
-        console.log(`   🎯 Golden rwsdk path is: ${goldenSourcePath}`);
-        // 1. Fix top-level symlink
-        const topLevelSymlink = path.join(targetDir, "node_modules", "rwsdk");
-        await fs.rm(topLevelSymlink, { recursive: true, force: true });
-        await fs.symlink(goldenSourcePath, topLevelSymlink, "dir");
-        console.log(`   ✅ Symlinked ${topLevelSymlink} -> ${goldenSourcePath}`);
-        // 2. Fix peer dependency symlinks
-        const allPnpmDirs = await fs.readdir(pnpmDir);
-        for (const dir of allPnpmDirs) {
-            if (dir === latestDir || !dir.includes("rwsdk"))
-                continue;
-            const peerSymlink = path.join(pnpmDir, dir, "node_modules", "rwsdk");
-            if (existsSync(peerSymlink)) {
-                await fs.rm(peerSymlink, { recursive: true, force: true });
-                await fs.symlink(goldenSourcePath, peerSymlink, "dir");
-                console.log(`   ✅ Hijacked symlink in ${dir}`);
-            }
-        }
-    }
-    catch (error) {
-        console.error("   ❌ Failed during hacky pnpm symlink fix:", error);
-    }
-};
-const performFullSync = async (sdkDir, targetDir, cacheBust = false) => {
+const performFullSync = async (sdkDir, targetDir) => {
     const sdkPackageJsonPath = path.join(sdkDir, "package.json");
     let originalSdkPackageJson = null;
     let tarballPath = "";
     let tarballName = "";
     try {
-        if (cacheBust) {
-            console.log("💥 Cache-busting version for full sync...");
-            originalSdkPackageJson = await fs.readFile(sdkPackageJsonPath, "utf-8");
-            const packageJson = JSON.parse(originalSdkPackageJson);
-            const now = Date.now();
-            // This is a temporary version used for cache busting
-            packageJson.version = `${packageJson.version}-dev.${now}`;
-            await fs.writeFile(sdkPackageJsonPath, JSON.stringify(packageJson, null, 2));
-        }
         console.log("📦 Packing SDK...");
         const packResult = await $({ cwd: sdkDir }) `npm pack`;
         tarballName = packResult.stdout?.trim() ?? "";
@@ -145,47 +49,25 @@ const performFullSync = async (sdkDir, targetDir, cacheBust = false) => {
             .readFile(lockfilePath, "utf-8")
             .catch(() => null);
         try {
-            if (pm.name === "pnpm") {
-                console.log("🛠️  Using pnpm overrides to install SDK...");
-                if (originalPackageJson) {
-                    const targetPackageJson = JSON.parse(originalPackageJson);
-                    targetPackageJson.pnpm = targetPackageJson.pnpm || {};
-                    targetPackageJson.pnpm.overrides =
-                        targetPackageJson.pnpm.overrides || {};
-                    targetPackageJson.pnpm.overrides.rwsdk = `file:${tarballPath}`;
-                    await fs.writeFile(packageJsonPath, JSON.stringify(targetPackageJson, null, 2));
-                }
-                // We use install here, which respects the overrides.
-                // We also don't want to fail if the lockfile is out of date.
-                await $("pnpm", ["install", "--no-frozen-lockfile"], {
-                    cwd: targetDir,
-                    stdio: "inherit",
-                });
-                if (process.env.RWSDK_PNPM_SYMLINK_FIX) {
-                    await hackyPnpmSymlinkFix(targetDir);
-                }
+            const cmd = pm.name;
+            const args = [pm.command];
+            if (pm.name === "yarn") {
+                args.push(`file:${tarballPath}`);
             }
             else {
-                const cmd = pm.name;
-                const args = [pm.command];
-                if (pm.name === "yarn") {
-                    args.push(`file:${tarballPath}`);
-                }
-                else {
-                    args.push(tarballPath);
-                }
-                await $(cmd, args, {
-                    cwd: targetDir,
-                    stdio: "inherit",
-                });
+                args.push(tarballPath);
             }
+            await $(cmd, args, {
+                cwd: targetDir,
+                stdio: "inherit",
+            });
         }
         finally {
             if (originalPackageJson) {
                 console.log("Restoring package.json...");
                 await fs.writeFile(packageJsonPath, originalPackageJson);
             }
-            if (originalLockfile && pm.name !== "pnpm") {
+            if (originalLockfile) {
                 console.log(`Restoring ${pm.lockFile}...`);
                 await fs.writeFile(lockfilePath, originalLockfile);
             }
@@ -218,13 +100,17 @@ const performFastSync = async (sdkDir, targetDir) => {
     // Always copy package.json
     await fs.copyFile(path.join(sdkDir, "package.json"), path.join(targetDir, "node_modules/rwsdk/package.json"));
 };
+const areDependenciesEqual = (deps1, deps2) => {
+    // Simple string comparison for this use case is sufficient
+    return JSON.stringify(deps1 ?? {}) === JSON.stringify(deps2 ?? {});
+};
 const performSync = async (sdkDir, targetDir) => {
     console.log("🏗️  Rebuilding SDK...");
     await $ `pnpm build`;
     const forceFullSync = Boolean(process.env.RWSDK_FORCE_FULL_SYNC);
     if (forceFullSync) {
         console.log("🏃 Force full sync mode is enabled.");
-        await performFullSync(sdkDir, targetDir, true);
+        await performFullSync(sdkDir, targetDir);
         console.log("✅ Done syncing");
         return;
     }
@@ -234,15 +120,17 @@ const performSync = async (sdkDir, targetDir) => {
     if (existsSync(installedSdkPackageJsonPath)) {
         const sdkPackageJsonContent = await fs.readFile(sdkPackageJsonPath, "utf-8");
         const installedSdkPackageJsonContent = await fs.readFile(installedSdkPackageJsonPath, "utf-8");
-        if (sdkPackageJsonContent === installedSdkPackageJsonContent) {
+        const sdkPkg = JSON.parse(sdkPackageJsonContent);
+        const installedPkg = JSON.parse(installedSdkPackageJsonContent);
+        if (areDependenciesEqual(sdkPkg.dependencies, installedPkg.dependencies) &&
+            areDependenciesEqual(sdkPkg.devDependencies, installedPkg.devDependencies) &&
+            areDependenciesEqual(sdkPkg.peerDependencies, installedPkg.peerDependencies)) {
             packageJsonChanged = false;
         }
     }
     if (packageJsonChanged) {
         console.log("📦 package.json changed, performing full sync...");
-        // We always cache-bust on a full sync now to ensure pnpm's overrides
-        // see a new version and the hacky symlink fix runs on a clean slate.
-        await performFullSync(sdkDir, targetDir, true);
+        await performFullSync(sdkDir, targetDir);
     }
     else {
         await performFastSync(sdkDir, targetDir);
@@ -261,8 +149,7 @@ export const debugSync = async (opts) => {
         return;
     }
     // --- Watch Mode Logic ---
-    // Use global lock based on SDK directory since all instances sync from the same source
-    const lockfilePath = path.join(sdkDir, ".rwsync.lock");
+    const lockfilePath = path.join(targetDir, "node_modules", ".rwsync.lock");
     let release;
     // Ensure the directory for the lockfile exists
     await fs.mkdir(path.dirname(lockfilePath), { recursive: true });
@@ -273,7 +160,7 @@ export const debugSync = async (opts) => {
     }
     catch (e) {
         if (e.code === "ELOCKED") {
-            console.error(`❌ Another rwsync process is already running for this SDK.`);
+            console.error(`❌ Another rwsync process is already watching ${targetDir}.`);
             console.error(`   If this is not correct, please remove the lockfile at ${lockfilePath}`);
             process.exit(1);
         }

package/dist/scripts/smoke-test.mjs

@@ -30,8 +30,7 @@ if (fileURLToPath(import.meta.url) === process.argv[1]) {
         copyProject: false, // Default to false - don't copy project to artifacts
         realtime: false, // Default to false - don't just test realtime
         skipHmr: false, // Default to false - run HMR tests
-        // todo(justinvdm, 2025-07-31): Remove this once style tests working with headless
-        skipStyleTests: true, // Default to true - skip style tests
+        skipStyleTests: false,
         // sync: will be set below
     };
     // Log if we're in CI
@@ -55,8 +54,8 @@ if (fileURLToPath(import.meta.url) === process.argv[1]) {
         else if (arg === "--skip-hmr") {
             options.skipHmr = true;
         }
-        else if (arg === "--run-style-tests") {
-            options.skipStyleTests = false;
+        else if (arg === "--skip-style-tests") {
+            options.skipStyleTests = true;
         }
         else if (arg === "--keep") {
             options.keep = true;
@@ -94,7 +93,7 @@ Options:
   --skip-release          Skip testing the release/production deployment
   --skip-client           Skip client-side tests, only run server-side checks
   --skip-hmr              Skip hot module replacement (HMR) tests
-  --run-style-tests       Enable stylesheet-related tests (disabled by default)
+  --skip-style-tests      Skip stylesheet-related tests
   --path=PATH             Project directory to test
   --artifact-dir=DIR      Directory to store test artifacts (default: .artifacts)
   --keep                  Keep temporary test directory after tests complete

package/dist/vite/findSsrSpecifiers.d.mts

@@ -1,11 +1,10 @@
 /**
- * Finds __vite_ssr_import__ and __vite_ssr_dynamic_import__ specifiers in the code.
- * @param id The file identifier for language detection.
- * @param code The code to search for SSR imports.
- * @param log Optional logger function for debug output.
- * @returns Object with arrays of static and dynamic import specifiers.
+ * Finds callsites for __vite_ssr_import__ and __vite_ssr_dynamic_import__ with their ranges.
+ * The returned ranges can be used with MagicString to overwrite the entire call expression.
  */
-export declare function findSsrImportSpecifiers(id: string, code: string, log?: (...args: any[]) => void): {
-    imports: string[];
-    dynamicImports: string[];
-};
+export declare function findSsrImportCallSites(id: string, code: string, log?: (...args: any[]) => void): Array<{
+    start: number;
+    end: number;
+    specifier: string;
+    kind: "import" | "dynamic_import";
+}>;

package/dist/vite/findSsrSpecifiers.mjs

@@ -1,67 +1,69 @@
 import { parse as sgParse, Lang as SgLang, Lang } from "@ast-grep/napi";
 import path from "path";
 /**
- * Finds __vite_ssr_import__ and __vite_ssr_dynamic_import__ specifiers in the code.
- * @param id The file identifier for language detection.
- * @param code The code to search for SSR imports.
- * @param log Optional logger function for debug output.
- * @returns Object with arrays of static and dynamic import specifiers.
+ * Finds callsites for __vite_ssr_import__ and __vite_ssr_dynamic_import__ with their ranges.
+ * The returned ranges can be used with MagicString to overwrite the entire call expression.
  */
-export function findSsrImportSpecifiers(id, code, log) {
+export function findSsrImportCallSites(id, code, log) {
     const ext = path.extname(id).toLowerCase();
     const lang = ext === ".tsx" || ext === ".jsx" ? Lang.Tsx : SgLang.TypeScript;
     const logger = process.env.VERBOSE ? (log ?? (() => { })) : () => { };
-    const imports = [];
-    const dynamicImports = [];
+    const results = [];
     try {
         const root = sgParse(lang, code);
         const patterns = [
             {
                 pattern: `__vite_ssr_import__("$SPECIFIER")`,
-                list: imports,
+                kind: "import",
             },
             {
                 pattern: `__vite_ssr_import__('$SPECIFIER')`,
-                list: imports,
+                kind: "import",
             },
             {
                 pattern: `__vite_ssr_dynamic_import__("$SPECIFIER")`,
-                list: dynamicImports,
+                kind: "dynamic_import",
             },
             {
                 pattern: `__vite_ssr_dynamic_import__('$SPECIFIER')`,
-                list: dynamicImports,
+                kind: "dynamic_import",
             },
             {
                 pattern: `__vite_ssr_import__("$SPECIFIER", $$$REST)`,
-                list: imports,
+                kind: "import",
             },
             {
                 pattern: `__vite_ssr_import__('$SPECIFIER', $$$REST)`,
-                list: imports,
+                kind: "import",
             },
             {
                 pattern: `__vite_ssr_dynamic_import__("$SPECIFIER", $$$REST)`,
-                list: dynamicImports,
+                kind: "dynamic_import",
             },
             {
                 pattern: `__vite_ssr_dynamic_import__('$SPECIFIER', $$$REST)`,
-                list: dynamicImports,
+                kind: "dynamic_import",
             },
         ];
-        for (const { pattern, list } of patterns) {
+        for (const { pattern, kind } of patterns) {
             const matches = root.root().findAll(pattern);
             for (const match of matches) {
                 const specifier = match.getMatch("SPECIFIER")?.text();
                 if (specifier) {
-                    list.push(specifier);
-                    logger(`Found SSR import specifier: %s in pattern: %s`, specifier, pattern);
+                    const range = match.range();
+                    results.push({
+                        start: range.start.index,
+                        end: range.end.index,
+                        specifier,
+                        kind,
+                    });
+                    logger(`Found SSR import callsite: %s [%s] at %d-%d`, specifier, kind, range.start.index, range.end.index);
                 }
             }
         }
     }
     catch (err) {
-        logger("Error parsing code for SSR imports: %O", err);
+        logger("Error parsing code for SSR import callsites: %O", err);
     }
-    return { imports, dynamicImports };
+    return results;
 }

package/dist/vite/manifestPlugin.mjs

@@ -4,36 +4,6 @@ import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const log = debug("rwsdk:vite:manifest-plugin");
 const virtualModuleId = "virtual:rwsdk:manifest.js";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;
-const getCssForModule = (server, moduleId, css) => {
-    const stack = [moduleId];
-    const visited = new Set();
-    while (stack.length > 0) {
-        const currentModuleId = stack.pop();
-        if (visited.has(currentModuleId)) {
-            continue;
-        }
-        visited.add(currentModuleId);
-        const moduleNode = server.environments.client.moduleGraph.getModuleById(currentModuleId);
-        if (!moduleNode) {
-            continue;
-        }
-        for (const importedModule of moduleNode.importedModules) {
-            if (importedModule.url.endsWith(".css")) {
-                const absolutePath = importedModule.file;
-                css.add({
-                    url: importedModule.url,
-                    // The `ssrTransformResult` has the CSS content, because the default
-                    // transform for CSS is to a string of the CSS content.
-                    content: importedModule.ssrTransformResult?.code ?? "",
-                    absolutePath,
-                });
-            }
-            if (importedModule.id) {
-                stack.push(importedModule.id);
-            }
-        }
-    }
-};
 export const manifestPlugin = ({ manifestPath, }) => {
     let isBuild = false;
     let root;
@@ -106,46 +76,5 @@ export const manifestPlugin = ({ manifestPath, }) => {
                 },
             });
         },
-        configureServer(server) {
-            log("Configuring server middleware for manifest");
-            server.middlewares.use("/__rwsdk_manifest", async (req, res, next) => {
-                log("Manifest request received: %s", req.url);
-                try {
-                    const url = new URL(req.url, `http://${req.headers.host}`);
-                    const scripts = JSON.parse(url.searchParams.get("scripts") || "[]");
-                    process.env.VERBOSE && log("Transforming scripts: %o", scripts);
-                    for (const script of scripts) {
-                        await server.environments.client.transformRequest(script);
-                    }
-                    const manifest = {};
-                    log("Building manifest from module graph");
-                    for (const file of server.environments.client.moduleGraph.fileToModulesMap.keys()) {
-                        const modules = server.environments.client.moduleGraph.getModulesByFile(file);
-                        if (!modules) {
-                            continue;
-                        }
-                        for (const module of modules) {
-                            if (module.file) {
-                                const css = new Set();
-                                getCssForModule(server, module.id, css);
-                                manifest[normalizeModulePath(module.file, server.config.root)] =
-                                    {
-                                        file: module.url,
-                                        css: Array.from(css),
-                                    };
-                            }
-                        }
-                    }
-                    log("Manifest built successfully");
-                    process.env.VERBOSE && log("Manifest: %o", manifest);
-                    res.setHeader("Content-Type", "application/json");
-                    res.end(JSON.stringify(manifest));
-                }
-                catch (e) {
-                    log("Error building manifest: %o", e);
-                    next(e);
-                }
-            });
-        },
     };
 };

package/dist/vite/miniflareHMRPlugin.mjs

@@ -109,19 +109,19 @@ export const miniflareHMRPlugin = (givenOptions) => [
             let clientDirectiveChanged = false;
             let serverDirectiveChanged = false;
             if (!clientFiles.has(ctx.file) && hasClientDirective) {
-                clientFiles.add(ctx.file);
+                clientFiles.add(normalizeModulePath(ctx.file, givenOptions.rootDir));
                 clientDirectiveChanged = true;
             }
             else if (clientFiles.has(ctx.file) && !hasClientDirective) {
-                clientFiles.delete(ctx.file);
+                clientFiles.delete(normalizeModulePath(ctx.file, givenOptions.rootDir));
                 clientDirectiveChanged = true;
             }
             if (!serverFiles.has(ctx.file) && hasServerDirective) {
-                serverFiles.add(ctx.file);
+                serverFiles.add(normalizeModulePath(ctx.file, givenOptions.rootDir));
                 serverDirectiveChanged = true;
             }
             else if (serverFiles.has(ctx.file) && !hasServerDirective) {
-                serverFiles.delete(ctx.file);
+                serverFiles.delete(normalizeModulePath(ctx.file, givenOptions.rootDir));
                 serverDirectiveChanged = true;
             }
             if (clientDirectiveChanged) {
@@ -129,12 +129,14 @@ export const miniflareHMRPlugin = (givenOptions) => [
                     invalidateModule(ctx.server, environment, "virtual:use-client-lookup.js");
                 });
                 invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "/@id/virtual:use-client-lookup.js");
+                invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "virtual:use-client-lookup.js");
             }
             if (serverDirectiveChanged) {
                 ["client", "ssr", environment].forEach((environment) => {
                     invalidateModule(ctx.server, environment, "virtual:use-server-lookup.js");
                 });
                 invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "/@id/virtual:use-server-lookup.js");
+                invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "virtual:use-server-lookup.js");
             }
             // todo(justinvdm, 12 Dec 2024): Skip client references
             const modules = Array.from(ctx.server.environments[environment].moduleGraph.getModulesByFile(ctx.file) ?? []);