rwsdk 1.0.0-alpha.8 → 1.0.0-beta.0

package/dist/vite/prismaPlugin.mjs

@@ -1,7 +1,7 @@
 import { resolve } from "node:path";
-import { invalidateCacheIfPrismaClientChanged } from "./invalidateCacheIfPrismaClientChanged.mjs";
 import { checkPrismaStatus } from "./checkIsUsingPrisma.mjs";
 import { ensureAliasArray } from "./ensureAliasArray.mjs";
+import { invalidateCacheIfPrismaClientChanged } from "./invalidateCacheIfPrismaClientChanged.mjs";
 export const prismaPlugin = async ({ projectRootDir, }) => {
     if (!checkPrismaStatus({ projectRootDir }).isUsingPrisma) {
         return;

package/dist/vite/redwoodPlugin.d.mts

@@ -6,6 +6,8 @@ export type RedwoodPluginOptions = {
     includeCloudflarePlugin?: boolean;
     includeReactPlugin?: boolean;
     configPath?: string;
+    forceClientPaths?: string[];
+    forceServerPaths?: string[];
     entry?: {
         worker?: string;
     };

package/dist/vite/redwoodPlugin.mjs

@@ -1,32 +1,33 @@
+import { cloudflare } from "@cloudflare/vite-plugin";
 import { resolve } from "node:path";
 import { unstable_readConfig } from "wrangler";
-import { cloudflare } from "@cloudflare/vite-plugin";
 import { devServerConstantPlugin } from "./devServerConstant.mjs";
 import { hasOwnCloudflareVitePlugin } from "./hasOwnCloudflareVitePlugin.mjs";
 import { hasOwnReactVitePlugin } from "./hasOwnReactVitePlugin.mjs";
 import reactPlugin from "@vitejs/plugin-react";
 import tsconfigPaths from "vite-tsconfig-paths";
-import { transformJsxScriptTagsPlugin } from "./transformJsxScriptTagsPlugin.mjs";
-import { directivesPlugin } from "./directivesPlugin.mjs";
-import { useClientLookupPlugin } from "./useClientLookupPlugin.mjs";
-import { useServerLookupPlugin } from "./useServerLookupPlugin.mjs";
-import { miniflareHMRPlugin } from "./miniflareHMRPlugin.mjs";
-import { moveStaticAssetsPlugin } from "./moveStaticAssetsPlugin.mjs";
-import { configPlugin } from "./configPlugin.mjs";
+import { pathExists } from "fs-extra";
 import { $ } from "../lib/$.mjs";
-import { reactConditionsResolverPlugin } from "./reactConditionsResolverPlugin.mjs";
 import { findWranglerConfig } from "../lib/findWranglerConfig.mjs";
-import { pathExists } from "fs-extra";
-import { injectVitePreamble } from "./injectVitePreamblePlugin.mjs";
-import { vitePreamblePlugin } from "./vitePreamblePlugin.mjs";
-import { prismaPlugin } from "./prismaPlugin.mjs";
-import { ssrBridgePlugin } from "./ssrBridgePlugin.mjs";
 import { hasPkgScript } from "../lib/hasPkgScript.mjs";
+import { configPlugin } from "./configPlugin.mjs";
 import { devServerTimingPlugin } from "./devServerTimingPlugin.mjs";
-import { manifestPlugin } from "./manifestPlugin.mjs";
-import { linkerPlugin } from "./linkerPlugin.mjs";
 import { directiveModulesDevPlugin } from "./directiveModulesDevPlugin.mjs";
 import { directivesFilteringPlugin } from "./directivesFilteringPlugin.mjs";
+import { directivesPlugin } from "./directivesPlugin.mjs";
+import { injectVitePreamble } from "./injectVitePreamblePlugin.mjs";
+import { knownDepsResolverPlugin } from "./knownDepsResolverPlugin.mjs";
+import { linkerPlugin } from "./linkerPlugin.mjs";
+import { manifestPlugin } from "./manifestPlugin.mjs";
+import { miniflareHMRPlugin } from "./miniflareHMRPlugin.mjs";
+import { moveStaticAssetsPlugin } from "./moveStaticAssetsPlugin.mjs";
+import { prismaPlugin } from "./prismaPlugin.mjs";
+import { resolveForcedPaths } from "./resolveForcedPaths.mjs";
+import { ssrBridgePlugin } from "./ssrBridgePlugin.mjs";
+import { transformJsxScriptTagsPlugin } from "./transformJsxScriptTagsPlugin.mjs";
+import { useClientLookupPlugin } from "./useClientLookupPlugin.mjs";
+import { useServerLookupPlugin } from "./useServerLookupPlugin.mjs";
+import { vitePreamblePlugin } from "./vitePreamblePlugin.mjs";
 export const determineWorkerEntryPathname = async ({ projectRootDir, workerConfigPath, options, readConfig = unstable_readConfig, }) => {
     if (options.entry?.worker) {
         return resolve(projectRootDir, options.entry.worker);
@@ -39,6 +40,24 @@ const serverFiles = new Set();
 const clientEntryPoints = new Set();
 export const redwoodPlugin = async (options = {}) => {
     const projectRootDir = process.cwd();
+    if (options.forceClientPaths) {
+        const clientPaths = await resolveForcedPaths({
+            patterns: options.forceClientPaths,
+            projectRootDir,
+        });
+        for (const p of clientPaths) {
+            clientFiles.add(p);
+        }
+    }
+    if (options.forceServerPaths) {
+        const serverPaths = await resolveForcedPaths({
+            patterns: options.forceServerPaths,
+            projectRootDir,
+        });
+        for (const p of serverPaths) {
+            serverFiles.add(p);
+        }
+    }
     const workerConfigPath = options.configPath ??
         (process.env.RWSDK_WRANGLER_CONFIG
             ? resolve(projectRootDir, process.env.RWSDK_WRANGLER_CONFIG)
@@ -72,6 +91,7 @@ export const redwoodPlugin = async (options = {}) => {
             clientFiles,
             serverFiles,
             projectRootDir,
+            workerEntryPathname,
         }),
         configPlugin({
             silent: options.silent ?? false,
@@ -86,7 +106,7 @@ export const redwoodPlugin = async (options = {}) => {
             serverFiles,
             projectRootDir,
         }),
-        reactConditionsResolverPlugin({ projectRootDir }),
+        knownDepsResolverPlugin({ projectRootDir }),
         tsconfigPaths({ root: projectRootDir }),
         shouldIncludeCloudflarePlugin
             ? cloudflare({

package/dist/vite/redwoodPlugin.test.mjs

@@ -1,6 +1,6 @@
-import { describe, it, expect } from "vitest";
-import { determineWorkerEntryPathname } from "./redwoodPlugin.mjs";
 import path from "node:path";
+import { describe, expect, it } from "vitest";
+import { determineWorkerEntryPathname } from "./redwoodPlugin.mjs";
 describe("determineWorkerEntryPathname", () => {
     const projectRootDir = "/test/project";
     it("should use the entry path from options if provided", async () => {

package/dist/vite/resolveForcedPaths.d.mts

@@ -0,0 +1,4 @@
+export declare function resolveForcedPaths({ patterns, projectRootDir, }: {
+    patterns: string[];
+    projectRootDir: string;
+}): Promise<string[]>;

package/dist/vite/resolveForcedPaths.mjs

@@ -0,0 +1,9 @@
+import { glob } from "glob";
+import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
+export async function resolveForcedPaths({ patterns, projectRootDir, }) {
+    return (await glob(patterns, {
+        cwd: projectRootDir,
+        absolute: true,
+        realpath: true,
+    })).map((filepath) => normalizeModulePath(filepath, projectRootDir));
+}

package/dist/vite/runDirectivesScan.d.mts

@@ -17,10 +17,12 @@ export declare function classifyModule({ contents, inheritedEnv, }: {
     isClient: boolean;
     isServer: boolean;
 };
-export declare const runDirectivesScan: ({ rootConfig, environments, clientFiles, serverFiles, }: {
+export type EsbuildLoader = "js" | "jsx" | "ts" | "tsx" | "default";
+export declare const runDirectivesScan: ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }: {
     rootConfig: ResolvedConfig;
     environments: Record<string, Environment>;
     clientFiles: Set<string>;
     serverFiles: Set<string>;
+    entries?: string[];
 }) => Promise<void>;
 export {};

package/dist/vite/runDirectivesScan.mjs

@@ -1,11 +1,14 @@
+// @ts-ignore
+import { compile } from "@mdx-js/mdx";
+import debug from "debug";
 import fsp from "node:fs/promises";
-import { hasDirective } from "./hasDirective.mjs";
 import path from "node:path";
-import debug from "debug";
-import { getViteEsbuild } from "./getViteEsbuild.mjs";
+import { INTERMEDIATES_OUTPUT_DIR } from "../lib/constants.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 import { externalModules } from "./constants.mjs";
-import { createViteAwareResolver, } from "./createViteAwareResolver.mjs";
+import { createViteAwareResolver } from "./createViteAwareResolver.mjs";
+import { getViteEsbuild } from "./getViteEsbuild.mjs";
+import { hasDirective } from "./hasDirective.mjs";
 const log = debug("rwsdk:vite:run-directives-scan");
 // Copied from Vite's source code.
 // https://github.com/vitejs/vite/blob/main/packages/vite/src/shared/utils.ts
@@ -48,13 +51,13 @@ export function classifyModule({ contents, inheritedEnv, }) {
     }
     return { moduleEnv, isClient, isServer };
 }
-export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, }) => {
-    console.log("\n🔍 Scanning for 'use client' and 'use server' directives...");
+export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }) => {
+    deferredLog("\n… (rwsdk) Scanning for 'use client' and 'use server' directives...");
     // Set environment variable to indicate scanning is in progress
     process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE = "true";
     try {
         const esbuild = await getViteEsbuild(rootConfig.root);
-        const input = environments.worker.config.build.rollupOptions?.input;
+        const input = initialEntries ?? environments.worker.config.build.rollupOptions?.input;
         let entries;
         if (Array.isArray(input)) {
             entries = input;
@@ -72,7 +75,9 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             log("No entries found for directives scan in worker environment, skipping.");
             return;
         }
-        const absoluteEntries = entries.map((entry) => path.resolve(rootConfig.root, entry));
+        // Filter out virtual modules since they can't be scanned by esbuild
+        const realEntries = entries.filter((entry) => !entry.includes("virtual:"));
+        const absoluteEntries = realEntries.map((entry) => path.resolve(rootConfig.root, entry));
         log("Starting directives scan for worker environment with entries:", absoluteEntries);
         const workerResolver = createViteAwareResolver(rootConfig, environments.worker);
         const clientResolver = createViteAwareResolver(rootConfig, environments.client);
@@ -91,7 +96,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             setup(build) {
                 // Match Vite's behavior by externalizing assets and special queries.
                 // This prevents esbuild from trying to bundle them, which would fail.
-                const scriptFilter = /\.(c|m)?[jt]sx?$/;
+                const scriptFilter = /\.(c|m)?[jt]sx?$|\.mdx$/;
                 const specialQueryFilter = /[?&](?:url|raw|worker|sharedworker|inline)\b/;
                 // This regex is used to identify if a path has any file extension.
                 const hasExtensionRegex = /\.[^/]+$/;
@@ -159,7 +164,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                     log("Marking as external:", args.path, "resolved to:", resolvedPath);
                     return { external: true };
                 });
-                build.onLoad({ filter: /\.(m|c)?[jt]sx?$/ }, async (args) => {
+                build.onLoad({ filter: /\.(m|c)?[jt]sx?$|\.mdx$/ }, async (args) => {
                     log("onLoad called for:", args.path);
                     if (!args.path.startsWith("/") ||
                         args.path.includes("virtual:") ||
@@ -172,25 +177,52 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
                         return null;
                     }
                     try {
-                        const contents = await readFileWithCache(args.path);
+                        const originalContents = await readFileWithCache(args.path);
                         const inheritedEnv = args.pluginData?.inheritedEnv || "worker";
                         const { moduleEnv, isClient, isServer } = classifyModule({
-                            contents,
+                            contents: originalContents,
                             inheritedEnv,
                         });
                         // Store the definitive environment for this module, so it can be used when it becomes an importer.
-                        moduleEnvironments.set(args.path, moduleEnv);
-                        log("Set environment for", args.path, "to", moduleEnv);
+                        const realPath = await fsp.realpath(args.path);
+                        moduleEnvironments.set(realPath, moduleEnv);
+                        log("Set environment for", realPath, "to", moduleEnv);
                         // Finally, populate the output sets if the file has a directive.
                         if (isClient) {
-                            log("Discovered 'use client' in:", args.path);
-                            clientFiles.add(normalizeModulePath(args.path, rootConfig.root));
+                            log("Discovered 'use client' in:", realPath);
+                            clientFiles.add(normalizeModulePath(realPath, rootConfig.root));
                         }
                         if (isServer) {
-                            log("Discovered 'use server' in:", args.path);
-                            serverFiles.add(normalizeModulePath(args.path, rootConfig.root));
+                            log("Discovered 'use server' in:", realPath);
+                            serverFiles.add(normalizeModulePath(realPath, rootConfig.root));
                         }
-                        return { contents, loader: "default" };
+                        let code;
+                        let loader;
+                        if (args.path.endsWith(".mdx")) {
+                            const result = await compile(originalContents, {
+                                jsx: true,
+                                jsxImportSource: "react",
+                            });
+                            code = String(result.value);
+                            loader = "tsx";
+                        }
+                        else if (/\.(m|c)?tsx$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "tsx";
+                        }
+                        else if (/\.(m|c)?ts$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "ts";
+                        }
+                        else if (/\.(m|c)?jsx$/.test(args.path)) {
+                            code = originalContents;
+                            loader = "jsx";
+                        }
+                        else {
+                            code = originalContents;
+                            loader = "js";
+                        }
+                        return { contents: code, loader };
                     }
                     catch (e) {
                         log("Could not read file during scan, skipping:", args.path, e);
@@ -203,6 +235,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             entryPoints: absoluteEntries,
             bundle: true,
             write: false,
+            outdir: path.join(INTERMEDIATES_OUTPUT_DIR, "directive-scan"),
             platform: "node",
             format: "esm",
             logLevel: "silent",
@@ -215,6 +248,13 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
     finally {
         // Always clear the scanning flag when done
         delete process.env.RWSDK_DIRECTIVE_SCAN_ACTIVE;
-        console.log("✅ Scan complete.");
+        deferredLog("✔ (rwsdk) Done scanning for 'use client' and 'use server' directives.");
+        process.env.VERBOSE &&
+            log("Client/server files after scanning: client=%O, server=%O", Array.from(clientFiles), Array.from(serverFiles));
     }
 };
+const deferredLog = (message) => {
+    setTimeout(() => {
+        console.log(message);
+    }, 500);
+};

package/dist/vite/runDirectivesScan.test.mjs

@@ -1,5 +1,5 @@
-import { describe, it, expect, vi } from "vitest";
-import { resolveModuleWithEnvironment, classifyModule, } from "./runDirectivesScan.mjs";
+import { describe, expect, it, vi } from "vitest";
+import { classifyModule, resolveModuleWithEnvironment, } from "./runDirectivesScan.mjs";
 describe("runDirectivesScan helpers", () => {
     describe("resolveModuleWithEnvironment", () => {
         it("should use the client resolver when importerEnv is 'client'", async () => {

package/dist/vite/ssrBridgePlugin.mjs

@@ -1,7 +1,7 @@
 import debug from "debug";
-import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
-import { INTERMEDIATE_SSR_BRIDGE_PATH } from "../lib/constants.mjs";
 import MagicString from "magic-string";
+import { INTERMEDIATE_SSR_BRIDGE_PATH } from "../lib/constants.mjs";
+import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
 const log = debug("rwsdk:vite:ssr-bridge-plugin");
 export const VIRTUAL_SSR_PREFIX = "virtual:rwsdk:ssr:";
 export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
@@ -34,7 +34,8 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
                         build.onResolve({ filter: /.*$/ }, (args) => {
                             process.env.VERBOSE &&
                                 log("Esbuild onResolve called for path=%s, args=%O", args.path, args);
-                            if (args.path === "rwsdk/__ssr_bridge") {
+                            if (args.path === "rwsdk/__ssr_bridge" ||
+                                args.path.startsWith(VIRTUAL_SSR_PREFIX)) {
                                 log("Marking as external: %s", args.path);
                                 return {
                                     path: args.path,
@@ -77,6 +78,12 @@ export const ssrBridgePlugin = ({ clientFiles, serverFiles, }) => {
             }
             else {
                 // In build mode, the behavior depends on the build pass
+                if (id.startsWith(VIRTUAL_SSR_PREFIX)) {
+                    if (this.environment.name === "worker") {
+                        log("Virtual SSR module case (build-worker pass): resolving to external");
+                        return { id, external: true };
+                    }
+                }
                 if (id === "rwsdk/__ssr_bridge" && this.environment.name === "worker") {
                     if (process.env.RWSDK_BUILD_PASS === "worker") {
                         // First pass: resolve to a temporary, external path

package/dist/vite/transformClientComponents.mjs

@@ -1,11 +1,12 @@
-import MagicString from "magic-string";
 import debug from "debug";
-import { hasDirective } from "./hasDirective.mjs";
+import MagicString from "magic-string";
 import { findExports } from "./findSpecifiers.mjs";
+import { hasDirective } from "./hasDirective.mjs";
 const logVite = debug("rwsdk:vite:transform-client-components:vite");
 const logEsbuild = debug("rwsdk:vite:transform-client-components:esbuild");
 export async function transformClientComponents(code, normalizedId, ctx) {
-    if (!hasDirective(code, "use client")) {
+    if (!ctx.clientFiles?.has(normalizedId) &&
+        !hasDirective(code, "use client")) {
         return;
     }
     const log = ctx.isEsbuild ? logEsbuild : logVite;
@@ -76,13 +77,14 @@ export async function transformClientComponents(code, normalizedId, ctx) {
     // 4. Non-SSR files: replace all implementation with registerClientReference logic
     // Generate completely new code for worker/client environments
     const s = new MagicString("");
-    // Add import declaration
+    s.append('import { ssrLoadModule } from "rwsdk/__ssr_bridge";\n');
     s.append('import { registerClientReference } from "rwsdk/worker";\n');
+    s.append(`const SSRModule = await ssrLoadModule("${normalizedId}");\n`);
     // Compute unique computed local names first
     const computedLocalNames = new Map(processedExports.map((info) => [getComputedLocalName(info), info]));
     // Add registerClientReference assignments for unique names
     for (const [computedLocalName, correspondingInfo] of computedLocalNames) {
-        s.append(`const ${computedLocalName} = registerClientReference("${normalizedId}", "${correspondingInfo.exported}");\n`);
+        s.append(`const ${computedLocalName} = registerClientReference(SSRModule, "${normalizedId}", "${correspondingInfo.exported}");\n`);
     }
     // Add grouped export statement for named exports (preserving order and alias)
     if (processedExports.length > 0) {
@@ -94,7 +96,7 @@ export async function transformClientComponents(code, normalizedId, ctx) {
     // Add default export if present
     if (defaultExportInfo) {
         log(":isEsbuild=%s: Registering client reference for default export: %s", !!ctx.isEsbuild, defaultExportInfo.exported);
-        s.append(`export default registerClientReference("${normalizedId}", "${defaultExportInfo.exported}");\n`);
+        s.append(`export default registerClientReference(SSRModule, "${normalizedId}", "${defaultExportInfo.exported}");\n`);
     }
     const sourceMap = s.generateMap({
         source: normalizedId,