rwsdk 0.1.23 → 0.1.25

package/dist/scripts/debug-sync.mjs

@@ -15,7 +15,8 @@ const getPackageManagerInfo = (targetDir) => {
     if (existsSync(path.join(targetDir, "yarn.lock"))) {
         return { name: "yarn", lockFile: "yarn.lock", command: "add" };
     }
-    if (existsSync(path.join(targetDir, "pnpm-lock.yaml"))) {
+    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"))) {
@@ -23,51 +24,75 @@ const getPackageManagerInfo = (targetDir) => {
     }
     return pnpmResult;
 };
-const performFullSync = async (sdkDir, targetDir) => {
-    console.log("📦 Packing SDK...");
-    const packResult = await $ `npm pack`;
-    const tarballName = packResult.stdout?.trim() ?? "";
-    if (!tarballName) {
-        console.error("❌ Failed to get tarball name from npm pack.");
-        return;
-    }
-    const 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);
+const performFullSync = async (sdkDir, targetDir, cacheBust = false) => {
+    const sdkPackageJsonPath = path.join(sdkDir, "package.json");
+    let originalSdkPackageJson = null;
+    let tarballPath = "";
+    let tarballName = "";
     try {
-        const cmd = pm.name;
-        const args = [pm.command];
-        if (pm.name === "yarn") {
-            args.push(`file:${tarballPath}`);
+        if (cacheBust) {
+            console.log("💥 Cache-busting version for full sync...");
+            originalSdkPackageJson = await fs.readFile(sdkPackageJsonPath, "utf-8");
+            const packageJson = JSON.parse(originalSdkPackageJson);
+            const now = Date.now();
+            // This is a temporary version used for cache busting
+            packageJson.version = `${packageJson.version}-dev.${now}`;
+            await fs.writeFile(sdkPackageJsonPath, JSON.stringify(packageJson, null, 2));
+        }
+        console.log("📦 Packing SDK...");
+        const packResult = await $({ cwd: sdkDir }) `npm pack`;
+        tarballName = packResult.stdout?.trim() ?? "";
+        if (!tarballName) {
+            console.error("❌ Failed to get tarball name from npm pack.");
+            return;
         }
-        else {
-            args.push(tarballPath);
+        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 {
+            const cmd = pm.name;
+            const args = [pm.command];
+            if (pm.name === "yarn") {
+                args.push(`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);
+            }
         }
-        await $(cmd, args, {
-            cwd: targetDir,
-            stdio: "inherit",
-        });
     }
     finally {
-        if (originalPackageJson) {
+        if (originalSdkPackageJson) {
             console.log("Restoring package.json...");
-            await fs.writeFile(packageJsonPath, originalPackageJson);
+            await fs.writeFile(sdkPackageJsonPath, originalSdkPackageJson);
         }
-        if (originalLockfile) {
-            console.log(`Restoring ${pm.lockFile}...`);
-            await fs.writeFile(lockfilePath, originalLockfile);
+        if (tarballPath) {
+            console.log("Removing tarball...");
+            await fs.unlink(tarballPath).catch(() => {
+                // ignore if deletion fails
+            });
         }
-        await fs.unlink(tarballPath).catch(() => {
-            // ignore if deletion fails
-        });
     }
 };
 const performFastSync = async (sdkDir, targetDir) => {
@@ -87,6 +112,13 @@ const performFastSync = async (sdkDir, targetDir) => {
 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, true);
+        console.log("✅ Done syncing");
+        return;
+    }
     const sdkPackageJsonPath = path.join(sdkDir, "package.json");
     const installedSdkPackageJsonPath = path.join(targetDir, "node_modules/rwsdk/package.json");
     let packageJsonChanged = true;
@@ -166,8 +198,21 @@ export const debugSync = async (opts) => {
         ignoreInitial: true,
         cwd: sdkDir,
     });
-    watcher.on("all", async () => {
-        console.log("\nDetected change, re-syncing...");
+    let syncing = false;
+    // todo(justinvdm, 2025-07-22): Figure out wtf makes the full sync
+    // cause chokidar to find out about package.json after sync has resolved
+    let expectingFileChanges = Boolean(process.env.RWSDK_FORCE_FULL_SYNC);
+    watcher.on("all", async (_event, filePath) => {
+        if (syncing || filePath.endsWith(".tgz")) {
+            return;
+        }
+        if (expectingFileChanges && process.env.RWSDK_FORCE_FULL_SYNC) {
+            expectingFileChanges = false;
+            return;
+        }
+        syncing = true;
+        expectingFileChanges = true;
+        console.log(`\nDetected change, re-syncing... (file: ${filePath})`);
         if (childProc && !childProc.killed) {
             console.log("Stopping running process...");
             childProc.kill();
@@ -176,6 +221,7 @@ export const debugSync = async (opts) => {
             });
         }
         try {
+            watcher.unwatch(filesToWatch);
             await performSync(sdkDir, targetDir);
             runWatchedCommand();
         }
@@ -183,6 +229,10 @@ export const debugSync = async (opts) => {
             console.error("❌ Sync failed:", error);
             console.log("   Still watching for changes...");
         }
+        finally {
+            syncing = false;
+            watcher.add(filesToWatch);
+        }
     });
     const cleanup = async () => {
         console.log("\nCleaning up...");

package/dist/vite/createDirectiveLookupPlugin.mjs

@@ -2,7 +2,7 @@ import MagicString from "magic-string";
 import path from "path";
 import { readFile } from "fs/promises";
 import debug from "debug";
-import { normalizeModulePath } from "./normalizeModulePath.mjs";
+import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 import { pathExists } from "fs-extra";
 import { stat } from "fs/promises";
 import { getSrcPaths } from "../lib/getSrcPaths.js";
@@ -22,7 +22,7 @@ export const findFilesContainingDirective = async ({ projectRootDir, files, dire
             process.env.VERBOSE && log("Scanning file: %s", file);
             const content = await readFile(file, "utf-8");
             if (hasDirective(content, directive)) {
-                const normalizedPath = normalizeModulePath(projectRootDir, file);
+                const normalizedPath = normalizeModulePath(file, projectRootDir);
                 log("Found '%s' directive in file: %s -> %s", directive, file, normalizedPath);
                 files.add(normalizedPath);
             }

package/dist/vite/directivesPlugin.mjs

@@ -3,7 +3,7 @@ import fs from "node:fs/promises";
 import debug from "debug";
 import { transformClientComponents } from "./transformClientComponents.mjs";
 import { transformServerFunctions } from "./transformServerFunctions.mjs";
-import { normalizeModulePath } from "./normalizeModulePath.mjs";
+import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 const log = debug("rwsdk:vite:rsc-directives-plugin");
 const getLoader = (filePath) => {
     const ext = path.extname(filePath).slice(1);
@@ -31,9 +31,10 @@ export const directivesPlugin = ({ projectRootDir, clientFiles, serverFiles, })
     const addModule = (kind, environment, id) => {
         const files = kind === "client" ? clientFiles : serverFiles;
         const rawId = id.split("?")[0];
-        const resolvedId = rawId;
-        const relativePath = rawId.slice("/".length);
-        const fullPath = path.resolve(projectRootDir, relativePath);
+        const resolvedId = normalizeModulePath(rawId, projectRootDir);
+        const fullPath = normalizeModulePath(rawId, projectRootDir, {
+            absolute: true,
+        });
         const isNodeModule = id.includes("node_modules");
         const hadFile = files.has(id);
         log("Adding %s module to %s and invalidating cache: id=%s", kind, files, resolvedId);
@@ -77,7 +78,7 @@ export const directivesPlugin = ({ projectRootDir, clientFiles, serverFiles, })
         async transform(code, id) {
             process.env.VERBOSE &&
                 log("Transform called for id=%s, environment=%s", id, this.environment.name);
-            const normalizedId = normalizeModulePath(projectRootDir, id);
+            const normalizedId = normalizeModulePath(id, projectRootDir);
             const clientResult = await transformClientComponents(code, normalizedId, {
                 environmentName: this.environment.name,
                 clientFiles,
@@ -112,7 +113,7 @@ export const directivesPlugin = ({ projectRootDir, clientFiles, serverFiles, })
                     build.onLoad({ filter: /\.(js|ts|jsx|tsx|mts|mjs|cjs)$/ }, async (args) => {
                         process.env.VERBOSE &&
                             log("Esbuild onLoad called for environment=%s, path=%s", env, args.path);
-                        const normalizedPath = normalizeModulePath(projectRootDir, args.path);
+                        const normalizedPath = normalizeModulePath(args.path, projectRootDir);
                         // context(justinvdm,2025-06-15): If we're in app code,
                         // we will be doing the transform work in the vite plugin hooks,
                         // the only reason we're in esbuild land for app code is for

package/dist/vite/miniflareHMRPlugin.mjs

@@ -3,7 +3,7 @@ import colors from "picocolors";
 import { readFile } from "node:fs/promises";
 import debug from "debug";
 import { VIRTUAL_SSR_PREFIX } from "./ssrBridgePlugin.mjs";
-import { normalizeModulePath } from "./normalizeModulePath.mjs";
+import { normalizeModulePath } from "../lib/normalizeModulePath.mjs";
 import { hasDirective as sourceHasDirective } from "./hasDirective.mjs";
 import { isJsFile } from "./isJsFile.mjs";
 import { invalidateModule } from "./invalidateModule.mjs";
@@ -33,7 +33,7 @@ const hasEntryAsAncestor = (module, entryFile, seen = new Set()) => {
     return false;
 };
 const isInUseClientGraph = ({ file, clientFiles, server, }) => {
-    const id = normalizeModulePath(server.config.root, file);
+    const id = normalizeModulePath(file, server.config.root);
     if (clientFiles.has(id)) {
         return true;
     }
@@ -74,7 +74,7 @@ export const miniflareHMRPlugin = (givenOptions) => [
                 }
                 invalidateModule(ctx.server, "ssr", ctx.file);
                 invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX +
-                    normalizeModulePath(givenOptions.rootDir, ctx.file));
+                    normalizeModulePath(ctx.file, givenOptions.rootDir));
                 return [];
             }
             if (!["client", environment].includes(this.environment.name)) {
@@ -159,7 +159,7 @@ export const miniflareHMRPlugin = (givenOptions) => [
                     invalidateModule(ctx.server, environment, m);
                 }
                 const virtualSSRModule = ctx.server.environments[environment].moduleGraph.idToModuleMap.get(VIRTUAL_SSR_PREFIX +
-                    normalizeModulePath(givenOptions.rootDir, ctx.file));
+                    normalizeModulePath(ctx.file, givenOptions.rootDir));
                 if (virtualSSRModule) {
                     invalidateModule(ctx.server, environment, virtualSSRModule);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {

package/dist/vite/normalizeModulePath.d.mts

@@ -1 +0,0 @@
-export declare const normalizeModulePath: (projectRootDir: string, modulePath: string) => string;

package/dist/vite/normalizeModulePath.mjs

@@ -1,13 +0,0 @@
-import path from "node:path";
-export const normalizeModulePath = (projectRootDir, modulePath) => {
-    // /Users/path/to/project/src/foo/bar.ts -> /src/foo/bar.ts
-    if (modulePath.startsWith(projectRootDir)) {
-        return "/" + path.relative(projectRootDir, modulePath);
-    }
-    // /src/foo/bar.ts -> /src/foo/bar.ts
-    if (modulePath.startsWith("/")) {
-        return modulePath;
-    }
-    // src/foo/bar.ts -> /src/foo/bar.ts
-    return "/" + modulePath;
-};