rwsdk 1.0.0-alpha.7 → 1.0.0-alpha.9

package/dist/vite/hasDirective.mjs

@@ -1,54 +1,70 @@
 /**
  * Efficiently checks if a React directive (e.g., "use server", "use client")
- * is present in the code. Optimized for performance with a two-step approach:
- * 1. Quick string search to see if directive exists anywhere
- * 2. Line-by-line check only if the directive might be present
+ * is present in the code.
+ *
+ * This function is optimized for performance by only checking the first few
+ * lines of the code, as directives must appear at the very top of a file.
+ * It handles comments, whitespace, and any valid directive prologue
+ * (e.g., "use strict").
  */
 export function hasDirective(code, directive) {
-    // Quick performance check: if directive doesn't exist anywhere, skip line checking
-    const singleQuoteDirective = `'${directive}'`;
-    const doubleQuoteDirective = `"${directive}"`;
-    if (!code.includes(singleQuoteDirective) &&
-        !code.includes(doubleQuoteDirective)) {
-        return false;
-    }
-    // Split into lines and check each one
-    const lines = code.split("\n");
+    const lines = code.slice(0, 512).split("\n"); // Check first ~512 chars
     let inMultiLineComment = false;
+    let foundUseClient = false;
+    let foundTargetDirective = false;
+    const doubleQuoteDirective = `"${directive}"`;
+    const singleQuoteDirective = `'${directive}'`;
+    const doubleQuoteUseClient = `"use client"`;
+    const singleQuoteUseClient = `'use client'`;
     for (const line of lines) {
         const trimmedLine = line.trim();
-        // Skip empty lines
         if (trimmedLine.length === 0) {
             continue;
         }
-        // Handle multi-line comments
-        if (trimmedLine.startsWith("/*")) {
-            inMultiLineComment = true;
-            // Check if the comment ends on the same line
+        if (inMultiLineComment) {
             if (trimmedLine.includes("*/")) {
                 inMultiLineComment = false;
             }
             continue;
         }
-        if (inMultiLineComment) {
-            // Check if this line ends the multi-line comment
-            if (trimmedLine.includes("*/")) {
-                inMultiLineComment = false;
+        if (trimmedLine.startsWith("/*")) {
+            if (!trimmedLine.includes("*/")) {
+                inMultiLineComment = true;
             }
             continue;
         }
-        // Skip single-line comments
         if (trimmedLine.startsWith("//")) {
             continue;
         }
-        // Check if this line starts with the directive
+        const cleanedLine = trimmedLine.endsWith(";")
+            ? trimmedLine.slice(0, -1)
+            : trimmedLine;
+        if (trimmedLine.startsWith(doubleQuoteUseClient) ||
+            trimmedLine.startsWith(singleQuoteUseClient)) {
+            foundUseClient = true;
+            if (directive === "use client") {
+                return true;
+            }
+        }
         if (trimmedLine.startsWith(doubleQuoteDirective) ||
             trimmedLine.startsWith(singleQuoteDirective)) {
-            return true;
+            foundTargetDirective = true;
+            if (directive !== "use server") {
+                return true;
+            }
         }
-        // If we hit a non-empty, non-comment line that's not a directive, we can stop
-        // (directives must be at the top of the file/scope, after comments)
+        // Any other string literal is part of a valid directive prologue.
+        // We can continue searching.
+        if (trimmedLine.startsWith('"') || trimmedLine.startsWith("'")) {
+            continue;
+        }
+        // If we encounter any other non-directive, non-comment, non-string-literal
+        // line of code, the directive prologue is over. Stop.
         break;
     }
-    return false;
+    // If looking for 'use server' and 'use client' was found, return false (client takes priority)
+    if (directive === "use server" && foundUseClient) {
+        return false;
+    }
+    return foundTargetDirective;
 }

package/dist/vite/hasDirective.test.mjs

@@ -1,109 +1,107 @@
 import { describe, it, expect } from "vitest";
 import { hasDirective } from "./hasDirective.mjs";
 describe("hasDirective", () => {
-    it('should find "use client" directive with double quotes', () => {
-        const code = `"use client";
-    
-    import React from "react";
-    
-    const MyComponent = () => <div>Hello</div>;
-    export default MyComponent;`;
+    it('should find "use client" directive', () => {
+        const code = `"use client"; import React from "react";`;
         expect(hasDirective(code, "use client")).toBe(true);
     });
-    it("should find 'use server' directive with single quotes", () => {
-        const code = `'use server';
-    
-    export async function myAction() {
-      // ...
-    }`;
+    it('should find "use server" directive', () => {
+        const code = `'use server'; export async function myAction() {}`;
         expect(hasDirective(code, "use server")).toBe(true);
     });
-    it("should find directive with leading whitespace", () => {
-        const code = `    "use client";
-    
-    const MyComponent = () => <div>Hello</div>;`;
+    it("should not find a directive that is not there", () => {
+        const code = `import React from "react";`;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it('should find "use client" directive with single quotes', () => {
+        const code = `'use client'; import React from "react";`;
         expect(hasDirective(code, "use client")).toBe(true);
     });
-    it("should find directive after single-line comments", () => {
-        const code = `// This is a component
-    "use client";
-    
-    const MyComponent = () => <div>Hello</div>;`;
+    it("should find directive when preceded by comments and whitespace", () => {
+        const code = `
+      // This is a client component
+      /* And here is another comment */
+
+      "use client";
+      import React from 'react';
+      export default () => <div>Hello</div>;
+    `;
         expect(hasDirective(code, "use client")).toBe(true);
     });
-    it("should find directive after multi-line comments", () => {
-        const code = `/* This is a component */
-    "use client";
-    
-    const MyComponent = () => <div>Hello</div>;`;
+    it('should find "use client" directive when preceded by "use strict"', () => {
+        const code = `
+      "use strict";
+      "use client";
+      import React from 'react';
+      export default () => <div>Hello</div>;
+    `;
         expect(hasDirective(code, "use client")).toBe(true);
     });
-    it("should find directive after empty lines", () => {
+    it('should find "use server" directive when preceded by "use strict" and comments', () => {
         const code = `
-
-    "use client";
-    
-    const MyComponent = () => <div>Hello</div>;`;
+      // server stuff
+      "use strict";
+      /* another comment */
+      "use server";
+      export async function myAction() {}
+    `;
+        expect(hasDirective(code, "use server")).toBe(true);
+    });
+    it("should find directive when preceded by another string literal directive", () => {
+        const code = `
+      "use awesome"; // Some other directive
+      "use client";
+      import React from 'react';
+      export default () => <div>Hello</div>;
+    `;
         expect(hasDirective(code, "use client")).toBe(true);
     });
     it("should return false if no directive is present", () => {
         const code = `import React from "react";
-    
-    const MyComponent = () => <div>Hello</div>;`;
+    export default () => <div>Hello</div>;`;
         expect(hasDirective(code, "use client")).toBe(false);
     });
-    it("should return false if directive is not at the top", () => {
-        const code = `import React from "react";
-    "use client";
-    
-    const MyComponent = () => <div>Hello</div>;`;
-        expect(hasDirective(code, "use client")).toBe(false);
-    });
-    it("should return false if directive is inside a single-line comment", () => {
+    it("should return false if the directive is commented out", () => {
         const code = `// "use client";
-    
-    const MyComponent = () => <div>Hello</div>;`;
+    import React from "react";
+    export default () => <div>Hello</div>;`;
         expect(hasDirective(code, "use client")).toBe(false);
     });
-    it("should return false if directive is inside a multi-line comment", () => {
-        const code = `/*
-     * "use client";
-     */
-    
-    const MyComponent = () => <div>Hello</div>;`;
+    it("should return false if the directive appears after code", () => {
+        const code = `import React from "react";
+    "use client";
+    export default () => <div>Hello</div>;`;
         expect(hasDirective(code, "use client")).toBe(false);
     });
-    it("should return false if directive is a substring in other code", () => {
-        const code = `const message = 'please "use client" wisely';`;
+    it("should handle multi-line comments correctly", () => {
+        const code = `
+      /*
+       * "use client";
+       */
+      import React from "react";
+    `;
         expect(hasDirective(code, "use client")).toBe(false);
     });
-    it("should handle a file with only the directive", () => {
-        const code = `"use client"`;
+    it("should handle code with no whitespace", () => {
+        const code = `"use client";import React from "react";`;
         expect(hasDirective(code, "use client")).toBe(true);
     });
-    it("should handle mixed comments, whitespace, and the directive", () => {
-        const code = `// A component
-    
-    /* 
-      Another comment
-    */
-   
-    'use client';
-
-    const MyComponent = () => <div>Hello</div>;
-    `;
-        expect(hasDirective(code, "use client")).toBe(true);
+    it("should handle empty code", () => {
+        const code = "";
+        expect(hasDirective(code, "use client")).toBe(false);
     });
-    it("should handle multi-line comment ending on same line", () => {
-        const code = `/* "use client" */
-    const MyComponent = () => <div>Hello</div>;
-    `;
+    it("should handle code with only whitespace", () => {
+        const code = "  \n\t  ";
         expect(hasDirective(code, "use client")).toBe(false);
     });
-    it("should return false for code where directive appears after a valid line of code", () => {
-        const code = `const a = 1;
-    "use client";
-    `;
+    it("should handle files with only comments", () => {
+        const code = `// comment 1
+    /* comment 2 */`;
         expect(hasDirective(code, "use client")).toBe(false);
     });
+    it("should prioritize 'use client' over 'use server'", () => {
+        const code = `'use client';\n'use server';\nconsole.log('hello');`;
+        expect(hasDirective(code, "use client")).toBe(true);
+        expect(hasDirective(code, "use server")).toBe(false);
+    });
 });

package/dist/vite/redwoodPlugin.mjs

@@ -72,6 +72,7 @@ export const redwoodPlugin = async (options = {}) => {
             clientFiles,
             serverFiles,
             projectRootDir,
+            workerEntryPathname,
         }),
         configPlugin({
             silent: options.silent ?? false,

package/dist/vite/runDirectivesScan.d.mts

@@ -17,10 +17,11 @@ export declare function classifyModule({ contents, inheritedEnv, }: {
     isClient: boolean;
     isServer: boolean;
 };
-export declare const runDirectivesScan: ({ rootConfig, environments, clientFiles, serverFiles, }: {
+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

@@ -4,8 +4,9 @@ import path from "node:path";
 import debug from "debug";
 import { getViteEsbuild } from "./getViteEsbuild.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
+import { INTERMEDIATES_OUTPUT_DIR } from "../lib/constants.mjs";
 import { externalModules } from "./constants.mjs";
-import { createViteAwareResolver, } from "./createViteAwareResolver.mjs";
+import { createViteAwareResolver } from "./createViteAwareResolver.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 +49,13 @@ export function classifyModule({ contents, inheritedEnv, }) {
     }
     return { moduleEnv, isClient, isServer };
 }
-export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, }) => {
+export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }) => {
     console.log("\n🔍 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 +73,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);
@@ -203,6 +206,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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.9",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -59,6 +59,10 @@
       "types": "./dist/runtime/entries/auth.d.ts",
       "default": "./dist/runtime/entries/auth.js"
     },
+    "./e2e": {
+      "types": "./dist/lib/e2e/index.d.mts",
+      "default": "./dist/lib/e2e/index.mjs"
+    },
     "./db": {
       "types": "./dist/runtime/lib/db/index.d.ts",
       "default": "./dist/runtime/lib/db/index.js"
@@ -90,10 +94,6 @@
     "./realtime/durableObject": {
       "types": "./dist/runtime/lib/realtime/durableObject.d.ts",
       "default": "./dist/runtime/lib/realtime/durableObject.js"
-    },
-    "./e2e": {
-      "types": "./dist/lib/e2e/index.d.mts",
-      "default": "./dist/lib/e2e/index.mjs"
     }
   },
   "keywords": [
@@ -163,8 +163,8 @@
   },
   "peerDependencies": {
     "@cloudflare/vite-plugin": "^1.12.4",
-    "react": "19.2.0-canary-3fb190f7-20250908 <20.0.0",
-    "react-dom": "19.2.0-canary-3fb190f7-20250908 <20.0.0",
+    "react": ">=19.2.0-canary-3fb190f7-20250908 <20.0.0",
+    "react-dom": ">=19.2.0-canary-3fb190f7-20250908 <20.0.0",
     "react-server-dom-webpack": ">=19.2.0-canary-3fb190f7-20250908 <20.0.0",
     "vite": "^6.2.6 || 7.x",
     "wrangler": "^4.35.0"