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

package/dist/scripts/addon.mjs

@@ -0,0 +1,70 @@
+import decompress from "decompress";
+import { findUp } from "find-up";
+import { createWriteStream } from "node:fs";
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { Readable } from "node:stream";
+import { pipeline } from "node:stream/promises";
+async function getRwSdkProjectRootDir(cwd) {
+    const packageJsonPath = await findUp("package.json", { cwd });
+    if (packageJsonPath) {
+        return path.dirname(packageJsonPath);
+    }
+    return cwd;
+}
+export const addon = async () => {
+    const addonName = process.argv[2];
+    if (!addonName ||
+        process.argv.find((arg) => arg === "-h") ||
+        process.argv.find((arg) => arg === "--help")) {
+        console.error("Please specify the addon name.");
+        console.error(`Usage: npx rwsdk addon <addon-name>`);
+        process.exit(1);
+    }
+    try {
+        const projectRootDir = await getRwSdkProjectRootDir(process.cwd());
+        const packageJsonPath = path.resolve(projectRootDir, "package.json");
+        const packageJsonContent = await fs.readFile(packageJsonPath, "utf-8");
+        const { dependencies, devDependencies } = JSON.parse(packageJsonContent);
+        let rwsdkVersion = dependencies?.rwsdk || devDependencies?.rwsdk;
+        if (rwsdkVersion === "workspace:*") {
+            throw new Error('The "rwsdk" dependency is set to "workspace:*". Please use a specific version of the SDK.');
+        }
+        if (!rwsdkVersion) {
+            console.error('Could not find "rwsdk" in your dependencies or devDependencies.');
+            process.exit(1);
+        }
+        const tmpDirPrefix = path.join(os.tmpdir(), `rwsdk-addon-${addonName}-`);
+        const tmpDir = await fs.mkdtemp(tmpDirPrefix);
+        const downloadUrl = `https://github.com/redwoodjs/sdk/releases/download/${rwsdkVersion}/${addonName}-${rwsdkVersion}.tar.gz`;
+        console.log(`Downloading addon "${addonName}" version ${rwsdkVersion}...`);
+        const filePath = path.join(os.tmpdir(), `rwsdk-addon-${addonName}-${rwsdkVersion}.tar.gz`);
+        const response = await fetch(downloadUrl);
+        if (!response.ok) {
+            console.error(`Error downloading addon: ${response.statusText}`);
+            process.exit(1);
+        }
+        if (!response.body) {
+            console.error(`\nError: Failed to download addon "${addonName}". The response contained no data.`);
+            process.exit(1);
+        }
+        await pipeline(Readable.fromWeb(response.body), createWriteStream(filePath));
+        await decompress(filePath, tmpDir);
+        console.log();
+        console.log("Download complete!");
+        console.log(`The addon files are located in: ${tmpDir}`);
+        console.log();
+        console.log("To continue, open the step-by-step instructions:");
+        const instructionsPath = path.join(tmpDir, "INSTRUCTIONS.md");
+        console.log(`code ${instructionsPath}`);
+    }
+    catch (e) {
+        console.error(`Could not download addon "${addonName}". Please check the name and try again.`);
+        console.error(e.message);
+        process.exit(1);
+    }
+};
+if (import.meta.url === new URL(process.argv[1], import.meta.url).href) {
+    addon();
+}

package/dist/scripts/debug-sync.mjs

@@ -1,32 +1,11 @@
-import path from "node:path";
-import { fileURLToPath } from "node:url";
+import chokidar from "chokidar";
 import { $ } from "execa";
-import fs from "node:fs/promises";
 import { existsSync } from "node:fs";
-import chokidar from "chokidar";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { lock } from "proper-lockfile";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const getPackageManagerInfo = (targetDir) => {
-    if (existsSync(path.join(targetDir, "bun.lock"))) {
-        return { name: "bun", lockFile: "bun.lock", command: "add" };
-    }
-    const pnpmResult = {
-        name: "pnpm",
-        lockFile: "pnpm-lock.yaml",
-        command: "add",
-    };
-    if (existsSync(path.join(targetDir, "yarn.lock"))) {
-        return { name: "yarn", lockFile: "yarn.lock", command: "add" };
-    }
-    if (existsSync(path.join(targetDir, "pnpm-lock.yaml")) ||
-        existsSync(path.join(targetDir, "node_modules", ".pnpm"))) {
-        return pnpmResult;
-    }
-    if (existsSync(path.join(targetDir, "package-lock.json"))) {
-        return { name: "npm", lockFile: "package-lock.json", command: "install" };
-    }
-    return pnpmResult;
-};
 const cleanupViteEntries = async (targetDir) => {
     const nodeModulesDir = path.join(targetDir, "node_modules");
     if (!existsSync(nodeModulesDir)) {
@@ -58,91 +37,6 @@ const cleanupViteEntries = async (targetDir) => {
         console.log(`Failed to cleanup vite cache entries: ${error}`);
     }
 };
-const performFullSync = async (sdkDir, targetDir) => {
-    let tarballPath = "";
-    let tarballName = "";
-    // Clean up vite cache
-    await cleanupViteEntries(targetDir);
-    try {
-        console.log("📦 Packing SDK...");
-        const packResult = await $({ cwd: sdkDir }) `npm pack --json`;
-        const json = JSON.parse(packResult.stdout || "[]");
-        const packInfo = Array.isArray(json) ? json[0] : undefined;
-        tarballName = (packInfo && (packInfo.filename || packInfo.name)) || "";
-        if (!tarballName) {
-            console.error("❌ Failed to get tarball name from npm pack.");
-            return;
-        }
-        tarballPath = path.resolve(sdkDir, tarballName);
-        console.log(`💿 Installing ${tarballName} in ${targetDir}...`);
-        const pm = getPackageManagerInfo(targetDir);
-        const packageJsonPath = path.join(targetDir, "package.json");
-        const lockfilePath = path.join(targetDir, pm.lockFile);
-        const originalPackageJson = await fs
-            .readFile(packageJsonPath, "utf-8")
-            .catch(() => null);
-        const originalLockfile = await fs
-            .readFile(lockfilePath, "utf-8")
-            .catch(() => null);
-        try {
-            // For bun, we need to remove the existing dependency from package.json
-            // before adding the tarball to avoid a dependency loop error.
-            if (pm.name === "bun" && originalPackageJson) {
-                try {
-                    const targetPackageJson = JSON.parse(originalPackageJson);
-                    let modified = false;
-                    if (targetPackageJson.dependencies?.rwsdk) {
-                        delete targetPackageJson.dependencies.rwsdk;
-                        modified = true;
-                    }
-                    if (targetPackageJson.devDependencies?.rwsdk) {
-                        delete targetPackageJson.devDependencies.rwsdk;
-                        modified = true;
-                    }
-                    if (modified) {
-                        console.log("Temporarily removing rwsdk from target package.json to prevent dependency loop with bun.");
-                        await fs.writeFile(packageJsonPath, JSON.stringify(targetPackageJson, null, 2));
-                    }
-                }
-                catch (e) {
-                    console.warn("Could not modify target package.json, proceeding anyway.");
-                }
-            }
-            const cmd = pm.name;
-            const args = [pm.command];
-            if (pm.name === "yarn") {
-                // For modern yarn, disable PnP to avoid resolution issues with local tarballs
-                process.env.YARN_NODE_LINKER = "node-modules";
-                args.push(`rwsdk@file:${tarballPath}`);
-            }
-            else {
-                args.push(tarballPath);
-            }
-            await $(cmd, args, {
-                cwd: targetDir,
-                stdio: "inherit",
-            });
-        }
-        finally {
-            if (originalPackageJson) {
-                console.log("Restoring package.json...");
-                await fs.writeFile(packageJsonPath, originalPackageJson);
-            }
-            if (originalLockfile) {
-                console.log(`Restoring ${pm.lockFile}...`);
-                await fs.writeFile(lockfilePath, originalLockfile);
-            }
-        }
-    }
-    finally {
-        if (tarballPath) {
-            console.log("Removing tarball...");
-            await fs.unlink(tarballPath).catch(() => {
-                // ignore if deletion fails
-            });
-        }
-    }
-};
 const syncFilesWithRsyncOrFs = async (sdkDir, destDir, filesEntries) => {
     const sources = filesEntries.map((p) => path.join(sdkDir, p));
     // Always include package.json in sync
@@ -191,45 +85,120 @@ const syncFilesWithRsyncOrFs = async (sdkDir, destDir, filesEntries) => {
         }
     }
 };
-const performFastSync = async (sdkDir, targetDir) => {
-    console.log("⚡️ No dependency changes, performing fast sync...");
-    // Clean up vite cache
-    await cleanupViteEntries(targetDir);
-    const nodeModulesPkgDir = path.join(targetDir, "node_modules", "rwsdk");
-    // Copy directories/files declared in package.json#files (plus package.json)
-    const filesToSync = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"))
-        .files || [];
-    await syncFilesWithRsyncOrFs(sdkDir, nodeModulesPkgDir, filesToSync);
+const findUp = async (names, startDir) => {
+    let dir = startDir;
+    while (dir !== path.dirname(dir)) {
+        for (const name of names) {
+            const filePath = path.join(dir, name);
+            if (existsSync(filePath)) {
+                return dir;
+            }
+        }
+        dir = path.dirname(dir);
+    }
+    return undefined;
+};
+const getMonorepoRoot = async (startDir) => {
+    try {
+        // `pnpm root` is the most reliable way to find the workspace root node_modules
+        const { stdout } = await $({
+            cwd: startDir,
+        }) `pnpm root`;
+        // pnpm root returns the node_modules path, so we go up one level
+        return path.resolve(stdout, "..");
+    }
+    catch (e) {
+        console.warn(`Could not determine pnpm root from ${startDir}. Falling back to file search.`);
+        const root = await findUp(["pnpm-workspace.yaml"], startDir);
+        if (root) {
+            return root;
+        }
+    }
+    console.warn("Could not find pnpm monorepo root. Using parent directory of target as fallback.");
+    return path.resolve(startDir, "..");
 };
 const areDependenciesEqual = (deps1, deps2) => {
     // Simple string comparison for this use case is sufficient
     return JSON.stringify(deps1 ?? {}) === JSON.stringify(deps2 ?? {});
 };
+const performFullSync = async (sdkDir, targetDir, monorepoRoot) => {
+    console.log("📦 Performing full sync with tarball...");
+    let tarballPath = "";
+    const projectName = path.basename(targetDir);
+    const rwsyncDir = path.join(monorepoRoot, "node_modules", `.rwsync_${projectName}`);
+    try {
+        // 1. Pack the SDK
+        const packResult = await $({ cwd: sdkDir }) `npm pack --json`;
+        const json = JSON.parse(packResult.stdout || "[]");
+        const packInfo = Array.isArray(json) ? json[0] : undefined;
+        const tarballName = (packInfo && (packInfo.filename || packInfo.name)) || "";
+        if (!tarballName) {
+            throw new Error("Failed to get tarball name from npm pack.");
+        }
+        tarballPath = path.resolve(sdkDir, tarballName);
+        // 2. Prepare isolated install directory
+        console.log(`Preparing isolated install directory at ${rwsyncDir}`);
+        await fs.rm(rwsyncDir, { recursive: true, force: true });
+        await fs.mkdir(rwsyncDir, { recursive: true });
+        await fs.writeFile(path.join(rwsyncDir, "package.json"), JSON.stringify({ name: `rwsync-env-${projectName}` }, null, 2));
+        // 3. Perform isolated install
+        console.log(`Installing ${tarballName} in isolation...`);
+        await $("pnpm", ["add", tarballPath], {
+            cwd: rwsyncDir,
+            stdio: "inherit",
+        });
+        // 4. Create symlink
+        const symlinkSource = path.join(rwsyncDir, "node_modules", "rwsdk");
+        const symlinkTarget = path.join(targetDir, "node_modules", "rwsdk");
+        console.log(`Symlinking ${symlinkTarget} -> ${symlinkSource}`);
+        await fs.rm(symlinkTarget, { recursive: true, force: true });
+        await fs.mkdir(path.dirname(symlinkTarget), { recursive: true });
+        await fs.symlink(symlinkSource, symlinkTarget, "dir");
+    }
+    finally {
+        if (tarballPath) {
+            console.log("Removing tarball...");
+            await fs.unlink(tarballPath).catch(() => { });
+        }
+    }
+};
+const performFastSync = async (sdkDir, targetDir, monorepoRoot) => {
+    console.log("⚡️ Performing fast sync with rsync...");
+    const projectName = path.basename(targetDir);
+    const rwsyncDir = path.join(monorepoRoot, "node_modules", `.rwsync_${projectName}`);
+    const syncDestDir = path.join(rwsyncDir, "node_modules", "rwsdk");
+    // Copy directories/files declared in package.json#files (plus package.json)
+    const filesToSync = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"))
+        .files || [];
+    await syncFilesWithRsyncOrFs(sdkDir, syncDestDir, filesToSync);
+};
 const performSync = async (sdkDir, targetDir) => {
     console.log("🏗️  Rebuilding SDK...");
     await $ `pnpm build`;
-    const forceFullSync = Boolean(process.env.RWSDK_FORCE_FULL_SYNC);
-    if (forceFullSync) {
-        console.log("🏃 Force full sync mode is enabled.");
-        await performFullSync(sdkDir, targetDir);
-        console.log("✅ Done syncing");
-        return;
+    // Clean up vite cache in the target project
+    await cleanupViteEntries(targetDir);
+    const monorepoRoot = await getMonorepoRoot(targetDir);
+    const projectName = path.basename(targetDir);
+    const installedSdkPackageJsonPath = path.join(monorepoRoot, "node_modules", `.rwsync_${projectName}`, "node_modules", "rwsdk", "package.json");
+    let needsFullSync = false;
+    if (!existsSync(installedSdkPackageJsonPath)) {
+        console.log("No previous sync found, performing full sync.");
+        needsFullSync = true;
     }
-    const sdkPackageJsonPath = path.join(sdkDir, "package.json");
-    const installedSdkPackageJsonPath = path.join(targetDir, "node_modules/rwsdk/package.json");
-    let packageJsonChanged = true;
-    if (existsSync(installedSdkPackageJsonPath)) {
-        const sdkPackageJsonContent = await fs.readFile(sdkPackageJsonPath, "utf-8");
-        const installedSdkPackageJsonContent = await fs.readFile(installedSdkPackageJsonPath, "utf-8");
-        packageJsonChanged =
-            sdkPackageJsonContent !== installedSdkPackageJsonContent;
+    else {
+        const sdkPackageJson = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"));
+        const installedSdkPackageJson = JSON.parse(await fs.readFile(installedSdkPackageJsonPath, "utf-8"));
+        if (!areDependenciesEqual(sdkPackageJson.dependencies, installedSdkPackageJson.dependencies) ||
+            !areDependenciesEqual(sdkPackageJson.devDependencies, installedSdkPackageJson.devDependencies)) {
+            console.log("Dependency changes detected, performing full sync.");
+            needsFullSync = true;
+        }
     }
-    if (packageJsonChanged) {
-        console.log("📦 package.json changed, performing full sync...");
-        await performFullSync(sdkDir, targetDir);
+    if (needsFullSync) {
+        await performFullSync(sdkDir, targetDir, monorepoRoot);
     }
     else {
-        await performFastSync(sdkDir, targetDir);
+        await performFastSync(sdkDir, targetDir, monorepoRoot);
     }
     console.log("✅ Done syncing");
 };

package/dist/scripts/ensure-deploy-env.mjs

@@ -1,13 +1,13 @@
-import { $ } from "../lib/$.mjs";
-import { readFile, writeFile } from "fs/promises";
-import { resolve, basename, join } from "path";
 import { randomBytes } from "crypto";
+import { pathExists } from "fs-extra";
+import { readFile, writeFile } from "fs/promises";
 import { glob } from "glob";
 import { parse as parseJsonc } from "jsonc-parser";
-import { uniqueNamesGenerator, adjectives, animals, } from "unique-names-generator";
+import { basename, join, resolve } from "path";
 import * as readline from "readline";
-import { pathExists } from "fs-extra";
-import { parseJson, extractAllJson } from "../lib/jsonUtils.mjs";
+import { adjectives, animals, uniqueNamesGenerator, } from "unique-names-generator";
+import { $ } from "../lib/$.mjs";
+import { extractAllJson, parseJson } from "../lib/jsonUtils.mjs";
 const promptForDeployment = async () => {
     const rl = readline.createInterface({
         input: process.stdin,

package/dist/scripts/migrate-new.mjs

@@ -1,9 +1,8 @@
+import { mkdirp } from "fs-extra";
+import { readdir, writeFile } from "fs/promises";
 import snakeCase from "lodash/snakeCase.js";
-import { $ } from "../lib/$.mjs";
-import { readdir } from "fs/promises";
 import { resolve } from "path";
-import { mkdirp } from "fs-extra";
-import { writeFile } from "fs/promises";
+import { $ } from "../lib/$.mjs";
 const getNextMigrationNumber = async () => {
     await mkdirp(resolve(process.cwd(), "./migrations"));
     const files = await readdir(resolve(process.cwd(), "./migrations"));

package/dist/scripts/smoke-test.mjs

@@ -1,6 +1,6 @@
-import { fileURLToPath } from "url";
-import { join } from "path";
 import debug from "debug";
+import { join } from "path";
+import { fileURLToPath } from "url";
 import { runSmokeTests } from "../lib/smokeTests/runSmokeTests.mjs";
 import { isRunningInCI } from "../lib/smokeTests/utils.mjs";
 // Set up debug logging

package/dist/scripts/worker-run.mjs

@@ -1,15 +1,13 @@
-import path from "path";
-import { resolve } from "path";
-import { writeFile } from "fs/promises";
-import { unstable_readConfig } from "wrangler";
-import { createServer as createViteServer } from "vite";
-import tmp from "tmp-promise";
+import { Lang, parse } from "@ast-grep/napi";
 import baseDebug from "debug";
 import enhancedResolve from "enhanced-resolve";
-import { readFile } from "fs/promises";
-import { Lang, parse } from "@ast-grep/napi";
-import { redwood } from "../vite/index.mjs";
+import { readFile, writeFile } from "fs/promises";
+import path, { resolve } from "path";
+import tmp from "tmp-promise";
+import { createServer as createViteServer } from "vite";
+import { unstable_readConfig } from "wrangler";
 import { findWranglerConfig } from "../lib/findWranglerConfig.mjs";
+import { redwood } from "../vite/index.mjs";
 const debug = baseDebug("rwsdk:worker-run");
 export const runWorkerScript = async (relativeScriptPath) => {
     if (!relativeScriptPath) {

package/dist/vite/buildApp.mjs

@@ -1,5 +1,5 @@
-import { resolve } from "node:path";
 import debug from "debug";
+import { resolve } from "node:path";
 import { runDirectivesScan } from "./runDirectivesScan.mjs";
 const log = debug("rwsdk:vite:build-app");
 /**

package/dist/vite/checkIsUsingPrisma.test.mjs

@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, expect, it } from "vitest";
 import { isUsingPrisma } from "./checkIsUsingPrisma.mjs";
 describe("isUsingPrisma", () => {
     it("should return true if prisma client is resolved", () => {

package/dist/vite/configPlugin.mjs

@@ -1,5 +1,5 @@
-import path, { resolve } from "node:path";
 import enhancedResolve from "enhanced-resolve";
+import path, { resolve } from "node:path";
 import { INTERMEDIATE_SSR_BRIDGE_PATH } from "../lib/constants.mjs";
 import { buildApp } from "./buildApp.mjs";
 import { externalModules } from "./constants.mjs";
@@ -31,7 +31,17 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
             },
             optimizeDeps: {
                 noDiscovery: false,
-                include: ["rwsdk/worker"],
+                include: [
+                    "rwsdk/__ssr_bridge",
+                    "rwsdk/auth",
+                    "rwsdk/constants",
+                    "rwsdk/db",
+                    "rwsdk/debug",
+                    "rwsdk/realtime/durableObject",
+                    "rwsdk/realtime/worker",
+                    "rwsdk/router",
+                    "rwsdk/worker",
+                ],
                 exclude: [],
                 entries: [workerEntryPathname],
                 esbuildOptions: {
@@ -78,7 +88,13 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                     },
                     optimizeDeps: {
                         noDiscovery: false,
-                        include: ["rwsdk/client"],
+                        include: [
+                            "rwsdk/client",
+                            "rwsdk/constants",
+                            "rwsdk/debug",
+                            "rwsdk/realtime/client",
+                            "rwsdk/turnstile",
+                        ],
                         entries: [],
                         esbuildOptions: {
                             jsx: "automatic",
@@ -105,7 +121,18 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                         noDiscovery: false,
                         entries: [workerEntryPathname],
                         exclude: externalModules,
-                        include: ["rwsdk/__ssr", "rwsdk/__ssr_bridge"],
+                        include: [
+                            "rwsdk/__ssr",
+                            "rwsdk/__ssr_bridge",
+                            "rwsdk/client",
+                            "rwsdk/constants",
+                            "rwsdk/debug",
+                            "rwsdk/realtime/client",
+                            "rwsdk/router",
+                            "rwsdk/worker",
+                            "rwsdk/realtime/durableObject",
+                            "rwsdk/realtime/worker",
+                        ],
                         esbuildOptions: {
                             jsx: "automatic",
                             jsxImportSource: "react",
@@ -138,8 +165,8 @@ export const configPlugin = ({ silent, projectRootDir, workerEntryPathname, clie
                                 // original `export` statement from the bundle to prevent syntax
                                 // errors.
                                 inlineDynamicImports: true,
-                                banner: `export const { renderHtmlStream, ssrWebpackRequire, ssrGetModuleExport, createThenableFromReadableStream } = (function() {`,
-                                footer: `return { renderHtmlStream, ssrWebpackRequire, ssrGetModuleExport, createThenableFromReadableStream };\n})();`,
+                                banner: `export const { renderHtmlStream, ssrLoadModule, ssrWebpackRequire, ssrGetModuleExport, createThenableFromReadableStream } = (function() {`,
+                                footer: `return { renderHtmlStream, ssrLoadModule, ssrWebpackRequire, ssrGetModuleExport, createThenableFromReadableStream };\n})();`,
                             },
                             plugins: [
                                 {

package/dist/vite/createDirectiveLookupPlugin.mjs

@@ -1,6 +1,6 @@
+import debug from "debug";
 import MagicString from "magic-string";
 import path from "path";
-import debug from "debug";
 import { VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, } from "../lib/constants.mjs";
 export function generateLookupMap({ files, isDev, kind, exportName, }) {
     const s = new MagicString(`

package/dist/vite/createDirectiveLookupPlugin.test.mjs

@@ -1,6 +1,6 @@
-import { describe, it, expect } from "vitest";
-import { generateLookupMap } from "./createDirectiveLookupPlugin.mjs";
+import { describe, expect, it } from "vitest";
 import { VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, } from "../lib/constants.mjs";
+import { generateLookupMap } from "./createDirectiveLookupPlugin.mjs";
 describe("generateLookupMap", () => {
     const files = new Set([
         "src/app.js",

package/dist/vite/createViteAwareResolver.d.mts

@@ -1,5 +1,4 @@
 import resolve, { ResolveOptions } from "enhanced-resolve";
-import { ResolvedConfig } from "vite";
-import { Environment } from "vite";
+import { Environment, ResolvedConfig } from "vite";
 export declare const mapViteResolveToEnhancedResolveOptions: (viteConfig: ResolvedConfig, envName: string) => ResolveOptions;
 export declare const createViteAwareResolver: (viteConfig: ResolvedConfig, environment: Environment) => resolve.ResolveFunctionAsync;

package/dist/vite/createViteAwareResolver.mjs

@@ -1,7 +1,7 @@
+import createDebug from "debug";
 import resolve from "enhanced-resolve";
 import fs from "fs";
 import path from "path";
-import createDebug from "debug";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const debug = createDebug("rwsdk:vite:enhanced-resolve-plugin");
 // Enhanced-resolve plugin that wraps Vite plugin resolution

package/dist/vite/directiveModulesDevPlugin.mjs

@@ -1,8 +1,8 @@
-import path from "path";
+import { mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
 import os from "os";
-import { writeFileSync, mkdirSync, mkdtempSync } from "node:fs";
+import path from "path";
+import { VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_CLIENT_BARREL_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_PATH, } from "../lib/constants.mjs";
 import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
-import { VENDOR_CLIENT_BARREL_PATH, VENDOR_SERVER_BARREL_PATH, VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH, } from "../lib/constants.mjs";
 import { runDirectivesScan } from "./runDirectivesScan.mjs";
 export const generateVendorBarrelContent = (files, projectRootDir) => {
     const imports = [...files]
@@ -84,7 +84,7 @@ export const directiveModulesDevPlugin = ({ clientFiles, serverFiles, projectRoo
                 env.optimizeDeps.include ??= [];
                 const entries = (env.optimizeDeps.entries = castArray(env.optimizeDeps.entries ?? []));
                 env.optimizeDeps.include.push(VENDOR_CLIENT_BARREL_EXPORT_PATH, VENDOR_SERVER_BARREL_EXPORT_PATH);
-                if (envName === "client") {
+                if (envName === "client" || envName === "ssr") {
                     entries.push(APP_CLIENT_BARREL_PATH);
                 }
                 else if (envName === "worker") {

package/dist/vite/directiveModulesDevPlugin.test.mjs

@@ -1,5 +1,5 @@
-import { describe, it, expect } from "vitest";
-import { generateVendorBarrelContent, generateAppBarrelContent, } from "./directiveModulesDevPlugin.mjs";
+import { describe, expect, it } from "vitest";
+import { generateAppBarrelContent, generateVendorBarrelContent, } from "./directiveModulesDevPlugin.mjs";
 describe("directiveModulesDevPlugin helpers", () => {
     const projectRootDir = "/Users/test/project";
     describe("generateVendorBarrelContent", () => {

package/dist/vite/directivesPlugin.mjs

@@ -1,9 +1,9 @@
-import path from "node:path";
-import fs from "node:fs/promises";
 import debug from "debug";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 import { transformClientComponents } from "./transformClientComponents.mjs";
 import { transformServerFunctions } from "./transformServerFunctions.mjs";
-import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const log = debug("rwsdk:vite:rsc-directives-plugin");
 export const getLoader = (filePath) => {
     const ext = path.extname(filePath).slice(1);

package/dist/vite/directivesPlugin.test.mjs

@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, expect, it } from "vitest";
 import { getLoader } from "./directivesPlugin.mjs";
 describe("getLoader", () => {
     const testCases = [

package/dist/vite/ensureAliasArray.test.mjs

@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, expect, it } from "vitest";
 import { ensureAliasArray } from "./ensureAliasArray.mjs";
 describe("ensureAliasArray", () => {
     it("should create resolve and alias array if resolve is undefined", () => {

package/dist/vite/findSpecifiers.mjs

@@ -1,4 +1,4 @@
-import { parse as sgParse, Lang as SgLang, Lang } from "@ast-grep/napi";
+import { Lang, Lang as SgLang, parse as sgParse } from "@ast-grep/napi";
 import path from "path";
 // These patterns are used to match import statements in code for SSR transformations.
 export const IMPORT_PATTERNS = [

package/dist/vite/findSpecifiers.test.mjs

@@ -1,5 +1,5 @@
-import { describe, it, expect } from "vitest";
-import { findImportSpecifiers, findExports } from "./findSpecifiers.mjs";
+import { describe, expect, it } from "vitest";
+import { findExports, findImportSpecifiers } from "./findSpecifiers.mjs";
 function dedupeImports(imports) {
     const seen = new Set();
     return imports.filter((imp) => {

package/dist/vite/findSsrSpecifiers.mjs

@@ -1,4 +1,4 @@
-import { parse as sgParse, Lang as SgLang, Lang } from "@ast-grep/napi";
+import { Lang, Lang as SgLang, parse as sgParse } from "@ast-grep/napi";
 import path from "path";
 /**
  * Finds callsites for __vite_ssr_import__ and __vite_ssr_dynamic_import__ with their ranges.

package/dist/vite/findSsrSpecifiers.test.mjs

@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, expect, it } from "vitest";
 import { findSsrImportCallSites } from "./findSsrSpecifiers.mjs";
 describe("findSsrImportCallSites", () => {
     it("should find __vite_ssr_import__ with double quotes", () => {

package/dist/vite/getViteEsbuild.mjs

@@ -1,5 +1,5 @@
-import path from "node:path";
 import { createRequire } from "node:module";
+import path from "node:path";
 const require = createRequire(import.meta.url);
 export async function getViteEsbuild(projectRootDir) {
     const vitePath = require.resolve("vite/package.json", {

package/dist/vite/hasDirective.test.mjs

@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, expect, it } from "vitest";
 import { hasDirective } from "./hasDirective.mjs";
 describe("hasDirective", () => {
     it('should find "use client" directive', () => {