rwsdk 1.0.0-alpha.3 → 1.0.0-alpha.5

package/dist/vite/findSsrSpecifiers.test.mjs

@@ -0,0 +1,99 @@
+import { describe, it, expect } from "vitest";
+import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
+describe("findSsrImportCallSites", () => {
+    it("should find __vite_ssr_import__ with double quotes", () => {
+        const code = `const a = __vite_ssr_import__("module-a");`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 41,
+            specifier: "module-a",
+            kind: "import",
+        });
+    });
+    it("should find __vite_ssr_import__ with single quotes", () => {
+        const code = `const a = __vite_ssr_import__('module-a');`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 41,
+            specifier: "module-a",
+            kind: "import",
+        });
+    });
+    it("should find __vite_ssr_dynamic_import__ with double quotes", () => {
+        const code = `const a = __vite_ssr_dynamic_import__("module-a");`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 49,
+            specifier: "module-a",
+            kind: "dynamic_import",
+        });
+    });
+    it("should find __vite_ssr_dynamic_import__ with single quotes", () => {
+        const code = `const a = __vite_ssr_dynamic_import__('module-a');`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 49,
+            specifier: "module-a",
+            kind: "dynamic_import",
+        });
+    });
+    it("should find calls with additional arguments", () => {
+        const code = `const a = __vite_ssr_import__('module-a', { ssr: true });`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        expect(results[0]).toEqual({
+            start: 10,
+            end: 56,
+            specifier: "module-a",
+            kind: "import",
+        });
+    });
+    it("should find a mix of different calls", () => {
+        const code = `
+      const a = __vite_ssr_import__("module-a");
+      const b = __vite_ssr_dynamic_import__('module-b');
+    `;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(2);
+        expect(results).toEqual(expect.arrayContaining([
+            {
+                start: 17,
+                end: 48,
+                specifier: "module-a",
+                kind: "import",
+            },
+            {
+                start: 66,
+                end: 105,
+                specifier: "module-b",
+                kind: "dynamic_import",
+            },
+        ]));
+    });
+    it("should return correct ranges for replacement", () => {
+        const code = `__vite_ssr_import__("module-a")`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(1);
+        const { start, end } = results[0];
+        expect(code.substring(start, end)).toBe('__vite_ssr_import__("module-a")');
+    });
+    it("should return an empty array when no calls are found", () => {
+        const code = `import a from "module-a";`;
+        const results = findSsrImportCallSites("test.ts", code);
+        expect(results).toHaveLength(0);
+    });
+    it("should handle tsx files correctly", () => {
+        const code = `const a = () => <div>{__vite_ssr_import__("module-a")}</div>;`;
+        const results = findSsrImportCallSites("test.tsx", code);
+        expect(results).toHaveLength(1);
+        expect(results[0].specifier).toBe("module-a");
+    });
+});

package/dist/vite/hasDirective.test.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/vite/hasDirective.test.mjs

@@ -0,0 +1,109 @@
+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;`;
+        expect(hasDirective(code, "use client")).toBe(true);
+    });
+    it("should find 'use server' directive with single quotes", () => {
+        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>;`;
+        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>;`;
+        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>;`;
+        expect(hasDirective(code, "use client")).toBe(true);
+    });
+    it("should find directive after empty lines", () => {
+        const code = `
+
+    "use client";
+    
+    const MyComponent = () => <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>;`;
+        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", () => {
+        const code = `// "use client";
+    
+    const MyComponent = () => <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>;`;
+        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';`;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+    it("should handle a file with only the directive", () => {
+        const code = `"use client"`;
+        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 multi-line comment ending on same line", () => {
+        const code = `/* "use client" */
+    const MyComponent = () => <div>Hello</div>;
+    `;
+        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";
+    `;
+        expect(hasDirective(code, "use client")).toBe(false);
+    });
+});

package/dist/vite/isJsFile.test.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/vite/isJsFile.test.mjs

@@ -0,0 +1,38 @@
+import { describe, it, expect } from "vitest";
+import { isJsFile } from "./isJsFile.mjs";
+describe("isJsFile", () => {
+    const matchingExtensions = [
+        "file.js",
+        "file.jsx",
+        "file.ts",
+        "file.tsx",
+        "file.mjs",
+        "file.mts",
+        "file.cjs",
+        "file.cts",
+        "/path/to/component.js",
+        "../relative/path.tsx",
+    ];
+    const nonMatchingExtensions = [
+        "file.css",
+        "file.html",
+        "file.json",
+        "file.txt",
+        "file.js.map",
+        "file_js",
+        "filejs",
+        "",
+        "no-extension",
+        "/path/to/image.png",
+    ];
+    matchingExtensions.forEach((filepath) => {
+        it(`should return true for "${filepath}"`, () => {
+            expect(isJsFile(filepath)).toBe(true);
+        });
+    });
+    nonMatchingExtensions.forEach((filepath) => {
+        it(`should return false for "${filepath}"`, () => {
+            expect(isJsFile(filepath)).toBe(false);
+        });
+    });
+});

package/dist/vite/linkerPlugin.d.mts

@@ -1,4 +1,12 @@
 import type { Plugin } from "vite";
+export declare function linkWorkerBundle({ code, manifestContent, projectRootDir, }: {
+    code: string;
+    manifestContent: string;
+    projectRootDir: string;
+}): {
+    code: string;
+    map: null;
+};
 export declare const linkerPlugin: ({ projectRootDir, }: {
     projectRootDir: string;
 }) => Plugin;

package/dist/vite/linkerPlugin.mjs

@@ -4,6 +4,29 @@ import { CLIENT_MANIFEST_RELATIVE_PATH } from "../lib/constants.mjs";
 import debug from "debug";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const log = debug("rwsdk:vite:linker-plugin");
+export function linkWorkerBundle({ code, manifestContent, projectRootDir, }) {
+    let newCode = code;
+    const manifest = JSON.parse(manifestContent);
+    // 1. Replace the manifest placeholder with the actual manifest content.
+    log("Injecting manifest into worker bundle");
+    newCode = newCode.replace('"__RWSDK_MANIFEST_PLACEHOLDER__"', manifestContent);
+    // 2. Replace asset placeholders with their final hashed paths.
+    log("Replacing asset placeholders in final worker bundle");
+    for (const [key, value] of Object.entries(manifest)) {
+        const normalizedKey = normalizeModulePath(key, projectRootDir, {
+            isViteStyle: false,
+        });
+        newCode = newCode.replaceAll(`rwsdk_asset:${normalizedKey}`, `/${value.file}`);
+    }
+    // 3. Deprefix any remaining placeholders that were not in the manifest.
+    // This handles public assets that don't go through the bundler.
+    log("Deprefixing remaining asset placeholders");
+    newCode = newCode.replaceAll("rwsdk_asset:", "");
+    return {
+        code: newCode,
+        map: null,
+    };
+}
 export const linkerPlugin = ({ projectRootDir, }) => {
     return {
         name: "rwsdk:linker",
@@ -13,29 +36,14 @@ export const linkerPlugin = ({ projectRootDir, }) => {
                 return null;
             }
             log("Rendering final worker chunk");
-            let newCode = code;
-            // Read the manifest from the filesystem.
             const manifestContent = await fsp.readFile(path.resolve(projectRootDir, CLIENT_MANIFEST_RELATIVE_PATH), "utf-8");
-            const manifest = JSON.parse(manifestContent);
-            // 1. Replace the manifest placeholder with the actual manifest content.
-            log("Injecting manifest into worker bundle");
-            newCode = newCode.replace('"__RWSDK_MANIFEST_PLACEHOLDER__"', manifestContent);
-            // 2. Replace asset placeholders with their final hashed paths.
-            log("Replacing asset placeholders in final worker bundle");
-            for (const [key, value] of Object.entries(manifest)) {
-                const normalizedKey = normalizeModulePath(key, projectRootDir, {
-                    isViteStyle: false,
-                });
-                newCode = newCode.replaceAll(`rwsdk_asset:${normalizedKey}`, `/${value.file}`);
-            }
-            // 3. Deprefix any remaining placeholders that were not in the manifest.
-            // This handles public assets that don't go through the bundler.
-            log("Deprefixing remaining asset placeholders");
-            newCode = newCode.replaceAll("rwsdk_asset:", "");
-            return {
-                code: newCode,
-                map: null,
-            };
+            const result = linkWorkerBundle({
+                code,
+                manifestContent,
+                projectRootDir,
+            });
+            log("Final worker chunk rendered");
+            return result;
         },
     };
 };

package/dist/vite/linkerPlugin.test.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/vite/linkerPlugin.test.mjs

@@ -0,0 +1,41 @@
+import { describe, it, expect } from "vitest";
+import { linkWorkerBundle } from "./linkerPlugin.mjs";
+describe("linkWorkerBundle", () => {
+    const projectRootDir = "/test/project";
+    const manifest = {
+        "src/styles.css": { file: "assets/styles.123.css" },
+        "src/logo.svg": { file: "assets/logo.abc.svg" },
+    };
+    const manifestContent = JSON.stringify(manifest);
+    it("should replace the manifest placeholder", () => {
+        const code = `const manifest = "__RWSDK_MANIFEST_PLACEHOLDER__";`;
+        const result = linkWorkerBundle({
+            code,
+            manifestContent,
+            projectRootDir,
+        });
+        expect(result.code).toContain(`const manifest = ${manifestContent};`);
+    });
+    it("should replace asset placeholders with hashed paths from the manifest", () => {
+        const code = `
+      const stylesheet = "rwsdk_asset:/src/styles.css";
+      const logo = "rwsdk_asset:/src/logo.svg";
+    `;
+        const result = linkWorkerBundle({
+            code,
+            manifestContent,
+            projectRootDir,
+        });
+        expect(result.code).toContain(`const stylesheet = "/assets/styles.123.css";`);
+        expect(result.code).toContain(`const logo = "/assets/logo.abc.svg";`);
+    });
+    it("should deprefix remaining asset placeholders not in the manifest", () => {
+        const code = `const publicImg = "rwsdk_asset:/images/photo.jpg";`;
+        const result = linkWorkerBundle({
+            code,
+            manifestContent,
+            projectRootDir,
+        });
+        expect(result.code).toContain(`const publicImg = "/images/photo.jpg";`);
+    });
+});

package/dist/vite/miniflareHMRPlugin.d.mts

@@ -1,4 +1,9 @@
 import { Plugin } from "vite";
+export declare const hasEntryAsAncestor: ({ module, entryFile, seen, }: {
+    module: any;
+    entryFile: string;
+    seen?: Set<any>;
+}) => boolean;
 export declare const miniflareHMRPlugin: (givenOptions: {
     clientFiles: Set<string>;
     serverFiles: Set<string>;

package/dist/vite/miniflareHMRPlugin.mjs

@@ -17,7 +17,7 @@ const hasDirective = async (filepath, directive) => {
     const content = await readFile(filepath, "utf-8");
     return sourceHasDirective(content, directive);
 };
-const hasEntryAsAncestor = (module, entryFile, seen = new Set()) => {
+export const hasEntryAsAncestor = ({ module, entryFile, seen = new Set(), }) => {
     // Prevent infinite recursion
     if (seen.has(module)) {
         return false;
@@ -28,7 +28,7 @@ const hasEntryAsAncestor = (module, entryFile, seen = new Set()) => {
         if (importer.file === entryFile)
             return true;
         // Recursively check importers
-        if (hasEntryAsAncestor(importer, entryFile, seen))
+        if (hasEntryAsAncestor({ module: importer, entryFile, seen }))
             return true;
     }
     return false;

package/dist/vite/miniflareHMRPlugin.test.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/vite/miniflareHMRPlugin.test.mjs

@@ -0,0 +1,42 @@
+import { describe, it, expect } from "vitest";
+import { hasEntryAsAncestor } from "./miniflareHMRPlugin.mjs";
+const createModule = (file) => ({
+    file,
+    importers: new Set(),
+});
+describe("hasEntryAsAncestor", () => {
+    it("should return true if the entry file is a direct importer", () => {
+        const entry = createModule("entry.js");
+        const mod = createModule("mod.js");
+        mod.importers.add(entry);
+        expect(hasEntryAsAncestor({ module: mod, entryFile: "entry.js" })).toBe(true);
+    });
+    it("should return true if the entry file is an indirect importer", () => {
+        const entry = createModule("entry.js");
+        const importer1 = createModule("importer1.js");
+        const mod = createModule("mod.js");
+        importer1.importers.add(entry);
+        mod.importers.add(importer1);
+        expect(hasEntryAsAncestor({ module: mod, entryFile: "entry.js" })).toBe(true);
+    });
+    it("should return false if the entry file is not an importer", () => {
+        const entry = createModule("entry.js");
+        const other = createModule("other.js");
+        const mod = createModule("mod.js");
+        mod.importers.add(other);
+        expect(hasEntryAsAncestor({ module: mod, entryFile: "entry.js" })).toBe(false);
+    });
+    it("should handle circular dependencies", () => {
+        const entry = createModule("entry.js");
+        const modA = createModule("modA.js");
+        const modB = createModule("modB.js");
+        modA.importers.add(entry);
+        modA.importers.add(modB);
+        modB.importers.add(modA);
+        expect(hasEntryAsAncestor({ module: modB, entryFile: "entry.js" })).toBe(true);
+    });
+    it("should return false for a module with no importers", () => {
+        const mod = createModule("mod.js");
+        expect(hasEntryAsAncestor({ module: mod, entryFile: "entry.js" })).toBe(false);
+    });
+});

package/dist/vite/redwoodPlugin.d.mts

@@ -1,4 +1,5 @@
 import { InlineConfig } from "vite";
+import { unstable_readConfig } from "wrangler";
 export type RedwoodPluginOptions = {
     silent?: boolean;
     rootDir?: string;
@@ -9,4 +10,10 @@ export type RedwoodPluginOptions = {
         worker?: string;
     };
 };
+export declare const determineWorkerEntryPathname: ({ projectRootDir, workerConfigPath, options, readConfig, }: {
+    projectRootDir: string;
+    workerConfigPath: string;
+    options: RedwoodPluginOptions;
+    readConfig?: typeof unstable_readConfig;
+}) => Promise<string>;
 export declare const redwoodPlugin: (options?: RedwoodPluginOptions) => Promise<InlineConfig["plugins"]>;

package/dist/vite/redwoodPlugin.mjs

@@ -27,11 +27,11 @@ import { manifestPlugin } from "./manifestPlugin.mjs";
 import { linkerPlugin } from "./linkerPlugin.mjs";
 import { directiveModulesDevPlugin } from "./directiveModulesDevPlugin.mjs";
 import { directivesFilteringPlugin } from "./directivesFilteringPlugin.mjs";
-const determineWorkerEntryPathname = async (projectRootDir, workerConfigPath, options) => {
+export const determineWorkerEntryPathname = async ({ projectRootDir, workerConfigPath, options, readConfig = unstable_readConfig, }) => {
     if (options.entry?.worker) {
         return resolve(projectRootDir, options.entry.worker);
     }
-    const workerConfig = unstable_readConfig({ config: workerConfigPath });
+    const workerConfig = readConfig({ config: workerConfigPath });
     return resolve(projectRootDir, workerConfig.main ?? "src/worker.tsx");
 };
 const clientFiles = new Set();
@@ -43,7 +43,11 @@ export const redwoodPlugin = async (options = {}) => {
         (process.env.RWSDK_WRANGLER_CONFIG
             ? resolve(projectRootDir, process.env.RWSDK_WRANGLER_CONFIG)
             : await findWranglerConfig(projectRootDir));
-    const workerEntryPathname = await determineWorkerEntryPathname(projectRootDir, workerConfigPath, options);
+    const workerEntryPathname = await determineWorkerEntryPathname({
+        projectRootDir,
+        workerConfigPath,
+        options,
+    });
     const shouldIncludeCloudflarePlugin = options.includeCloudflarePlugin ??
         !(await hasOwnCloudflareVitePlugin({ rootProjectDir: projectRootDir }));
     const shouldIncludeReactPlugin = options.includeReactPlugin ??

package/dist/vite/redwoodPlugin.test.d.mts

@@ -0,0 +1 @@
+export {};

package/dist/vite/redwoodPlugin.test.mjs

@@ -0,0 +1,34 @@
+import { describe, it, expect } from "vitest";
+import { determineWorkerEntryPathname } from "./redwoodPlugin.mjs";
+import path from "node:path";
+describe("determineWorkerEntryPathname", () => {
+    const projectRootDir = "/test/project";
+    it("should use the entry path from options if provided", async () => {
+        const result = await determineWorkerEntryPathname({
+            projectRootDir,
+            workerConfigPath: "/test/project/wrangler.toml",
+            options: { entry: { worker: "src/custom-worker.ts" } },
+        });
+        expect(result).toBe(path.join(projectRootDir, "src/custom-worker.ts"));
+    });
+    it("should use the main path from wrangler config if no entry option is provided", async () => {
+        const readConfig = () => ({ main: "src/wrangler-worker.tsx" });
+        const result = await determineWorkerEntryPathname({
+            projectRootDir,
+            workerConfigPath: "/test/project/wrangler.toml",
+            options: {},
+            readConfig: readConfig,
+        });
+        expect(result).toBe(path.join(projectRootDir, "src/wrangler-worker.tsx"));
+    });
+    it("should use the default path if wrangler config has no main property", async () => {
+        const readConfig = () => ({});
+        const result = await determineWorkerEntryPathname({
+            projectRootDir,
+            workerConfigPath: "/test/project/wrangler.toml",
+            options: {},
+            readConfig: readConfig,
+        });
+        expect(result).toBe(path.join(projectRootDir, "src/worker.tsx"));
+    });
+});

package/dist/vite/runDirectivesScan.d.mts

@@ -1,7 +1,26 @@
 import { Environment, ResolvedConfig } from "vite";
+type Resolver = (context: {}, path: string, request: string, resolveContext: {}, callback: (err: Error | null, result?: string | false) => void) => void;
+export declare function resolveModuleWithEnvironment({ path, importer, importerEnv, clientResolver, workerResolver, }: {
+    path: string;
+    importer?: string;
+    importerEnv: "client" | "worker";
+    clientResolver: Resolver;
+    workerResolver: Resolver;
+}): Promise<{
+    id: string;
+} | null>;
+export declare function classifyModule({ contents, inheritedEnv, }: {
+    contents: string;
+    inheritedEnv: "client" | "worker";
+}): {
+    moduleEnv: "client" | "worker";
+    isClient: boolean;
+    isServer: boolean;
+};
 export declare const runDirectivesScan: ({ rootConfig, environments, clientFiles, serverFiles, }: {
     rootConfig: ResolvedConfig;
     environments: Record<string, Environment>;
     clientFiles: Set<string>;
     serverFiles: Set<string>;
 }) => Promise<void>;
+export {};