rwsdk 1.0.0-alpha.10 → 1.0.0-alpha.11

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

@@ -27,6 +27,7 @@ import { manifestPlugin } from "./manifestPlugin.mjs";
 import { linkerPlugin } from "./linkerPlugin.mjs";
 import { directiveModulesDevPlugin } from "./directiveModulesDevPlugin.mjs";
 import { directivesFilteringPlugin } from "./directivesFilteringPlugin.mjs";
+import { resolveForcedPaths } from "./resolveForcedPaths.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)

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/transformClientComponents.mjs

@@ -5,7 +5,8 @@ import { findExports } from "./findSpecifiers.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;

package/dist/vite/transformServerFunctions.d.mts

@@ -12,5 +12,5 @@ type ExportInfoCompat = {
 };
 export declare const findExportedFunctions: (code: string, normalizedId?: string) => Set<string>;
 export declare const findExportInfo: (code: string, normalizedId?: string) => ExportInfoCompat;
-export declare const transformServerFunctions: (code: string, normalizedId: string, environment: "client" | "worker" | "ssr", serverFiles?: Set<string>) => TransformResult | undefined;
+export declare const transformServerFunctions: (code: string, normalizedId: string, environment: "client" | "worker" | "ssr", serverFiles: Set<string>) => TransformResult | undefined;
 export type { TransformResult };

package/dist/vite/transformServerFunctions.mjs

@@ -85,7 +85,7 @@ function hasDefaultExport(code, normalizedId) {
     return false;
 }
 export const transformServerFunctions = (code, normalizedId, environment, serverFiles) => {
-    if (!hasDirective(code, "use server")) {
+    if (!serverFiles.has(normalizedId) && !hasDirective(code, "use server")) {
         return;
     }
     process.env.VERBOSE &&

package/dist/vite/transformServerFunctions.test.mjs

@@ -107,15 +107,15 @@ export * from './utils';
         for (const [key, CODE] of Object.entries(TEST_CASES)) {
             describe(key, () => {
                 it(`CLIENT`, () => {
-                    const result = transformServerFunctions(CODE, "/test.tsx", "client");
+                    const result = transformServerFunctions(CODE, "/test.tsx", "client", new Set());
                     expect(result?.code).toMatchSnapshot();
                 });
                 it(`WORKER`, () => {
-                    const result = transformServerFunctions(CODE, "/test.tsx", "worker");
+                    const result = transformServerFunctions(CODE, "/test.tsx", "worker", new Set());
                     expect(result?.code).toMatchSnapshot();
                 });
                 it(`SSR`, () => {
-                    const result = transformServerFunctions(CODE, "/test.tsx", "ssr");
+                    const result = transformServerFunctions(CODE, "/test.tsx", "ssr", new Set());
                     expect(result?.code).toMatchSnapshot();
                 });
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.11",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -63,6 +63,10 @@
       "types": "./dist/lib/e2e/index.d.mts",
       "default": "./dist/lib/e2e/index.mjs"
     },
+    "./e2e/setup": {
+      "types": "./dist/lib/e2e/setup.d.mts",
+      "default": "./dist/lib/e2e/setup.mjs"
+    },
     "./db": {
       "types": "./dist/runtime/lib/db/index.d.ts",
       "default": "./dist/runtime/lib/db/index.js"