rwsdk 0.1.12 → 0.1.14

package/dist/vite/directivesPlugin.mjs

@@ -47,7 +47,6 @@ export const directivesPlugin = ({ projectRootDir, clientFiles, serverFiles, })
             devServer.environments[environment].depsOptimizer?.registerMissingImport(resolvedId, fullPath);
             if (isAfterFirstResponse && !hadFile) {
                 log("Invalidating cache for lookup module %s after adding module id=%s", lookupModule, id);
-                //invalidateModule(devServer, environment, `virtual:use-${kind}-lookup`);
             }
         }
     };

package/dist/vite/invalidateModule.d.mts

@@ -1,2 +1,6 @@
-import type { ViteDevServer } from "vite";
-export declare const invalidateModule: (devServer: ViteDevServer, environment: string, id: string) => void;
+import type { EnvironmentModuleNode, ViteDevServer } from "vite";
+interface InvalidatableModuleOptions {
+    invalidateImportersRecursively?: boolean;
+}
+export declare const invalidateModule: (devServer: ViteDevServer, environment: string, target: string | EnvironmentModuleNode, options?: InvalidatableModuleOptions, seen?: Set<EnvironmentModuleNode>) => void;
+export {};

package/dist/vite/invalidateModule.mjs

@@ -1,14 +1,30 @@
 import debug from "debug";
 const log = debug("rwsdk:vite:invalidate-module");
-const verboseLog = debug("verbose:rwsdk:vite:invalidate-module");
-export const invalidateModule = (devServer, environment, id) => {
-    const [rawId, _query] = id.split("?");
-    log("Invalidating module: id=%s, environment=%s", id, environment);
-    const moduleNode = devServer?.environments[environment]?.moduleGraph.idToModuleMap.get(rawId);
+export const invalidateModule = (devServer, environment, target, options = {}, seen = new Set()) => {
+    let moduleNode;
+    if (typeof target === "string") {
+        const id = target;
+        const [rawId, _query] = id.split("?");
+        moduleNode =
+            devServer?.environments[environment]?.moduleGraph.idToModuleMap.get(rawId);
+    }
+    else {
+        moduleNode = target;
+    }
     if (moduleNode) {
-        devServer?.environments[environment]?.moduleGraph.invalidateModule(moduleNode);
+        if (seen.has(moduleNode)) {
+            return;
+        }
+        seen.add(moduleNode);
+        devServer.environments[environment]?.moduleGraph.invalidateModule(moduleNode, seen);
+        log("Invalidating module: id=%s, environment=%s", moduleNode.id, environment);
+        if (options.invalidateImportersRecursively) {
+            for (const importer of moduleNode.importers) {
+                invalidateModule(devServer, environment, importer, options, seen);
+            }
+        }
     }
     else {
-        verboseLog("Module not found: id=%s, environment=%s", id, environment);
+        log("Module not found: id=%s, environment=%s", typeof target === "string" ? target : target.id, environment);
     }
 };

package/dist/vite/isJsFile.d.mts

@@ -0,0 +1 @@
+export declare function isJsFile(filepath: string): boolean;

package/dist/vite/isJsFile.d.ts

@@ -0,0 +1 @@
+export declare function isJsFile(filepath: string): boolean;

package/dist/vite/isJsFile.js

@@ -0,0 +1,3 @@
+export function isJsFile(filepath) {
+    return /\.(m|c)?(j|t)s(x)?$/.test(filepath);
+}

package/dist/vite/isJsFile.mjs

@@ -0,0 +1,3 @@
+export function isJsFile(filepath) {
+    return /\.(m|c)?(j|t)s(x)?$/.test(filepath);
+}

package/dist/vite/miniflareHMRPlugin.d.mts

@@ -1,5 +1,7 @@
 import { Plugin } from "vite";
 export declare const miniflareHMRPlugin: (givenOptions: {
+    clientFiles: Set<string>;
+    serverFiles: Set<string>;
     rootDir: string;
     viteEnvironment: {
         name: string;

package/dist/vite/miniflareHMRPlugin.mjs

@@ -4,13 +4,23 @@ import { readFile } from "node:fs/promises";
 import debug from "debug";
 import { VIRTUAL_SSR_PREFIX } from "./ssrBridgePlugin.mjs";
 import { normalizeModulePath } from "./normalizeModulePath.mjs";
+import { hasDirective as sourceHasDirective } from "./hasDirective.mjs";
+import { isJsFile } from "./isJsFile.mjs";
+import { invalidateModule } from "./invalidateModule.mjs";
 import { getShortName } from "../lib/getShortName.mjs";
-import { pathExists } from "fs-extra";
 const verboseLog = debug("verbose:rwsdk:vite:hmr-plugin");
+const hasDirective = async (filepath, directive) => {
+    if (!isJsFile(filepath)) {
+        return false;
+    }
+    const content = await readFile(filepath, "utf-8");
+    return sourceHasDirective(content, directive);
+};
 const hasEntryAsAncestor = (module, entryFile, seen = new Set()) => {
     // Prevent infinite recursion
-    if (seen.has(module))
+    if (seen.has(module)) {
         return false;
+    }
     seen.add(module);
     // Check direct importers
     for (const importer of module.importers) {
@@ -22,62 +32,47 @@ const hasEntryAsAncestor = (module, entryFile, seen = new Set()) => {
     }
     return false;
 };
-// Cache for "use client" status results
-const useClientCache = new Map();
-// Function to invalidate cache for a file
-const invalidateUseClientCache = (file) => {
-    useClientCache.delete(file);
-};
-const isUseClientModule = async (ctx, file, seen = new Set()) => {
-    // Prevent infinite recursion
-    if (seen.has(file))
-        return false;
-    seen.add(file);
-    try {
-        // Check cache first
-        if (useClientCache.has(file)) {
-            return useClientCache.get(file);
-        }
-        // Read and check the file
-        const content = (await pathExists(file))
-            ? await readFile(file, "utf-8")
-            : "";
-        const hasUseClient = content.includes("'use client'") || content.includes('"use client"');
-        if (hasUseClient) {
-            useClientCache.set(file, true);
-            return true;
-        }
-        // Get the module from the module graph to find importers
-        const module = ctx.server.moduleGraph.getModuleById(file);
-        if (!module) {
-            useClientCache.set(file, false);
-            return false;
-        }
-        // Check all importers recursively
-        for (const importer of module.importers) {
-            if (await isUseClientModule(ctx, importer.url, seen)) {
-                useClientCache.set(file, true);
-                return true;
-            }
-        }
-        useClientCache.set(file, false);
-        return false;
-    }
-    catch (error) {
-        useClientCache.set(file, false);
-        return false;
-    }
-};
 export const miniflareHMRPlugin = (givenOptions) => [
     {
         name: "rwsdk:miniflare-hmr",
         async hotUpdate(ctx) {
+            const { clientFiles, serverFiles, viteEnvironment: { name: environment }, workerEntryPathname: entry, } = givenOptions;
             verboseLog("Hot update: (env=%s) %s\nModule graph:\n\n%s", this.environment.name, ctx.file, dumpFullModuleGraph(ctx.server, this.environment.name));
-            const environment = givenOptions.viteEnvironment.name;
-            const entry = givenOptions.workerEntryPathname;
             if (!["client", environment].includes(this.environment.name)) {
                 return [];
             }
+            const hasClientDirective = await hasDirective(ctx.file, "use client");
+            const hasServerDirective = !hasClientDirective && (await hasDirective(ctx.file, "use server"));
+            let clientDirectiveChanged = false;
+            let serverDirectiveChanged = false;
+            if (!clientFiles.has(ctx.file) && hasClientDirective) {
+                clientFiles.add(ctx.file);
+                clientDirectiveChanged = true;
+            }
+            else if (clientFiles.has(ctx.file) && !hasClientDirective) {
+                clientFiles.delete(ctx.file);
+                clientDirectiveChanged = true;
+            }
+            if (!serverFiles.has(ctx.file) && hasServerDirective) {
+                serverFiles.add(ctx.file);
+                serverDirectiveChanged = true;
+            }
+            else if (serverFiles.has(ctx.file) && !hasServerDirective) {
+                serverFiles.delete(ctx.file);
+                serverDirectiveChanged = true;
+            }
+            if (clientDirectiveChanged) {
+                ["client", "ssr", environment].forEach((environment) => {
+                    invalidateModule(ctx.server, environment, "virtual:use-client-lookup.js");
+                });
+                invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX + "/@id/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");
+            }
             // todo(justinvdm, 12 Dec 2024): Skip client references
             const modules = Array.from(ctx.server.environments[environment].moduleGraph.getModulesByFile(ctx.file) ?? []);
             const isWorkerUpdate = ctx.file === entry ||
@@ -91,7 +86,6 @@ export const miniflareHMRPlugin = (givenOptions) => [
             // => Notify for HMR update of any css files imported by in worker, that are also in the client module graph
             // Why: There may have been changes to css classes referenced, which might css modules to change
             if (this.environment.name === "client") {
-                const cssModules = [];
                 for (const [_, module] of ctx.server.environments[environment]
                     .moduleGraph.idToModuleMap) {
                     // todo(justinvdm, 13 Dec 2024): We check+update _all_ css files in worker module graph,
@@ -99,15 +93,15 @@ export const miniflareHMRPlugin = (givenOptions) => [
                     // on the importers and imports of the changed file. We should be smarter about this.
                     if (module.file && module.file.endsWith(".css")) {
                         const clientModules = ctx.server.environments.client.moduleGraph.getModulesByFile(module.file);
-                        if (clientModules) {
-                            cssModules.push(...clientModules.values());
+                        for (const clientModule of clientModules ?? []) {
+                            invalidateModule(ctx.server, "client", clientModule);
                         }
                     }
                 }
-                invalidateUseClientCache(ctx.file);
-                return (await isUseClientModule(ctx, ctx.file))
-                    ? [...ctx.modules, ...cssModules]
-                    : cssModules;
+                // context(justinvdm, 10 Jul 2025): If this isn't a file with a client
+                // directive or a css file, we shouldn't invalidate anything else to
+                // avoid full page reload
+                return hasClientDirective || ctx.file.endsWith(".css") ? undefined : [];
             }
             // The worker needs an update, and the hot check is for the worker environment
             // => Notify for custom RSC-based HMR update, then short circuit HMR
@@ -122,12 +116,12 @@ export const miniflareHMRPlugin = (givenOptions) => [
                     ?.values()
                     .next().value;
                 if (m) {
-                    ctx.server.environments.client.moduleGraph.invalidateModule(m, new Set(), ctx.timestamp, true);
+                    invalidateModule(ctx.server, environment, m);
                 }
                 const virtualSSRModule = ctx.server.environments[environment].moduleGraph.idToModuleMap.get(VIRTUAL_SSR_PREFIX +
                     normalizeModulePath(givenOptions.rootDir, ctx.file));
                 if (virtualSSRModule) {
-                    ctx.server.environments.client.moduleGraph.invalidateModule(virtualSSRModule, new Set(), ctx.timestamp, true);
+                    invalidateModule(ctx.server, environment, virtualSSRModule);
                 }
                 ctx.server.environments.client.hot.send({
                     type: "custom",

package/dist/vite/redwoodPlugin.mjs

@@ -77,6 +77,8 @@ export const redwoodPlugin = async (options = {}) => {
             })
             : [],
         miniflareHMRPlugin({
+            clientFiles,
+            serverFiles,
             rootDir: projectRootDir,
             viteEnvironment: { name: "worker" },
             workerEntryPathname,

package/dist/vite/ssrBridgePlugin.mjs

@@ -89,32 +89,23 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                     log("Dev mode: fetching SSR module for realPath=%s", realId);
                     const result = await devServer?.environments.ssr.fetchModule(realId);
                     verboseLog("Fetch module result: id=%s, result=%O", realId, result);
-                    if (!result) {
-                        return;
-                    }
                     const code = "code" in result ? result.code : undefined;
                     log("Fetched SSR module code length: %d", code?.length || 0);
-                    if (!code) {
-                        return;
-                    }
-                    const { imports, dynamicImports } = findSsrImportSpecifiers(realId, code, verboseLog);
+                    const { imports, dynamicImports } = findSsrImportSpecifiers(realId, code || "", verboseLog);
                     const allSpecifiers = [...new Set([...imports, ...dynamicImports])];
                     const switchCases = allSpecifiers
                         .map((specifier) => `    case "${specifier}": return import("${VIRTUAL_SSR_PREFIX}${specifier}");`)
                         .join("\n");
                     const transformedCode = `
 await (async function(__vite_ssr_import__, __vite_ssr_dynamic_import__) {${code}})(
-  (id, ...args) => ssrImport(id, false, ...args),
-  (id, ...args) => ssrImport(id, true, ...args)
+  (id, ...args) => {ssrImport(id); return __vite_ssr_import__('/@id/${VIRTUAL_SSR_PREFIX}' + id, ...args);},
+  (id, ...args) => {ssrImport(id); return __vite_ssr_dynamic_import__('/@id/${VIRTUAL_SSR_PREFIX}' + id, ...args);}
 );
 
-function ssrImport(id, isDynamic, ...args) {
+function ssrImport(id) {
   switch (id) {
 ${switchCases}
   }
-
-  const virtualId = '/@id/${VIRTUAL_SSR_PREFIX}' + id;
-  return isDynamic ? __vite_ssr_dynamic_import__(virtualId, ...args) : __vite_ssr_import__(virtualId, ...args);
 }
 `;
                     log("Transformed SSR module code length: %d", transformedCode.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {