@rainfw/core 0.2.7 → 0.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainfw/core",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "A TypeScript web framework for Cloudflare Workers",
   "bin": {
     "rainjs": "./cli/index.js"

package/scripts/dev.js

@@ -1,7 +1,12 @@
 const fs = require("node:fs");
 const path = require("node:path");
 const { spawn } = require("node:child_process");
-const { generate, regenerateClient, ROUTES_DIR } = require("./generate");
+const {
+  generate,
+  regenerateClient,
+  copyPublicToStatic,
+  ROUTES_DIR,
+} = require("./generate");
 const { printBanner } = require("../cli/utils/banner");
 
 const SRC_DIR = path.join(process.cwd(), "src");
@@ -72,6 +77,30 @@ try {
 }
 console.log("[watch] Watching src/ for client component changes...");
 
+const PUBLIC_DIR = path.join(process.cwd(), "public");
+let publicDebounceTimer = null;
+try {
+  if (fs.existsSync(PUBLIC_DIR)) {
+    const publicWatcher = fs.watch(
+      PUBLIC_DIR,
+      { recursive: true },
+      (_eventType, filename) => {
+        clearTimeout(publicDebounceTimer);
+        publicDebounceTimer = setTimeout(() => {
+          console.log(`[watch:public] ${filename}`);
+          copyPublicToStatic();
+        }, 100);
+      },
+    );
+    publicWatcher.on("error", () => {
+      console.error("[Rain] Warning: Public file watcher error.");
+    });
+  }
+} catch (_publicWatchError) {
+  console.error("[Rain] Warning: Failed to start public file watcher.");
+}
+console.log("[watch] Watching public/ for static asset changes...");
+
 const wrangler = spawn("npx", ["wrangler", "dev"], {
   stdio: "inherit",
   shell: true,

package/scripts/generate.js

@@ -286,6 +286,28 @@ function buildClientEsbuildAliases(fwPkg) {
   return {};
 }
 
+function copyDirSync(src, dest) {
+  if (!fs.existsSync(dest)) {
+    fs.mkdirSync(dest, { recursive: true });
+  }
+  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyDirSync(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+function copyPublicToStatic() {
+  const publicDir = path.join(PROJECT_ROOT, "public");
+  const staticDir = path.join(PROJECT_ROOT, BUILD_CONFIG.outDir, "static");
+  if (!fs.existsSync(publicDir)) return;
+  copyDirSync(publicDir, staticDir);
+}
+
 function bundleClientFilesSync(clientFiles, srcDir, fwPkg) {
   if (clientFiles.length === 0) return [];
   if (!esbuild) {
@@ -297,7 +319,8 @@ function bundleClientFilesSync(clientFiles, srcDir, fwPkg) {
     return [];
   }
 
-  const outDir = path.join(PROJECT_ROOT, "public", "_rain");
+  const staticDir = path.join(PROJECT_ROOT, BUILD_CONFIG.outDir, "static");
+  const outDir = path.join(staticDir, "_rain");
   if (!fs.existsSync(outDir)) {
     fs.mkdirSync(outDir, { recursive: true });
   }
@@ -334,11 +357,10 @@ function bundleClientFilesSync(clientFiles, srcDir, fwPkg) {
     loader: { ".ts": "ts", ".tsx": "tsx" },
   });
 
-  const publicDir = path.join(PROJECT_ROOT, "public");
   const scripts = [];
   for (const [outPath, meta] of Object.entries(result.metafile.outputs)) {
     if (meta.entryPoint) {
-      const relPath = path.relative(publicDir, outPath);
+      const relPath = path.relative(staticDir, outPath);
       scripts.push(`/${relPath.replace(/\\/g, "/")}`);
     }
   }
@@ -1129,6 +1151,7 @@ function generate() {
   const clientFiles = getClientFiles(srcDir);
   const hasConfig = fs.existsSync(CONFIG_FILE);
   const fwPkg = BUILD_CONFIG.frameworkPackage;
+  copyPublicToStatic();
   const clientScripts = bundleClientFilesSync(clientFiles, srcDir, fwPkg);
   const frameworkImport =
     fwPkg.startsWith(".") || fwPkg.startsWith("/")
@@ -1200,6 +1223,7 @@ module.exports = {
   clientFileToIslandId,
   bundleClientFilesSync,
   generateClientEntrySource,
+  copyPublicToStatic,
   validateNoPageRouteColocation,
   validateNoDuplicateUrls,
   stripRouteGroupSegments,