rwsdk 0.1.7-test.20250702145135 → 0.1.8-test.20250702232536

package/bin/rwsync

@@ -1,2 +1,12 @@
 #!/bin/sh
-DIR=$PWD && (cd "${@:-$SDK_REPO}/sdk" && pnpm debug:sync $DIR)
+set -e
+
+# This script is a lightweight wrapper that passes all arguments to the underlying
+# debug:sync Node.js script.
+# The RWSDK_REPO env var should point to the root of the sdk repo.
+
+# Capture the current directory *before* changing it
+TARGET_DIR=$PWD
+
+cd "${RWSDK_REPO}/sdk"
+pnpm debug:sync "$TARGET_DIR" "$@"

package/dist/scripts/debug-sync.d.mts

@@ -1,8 +1,6 @@
 export interface DebugSyncOptions {
     targetDir: string;
     sdkDir?: string;
-    dev?: boolean;
-    watch?: boolean;
-    build?: boolean;
+    watch?: string | boolean;
 }
 export declare const debugSync: (opts: DebugSyncOptions) => Promise<void>;

package/dist/scripts/debug-sync.mjs

@@ -1,8 +1,9 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { $ } from "../lib/$.mjs";
+import { $ } from "execa";
 import fs from "node:fs/promises";
 import { existsSync } from "node:fs";
+import chokidar from "chokidar";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const getPackageManagerInfo = (targetDir) => {
     if (existsSync(path.join(targetDir, "yarn.lock"))) {
@@ -13,14 +14,16 @@ const getPackageManagerInfo = (targetDir) => {
     }
     return { name: "npm", lockFile: "package-lock.json", command: "install" };
 };
-const performSync = async (sdkDir, targetDir) => {
-    console.log("🏗️  rebuilding sdk...");
-    await $({ cwd: sdkDir, stdio: "inherit", shell: true }) `pnpm build`;
-    console.log("📦 packing sdk...");
-    const packResult = await $({ cwd: sdkDir, shell: true }) `npm pack`;
+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}...`);
+    console.log(`💿 Installing ${tarballName} in ${targetDir}...`);
     const pm = getPackageManagerInfo(targetDir);
     const packageJsonPath = path.join(targetDir, "package.json");
     const lockfilePath = path.join(targetDir, pm.lockFile);
@@ -35,11 +38,7 @@ const performSync = async (sdkDir, targetDir) => {
         if (pm.name === "yarn") {
             installCommand = `yarn add file:${tarballPath}`;
         }
-        await $({
-            cwd: targetDir,
-            stdio: "inherit",
-            shell: true,
-        }) `${installCommand}`;
+        await $ `${installCommand}`;
     }
     finally {
         if (originalPackageJson) {
@@ -54,66 +53,113 @@ const performSync = async (sdkDir, targetDir) => {
             // ignore if deletion fails
         });
     }
-    console.log("✅ done syncing");
+};
+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 });
+        }
+    }
+    // Always copy package.json
+    await fs.copyFile(path.join(sdkDir, "package.json"), path.join(targetDir, "node_modules/rwsdk/package.json"));
+};
+const performSync = async (sdkDir, targetDir) => {
+    console.log("🏗️  Rebuilding SDK...");
+    await $ `pnpm build`;
+    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");
+        if (sdkPackageJsonContent === installedSdkPackageJsonContent) {
+            packageJsonChanged = false;
+        }
+    }
+    if (packageJsonChanged) {
+        console.log("📦 package.json changed, performing full sync...");
+        await performFullSync(sdkDir, targetDir);
+    }
+    else {
+        await performFastSync(sdkDir, targetDir);
+    }
+    console.log("✅ Done syncing");
 };
 export const debugSync = async (opts) => {
-    const { targetDir, sdkDir = process.cwd(), dev, watch, build } = opts;
+    const { targetDir, sdkDir = process.cwd(), watch } = opts;
     if (!targetDir) {
         console.error("❌ Please provide a target directory as an argument.");
         process.exit(1);
     }
-    const thisScriptPath = fileURLToPath(import.meta.url);
-    const syncCommand = `tsx ${thisScriptPath} --_sync ${sdkDir} ${targetDir}`;
-    // Run initial sync
+    // Initial sync
     await performSync(sdkDir, targetDir);
-    if (!process.env.NO_CLEAN_VITE) {
-        console.log("🧹 Cleaning Vite cache...");
-        await $({
-            stdio: "inherit",
-            shell: true,
-            cwd: targetDir,
-        }) `rm -rf ${targetDir}/node_modules/.vite*`;
-    }
-    // If dev flag is present, clean vite cache and start dev server
-    if (dev) {
-        console.log("🚀 Starting dev server...");
-        await $({ stdio: "inherit", shell: true, cwd: targetDir }) `npm run dev`;
-    }
-    // Start watching if watch flag is present
-    else if (watch) {
+    if (watch) {
+        const sdkPackageJson = JSON.parse(await fs.readFile(path.join(sdkDir, "package.json"), "utf-8"));
+        const filesToWatch = (sdkPackageJson.files || []).map((p) => path.join(sdkDir, p));
+        filesToWatch.push(path.join(sdkDir, "package.json"));
         console.log("👀 Watching for changes...");
-        $({
-            stdio: "inherit",
-            shell: true,
-        }) `npx chokidar-cli './src/**' './package.json' -c "${syncCommand}"`;
-    }
-    else if (build) {
-        console.log("🏗️ Running build in target directory...");
-        await $({
-            stdio: "inherit",
-            shell: true,
-            cwd: targetDir,
-        }) `npm run build`;
+        let childProc = null;
+        const runWatchedCommand = () => {
+            if (typeof watch === "string") {
+                console.log(`\n> ${watch}\n`);
+                childProc = $({
+                    stdio: "inherit",
+                    shell: true,
+                    cwd: targetDir,
+                    reject: false,
+                }) `${watch}`;
+            }
+        };
+        const watcher = chokidar.watch(filesToWatch, {
+            ignoreInitial: true,
+            cwd: sdkDir,
+        });
+        watcher.on("all", async () => {
+            console.log("\n Detected change, re-syncing...");
+            if (childProc && !childProc.killed) {
+                console.log("Stopping running process...");
+                childProc.kill();
+                await childProc.catch(() => {
+                    /* ignore kill errors */
+                });
+            }
+            await performSync(sdkDir, targetDir);
+            runWatchedCommand();
+        });
+        const cleanup = () => {
+            if (childProc && !childProc.killed) {
+                childProc.kill();
+            }
+        };
+        process.on("SIGINT", cleanup);
+        process.on("SIGTERM", cleanup);
+        runWatchedCommand();
     }
 };
 if (import.meta.url === new URL(process.argv[1], import.meta.url).href) {
     const args = process.argv.slice(2);
-    const flags = new Set(args.filter((arg) => arg.startsWith("--")));
-    const positionalArgs = args.filter((arg) => !arg.startsWith("--"));
-    if (flags.has("--_sync")) {
-        const [sdkDir, targetDir] = positionalArgs;
-        await performSync(sdkDir, targetDir);
-    }
-    else {
-        const targetDir = positionalArgs[0] ?? process.cwd();
-        debugSync({
-            targetDir,
-            sdkDir: process.env.SDK_REPO
-                ? path.resolve(__dirname, process.env.SDK_REPO, "sdk")
-                : path.resolve(__dirname, "..", ".."),
-            dev: flags.has("--dev"),
-            watch: flags.has("--watch"),
-            build: flags.has("--build"),
-        });
+    const watchFlagIndex = args.indexOf("--watch");
+    let watchCmd = watchFlagIndex !== -1;
+    let cmdArgs = args;
+    if (watchFlagIndex !== -1) {
+        if (watchFlagIndex + 1 < args.length &&
+            !args[watchFlagIndex + 1].startsWith("--")) {
+            watchCmd = args[watchFlagIndex + 1];
+        }
+        // remove --watch and its potential command from args
+        const watchArgCount = typeof watchCmd === "string" ? 2 : 1;
+        cmdArgs = args.filter((_, i) => i < watchFlagIndex || i >= watchFlagIndex + watchArgCount);
     }
+    const targetDir = cmdArgs[0] ?? process.cwd();
+    const sdkDir = path.resolve(__dirname, "..", "..");
+    debugSync({
+        targetDir,
+        sdkDir,
+        watch: watchCmd,
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "0.1.7-test.20250702145135",
+  "version": "0.1.8-test.20250702232536",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {
@@ -120,6 +120,7 @@
     "@types/react-dom": "^19.1.2",
     "@types/react-is": "^19.0.0",
     "@vitejs/plugin-react": "^4.3.4",
+    "chokidar": "^3.6.0",
     "debug": "^4.4.0",
     "enhanced-resolve": "^5.18.1",
     "eventsource-parser": "^3.0.0",