rwsdk 1.0.0-beta.9 → 1.0.0-beta.9-test.20251006190822

package/dist/vite/runDirectivesScan.mjs

@@ -1,6 +1,7 @@
 // @ts-ignore
 import { compile } from "@mdx-js/mdx";
 import debug from "debug";
+import { glob } from "glob";
 import fsp from "node:fs/promises";
 import path from "node:path";
 import { INTERMEDIATES_OUTPUT_DIR } from "../lib/constants.mjs";
@@ -17,6 +18,40 @@ const isObject = (value) => Object.prototype.toString.call(value) === "[object O
 // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/utils.ts
 const externalRE = /^(https?:)?\/\//;
 const isExternalUrl = (url) => externalRE.test(url);
+async function findDirectiveRoots({ root, readFileWithCache, directiveCheckCache, }) {
+    const srcDir = path.resolve(root, "src");
+    console.log("########", srcDir);
+    const files = await glob("**/*.{ts,tsx,js,jsx,mjs,mts,cjs,cts,mdx}", {
+        cwd: srcDir,
+        absolute: true,
+    });
+    const directiveFiles = new Set();
+    for (const file of files) {
+        if (directiveCheckCache.has(file)) {
+            if (directiveCheckCache.get(file)) {
+                directiveFiles.add(file);
+            }
+            continue;
+        }
+        try {
+            const content = await readFileWithCache(file);
+            const hasClient = hasDirective(content, "use client");
+            const hasServer = hasDirective(content, "use server");
+            const hasAnyDirective = hasClient || hasServer;
+            directiveCheckCache.set(file, hasAnyDirective);
+            if (hasAnyDirective) {
+                directiveFiles.add(file);
+            }
+        }
+        catch (e) {
+            log("Could not read file during pre-scan, skipping:", file);
+            // Cache the failure to avoid re-reading a problematic file
+            directiveCheckCache.set(file, false);
+        }
+    }
+    log("Pre-scan found directive files:", Array.from(directiveFiles));
+    return directiveFiles;
+}
 export async function resolveModuleWithEnvironment({ path, importer, importerEnv, clientResolver, workerResolver, }) {
     const resolver = importerEnv === "client" ? clientResolver : workerResolver;
     return new Promise((resolvePromise) => {
@@ -52,10 +87,21 @@ export function classifyModule({ contents, inheritedEnv, }) {
     return { moduleEnv, isClient, isServer };
 }
 export const runDirectivesScan = async ({ rootConfig, environments, clientFiles, serverFiles, entries: initialEntries, }) => {
+    console.log("######## 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 fileContentCache = new Map();
+        const directiveCheckCache = new Map();
+        const readFileWithCache = async (path) => {
+            if (fileContentCache.has(path)) {
+                return fileContentCache.get(path);
+            }
+            const contents = await fsp.readFile(path, "utf-8");
+            fileContentCache.set(path, contents);
+            return contents;
+        };
         const esbuild = await getViteEsbuild(rootConfig.root);
         const input = initialEntries ?? environments.worker.config.build.rollupOptions?.input;
         let entries;
@@ -78,19 +124,19 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
         // 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 applicationDirectiveFiles = await findDirectiveRoots({
+            root: rootConfig.root,
+            readFileWithCache,
+            directiveCheckCache,
+        });
+        const combinedEntries = new Set([
+            ...absoluteEntries,
+            ...applicationDirectiveFiles,
+        ]);
+        log("Starting directives scan with combined entries:", Array.from(combinedEntries));
         const workerResolver = createViteAwareResolver(rootConfig, environments.worker);
         const clientResolver = createViteAwareResolver(rootConfig, environments.client);
         const moduleEnvironments = new Map();
-        const fileContentCache = new Map();
-        const readFileWithCache = async (path) => {
-            if (fileContentCache.has(path)) {
-                return fileContentCache.get(path);
-            }
-            const contents = await fsp.readFile(path, "utf-8");
-            fileContentCache.set(path, contents);
-            return contents;
-        };
         const esbuildScanPlugin = {
             name: "rwsdk:esbuild-scan-plugin",
             setup(build) {
@@ -232,7 +278,7 @@ export const runDirectivesScan = async ({ rootConfig, environments, clientFiles,
             },
         };
         await esbuild.build({
-            entryPoints: absoluteEntries,
+            entryPoints: Array.from(combinedEntries),
             bundle: true,
             write: false,
             outdir: path.join(INTERMEDIATES_OUTPUT_DIR, "directive-scan"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-beta.9-test.20251006190822",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -168,7 +168,8 @@
     "ts-morph": "~27.0.0",
     "unique-names-generator": "~4.7.1",
     "vibe-rules": "~0.3.0",
-    "vite-tsconfig-paths": "~5.1.4"
+    "vite-tsconfig-paths": "~5.1.4",
+    "@types/glob": "^8.1.0"
   },
   "peerDependencies": {
     "@cloudflare/vite-plugin": "^1.12.4",
@@ -190,7 +191,7 @@
     "semver": "~7.7.1",
     "tsx": "~4.20.0",
     "typescript": "~5.9.0",
-    "vite": "7.1.6",
+    "vite": "~7.1.9",
     "vitest": "~3.2.0"
   }
 }