rwsdk 0.2.0-alpha.12 → 0.2.0-alpha.13

package/dist/scripts/debug-sync.mjs

@@ -24,15 +24,50 @@ const getPackageManagerInfo = (targetDir) => {
     }
     return pnpmResult;
 };
+const cleanupViteEntries = async (targetDir) => {
+    const nodeModulesDir = path.join(targetDir, "node_modules");
+    if (!existsSync(nodeModulesDir)) {
+        return;
+    }
+    try {
+        const entries = await fs.readdir(nodeModulesDir);
+        const viteEntries = entries.filter((entry) => entry.startsWith(".vite"));
+        for (const entry of viteEntries) {
+            const entryPath = path.join(nodeModulesDir, entry);
+            try {
+                const stat = await fs.lstat(entryPath);
+                if (!stat.isSymbolicLink()) {
+                    console.log(`Removing vite cache entry: ${entry}`);
+                    await fs.rm(entryPath, { recursive: true, force: true });
+                }
+                else {
+                    console.log(`Skipping symlinked vite cache entry: ${entry}`);
+                }
+            }
+            catch {
+                // If we can't stat it, try to remove it
+                console.log(`Removing vite cache entry: ${entry}`);
+                await fs.rm(entryPath, { recursive: true, force: true });
+            }
+        }
+    }
+    catch (error) {
+        console.log(`Failed to cleanup vite cache entries: ${error}`);
+    }
+};
 const performFullSync = async (sdkDir, targetDir) => {
     const sdkPackageJsonPath = path.join(sdkDir, "package.json");
     let originalSdkPackageJson = null;
     let tarballPath = "";
     let tarballName = "";
+    // Clean up vite cache
+    await cleanupViteEntries(targetDir);
     try {
         console.log("📦 Packing SDK...");
-        const packResult = await $({ cwd: sdkDir }) `npm pack`;
-        tarballName = packResult.stdout?.trim() ?? "";
+        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;
@@ -86,23 +121,63 @@ const performFullSync = async (sdkDir, targetDir) => {
         }
     }
 };
-const performFastSync = async (sdkDir, targetDir) => {
-    console.log("⚡️ No dependency changes, performing fast sync...");
-    const sdkPackageJson = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"));
-    const filesToSync = sdkPackageJson.files || [];
-    for (const file of filesToSync) {
-        const source = path.join(sdkDir, file);
-        const destination = path.join(targetDir, "node_modules/rwsdk", file);
-        if (existsSync(source)) {
-            await fs.cp(source, destination, { recursive: true, force: true });
+const syncFilesWithRsyncOrFs = async (sdkDir, destDir, filesEntries) => {
+    const sources = filesEntries.map((p) => path.join(sdkDir, p));
+    // Always include package.json in sync
+    const pkgJsonPath = path.join(sdkDir, "package.json");
+    sources.push(pkgJsonPath);
+    await fs.mkdir(destDir, { recursive: true });
+    // Try rsync across all sources in one shot
+    try {
+        if (sources.length > 0) {
+            const rsyncArgs = [
+                "-a",
+                "--delete",
+                "--omit-dir-times",
+                "--no-perms",
+                "--no-owner",
+                "--no-group",
+                ...sources,
+                destDir + path.sep,
+            ];
+            await $({ stdio: "inherit" })("rsync", rsyncArgs);
+            return;
+        }
+    }
+    catch {
+        // fall through to fs fallback
+    }
+    console.log("Rsync failed, falling back to fs");
+    // Fallback: destructive copy using Node fs to mirror content
+    await fs.rm(destDir, { recursive: true, force: true });
+    await fs.mkdir(destDir, { recursive: true });
+    for (const src of sources) {
+        const rel = path.relative(sdkDir, src);
+        const dst = path.join(destDir, rel);
+        await fs.mkdir(path.dirname(dst), { recursive: true });
+        try {
+            const stat = await fs.lstat(src);
+            if (stat.isDirectory()) {
+                await fs.cp(src, dst, { recursive: true, force: true });
+            }
+            else {
+                await fs.copyFile(src, dst);
+            }
+        }
+        catch {
+            await fs.cp(src, dst, { recursive: true, force: true }).catch(() => { });
         }
     }
-    // Always copy package.json
-    await fs.copyFile(path.join(sdkDir, "package.json"), path.join(targetDir, "node_modules/rwsdk/package.json"));
 };
-const areDependenciesEqual = (deps1, deps2) => {
-    // Simple string comparison for this use case is sufficient
-    return JSON.stringify(deps1 ?? {}) === JSON.stringify(deps2 ?? {});
+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 performSync = async (sdkDir, targetDir) => {
     console.log("🏗️  Rebuilding SDK...");
@@ -120,13 +195,8 @@ const performSync = async (sdkDir, targetDir) => {
     if (existsSync(installedSdkPackageJsonPath)) {
         const sdkPackageJsonContent = await fs.readFile(sdkPackageJsonPath, "utf-8");
         const installedSdkPackageJsonContent = await fs.readFile(installedSdkPackageJsonPath, "utf-8");
-        const sdkPkg = JSON.parse(sdkPackageJsonContent);
-        const installedPkg = JSON.parse(installedSdkPackageJsonContent);
-        if (areDependenciesEqual(sdkPkg.dependencies, installedPkg.dependencies) &&
-            areDependenciesEqual(sdkPkg.devDependencies, installedPkg.devDependencies) &&
-            areDependenciesEqual(sdkPkg.peerDependencies, installedPkg.peerDependencies)) {
-            packageJsonChanged = false;
-        }
+        packageJsonChanged =
+            sdkPackageJsonContent !== installedSdkPackageJsonContent;
     }
     if (packageJsonChanged) {
         console.log("📦 package.json changed, performing full sync...");
@@ -198,20 +268,19 @@ export const debugSync = async (opts) => {
         cwd: sdkDir,
     });
     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;
+    let pendingResync = false;
+    const triggerResync = async (reason) => {
+        if (syncing) {
+            pendingResync = true;
             return;
         }
         syncing = true;
-        expectingFileChanges = true;
-        console.log(`\nDetected change, re-syncing... (file: ${filePath})`);
+        if (reason) {
+            console.log(`\nDetected change, re-syncing... (file: ${reason})`);
+        }
+        else {
+            console.log(`\nDetected change, re-syncing...`);
+        }
         if (childProc && !childProc.killed) {
             console.log("Stopping running process...");
             childProc.kill();
@@ -220,7 +289,6 @@ export const debugSync = async (opts) => {
             });
         }
         try {
-            watcher.unwatch(filesToWatch);
             await performSync(sdkDir, targetDir);
             runWatchedCommand();
         }
@@ -230,8 +298,19 @@ export const debugSync = async (opts) => {
         }
         finally {
             syncing = false;
-            watcher.add(filesToWatch);
         }
+        if (pendingResync) {
+            pendingResync = false;
+            // Coalesce any rapid additional events into a single follow-up sync
+            await new Promise((r) => setTimeout(r, 50));
+            return triggerResync();
+        }
+    };
+    watcher.on("all", async (_event, filePath) => {
+        if (filePath.endsWith(".tgz")) {
+            return;
+        }
+        await triggerResync(filePath);
     });
     const cleanup = async () => {
         console.log("\nCleaning up...");

package/dist/vite/miniflareHMRPlugin.mjs

@@ -77,6 +77,7 @@ export const miniflareHMRPlugin = (givenOptions) => [
                     type: "full-reload",
                     path: "*",
                 });
+                log("hmr: Full reload after error");
                 return [];
             }
             const { clientFiles, serverFiles, viteEnvironment: { name: environment }, workerEntryPathname: entry, } = givenOptions;
@@ -84,6 +85,7 @@ export const miniflareHMRPlugin = (givenOptions) => [
                 log(`Hot update: (env=${this.environment.name}) ${ctx.file}\nModule graph:\n\n${dumpFullModuleGraph(ctx.server, this.environment.name)}`);
             }
             if (!isJsFile(ctx.file) && !ctx.file.endsWith(".css")) {
+                log(`hmr: not a js file, skipping`);
                 return;
             }
             if (this.environment.name === "ssr") {
@@ -94,14 +96,17 @@ export const miniflareHMRPlugin = (givenOptions) => [
                     server: ctx.server,
                 });
                 if (!isUseClientUpdate) {
+                    log("hmr: not a use client update, short circuiting");
                     return [];
                 }
                 invalidateModule(ctx.server, "ssr", ctx.file);
                 invalidateModule(ctx.server, environment, VIRTUAL_SSR_PREFIX +
                     normalizeModulePath(ctx.file, givenOptions.rootDir));
+                log("hmr: invalidated ssr module");
                 return [];
             }
             if (!["client", environment].includes(this.environment.name)) {
+                log(`hmr: incorrect env, skipping (env=${this.environment.name}, worker env=${environment})`);
                 return [];
             }
             const hasClientDirective = await hasDirective(ctx.file, "use client");
@@ -165,8 +170,10 @@ export const miniflareHMRPlugin = (givenOptions) => [
                     server: ctx.server,
                 });
                 if (!isUseClientUpdate && !ctx.file.endsWith(".css")) {
+                    log("hmr: not a use client update and not css, short circuiting");
                     return [];
                 }
+                log("hmr: returning client modules for hmr");
                 return ctx.modules;
             }
             // The worker needs an update, and the hot check is for the worker environment
@@ -184,8 +191,12 @@ export const miniflareHMRPlugin = (givenOptions) => [
                 if (m) {
                     invalidateModule(ctx.server, environment, m);
                 }
-                const virtualSSRModule = ctx.server.environments[environment].moduleGraph.idToModuleMap.get(VIRTUAL_SSR_PREFIX +
-                    normalizeModulePath(ctx.file, givenOptions.rootDir));
+                let virtualSSRModuleId = VIRTUAL_SSR_PREFIX +
+                    normalizeModulePath(ctx.file, givenOptions.rootDir);
+                if (ctx.file.endsWith(".css")) {
+                    virtualSSRModuleId += ".js";
+                }
+                const virtualSSRModule = ctx.server.environments[environment].moduleGraph.idToModuleMap.get(virtualSSRModuleId);
                 if (virtualSSRModule) {
                     invalidateModule(ctx.server, environment, virtualSSRModule);
                 }
@@ -196,6 +207,7 @@ export const miniflareHMRPlugin = (givenOptions) => [
                         file: ctx.file,
                     },
                 });
+                log("hmr: sent rsc update");
                 return [];
             }
         },

package/package.json

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