hadars 0.4.1 → 0.4.2

package/dist/ssr-watch.js

@@ -8,7 +8,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import pathMod from "node:path";
 import { existsSync } from "node:fs";
-var __dirname = process.cwd();
+var __dirname2 = process.cwd();
 var packageDir = pathMod.dirname(fileURLToPath(import.meta.url));
 var clientScriptPath = pathMod.resolve(packageDir, "template.html");
 var loaderPath = existsSync(pathMod.resolve(packageDir, "loader.cjs")) ? pathMod.resolve(packageDir, "loader.cjs") : pathMod.resolve(packageDir, "loader.ts");
@@ -21,13 +21,10 @@ var getConfigBase = (mode, isServerBuild = false) => {
     },
     resolve: {
       modules: [
-        path.resolve(__dirname, "node_modules"),
-        // 'node_modules' (relative) enables the standard upward-traversal
-        // resolution so rspack can find transitive deps (e.g. webpack-dev-server)
-        // that live in a parent node_modules when running from a sub-project.
+        path.resolve(__dirname2, "node_modules"),
         "node_modules"
       ],
-      tsConfig: path.resolve(__dirname, "tsconfig.json"),
+      tsConfig: path.resolve(__dirname2, "tsconfig.json"),
       extensions: [".tsx", ".ts", ".js", ".jsx"]
     },
     module: {
@@ -49,8 +46,6 @@ var getConfigBase = (mode, isServerBuild = false) => {
           },
           exclude: [loaderPath],
           use: [
-            // Transforms loadModule('./path') based on build target.
-            // Runs before swc-loader (loaders execute right-to-left).
             {
               loader: loaderPath,
               options: { server: isServerBuild }
@@ -112,12 +107,10 @@ var getConfigBase = (mode, isServerBuild = false) => {
     }
   };
 };
-var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
-  const { base: base2 } = opts;
+var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
+  const { base } = opts;
   const isDev = opts.mode === "development";
-  const isServerBuild = Boolean(
-    opts.output && typeof opts.output === "object" && (opts.output.library || String(opts.output.filename || "").includes("ssr"))
-  );
+  const isServerBuild = Boolean(opts.output && typeof opts.output === "object" && (opts.output.library || String(opts.output.filename || "").includes("ssr")));
   const Config = getConfigBase(opts.mode, isServerBuild);
   const localConfig = {
     ...Config,
@@ -138,8 +131,8 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
       for (const rule of rules) {
         const ruleUse = rule;
         if (ruleUse.use && Array.isArray(ruleUse.use)) {
-          for (const entry3 of ruleUse.use) {
-            const useEntry = entry3;
+          for (const entry2 of ruleUse.use) {
+            const useEntry = entry2;
             if (useEntry && useEntry.loader && typeof useEntry.loader === "string" && useEntry.loader.includes("swc-loader")) {
               const options = useEntry.options || {};
               useEntry.options = options;
@@ -148,7 +141,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
               useEntry.options.jsc.experimental.runPluginFirst = true;
               const existingPlugins = Array.isArray(useEntry.options.jsc.experimental.plugins) ? useEntry.options.jsc.experimental.plugins : [];
               const incomingPlugins = Array.isArray(opts.swcPlugins) ? opts.swcPlugins : [];
-              const seen = /* @__PURE__ */ new Set();
+              const seen = new Set;
               const merged = [];
               for (const p of existingPlugins.concat(incomingPlugins)) {
                 const name = Array.isArray(p) && p.length > 0 ? String(p[0]) : String(p);
@@ -182,46 +175,39 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
   const slimReactIndex = pathMod.resolve(packageDir, "slim-react", "index.js");
   const slimReactJsx = pathMod.resolve(packageDir, "slim-react", "jsx-runtime.js");
   const resolveAliases = isServerBuild ? {
-    // Route all React imports to slim-react for SSR.
     react: slimReactIndex,
     "react/jsx-runtime": slimReactJsx,
     "react/jsx-dev-runtime": slimReactJsx
-    // @emotion/* is bundled (not external) so that its `react` imports are
-    // resolved through the alias above to slim-react. If left external,
-    // emotion loads real React from node_modules and calls
-    // ReactSharedInternals.H.useContext which requires React's dispatcher.
-  } : void 0;
+  } : undefined;
   const externals = isServerBuild ? [
-    // Node.js built-ins — must not be bundled; resolved by the runtime.
     "node:fs",
     "node:path",
     "node:os",
     "node:stream",
     "node:util",
-    // @emotion/server is only used outside component rendering (CSS extraction)
-    // and does not call React hooks, so it is safe to leave as external.
     "@emotion/server"
-  ] : void 0;
+  ] : undefined;
   const effectiveReactDev = isServerBuild ? false : opts.reactMode === "development" ? true : opts.reactMode === "production" ? false : isDev;
-  if (!isServerBuild && opts.reactMode !== void 0) {
+  if (!isServerBuild && opts.reactMode !== undefined) {
     const rules = localConfig.module?.rules ?? [];
     for (const rule of rules) {
-      if (!rule?.use || !Array.isArray(rule.use)) continue;
-      for (const entry3 of rule.use) {
-        if (entry3?.loader?.includes("swc-loader")) {
-          entry3.options = entry3.options ?? {};
-          entry3.options.jsc = entry3.options.jsc ?? {};
-          entry3.options.jsc.transform = entry3.options.jsc.transform ?? {};
-          entry3.options.jsc.transform.react = entry3.options.jsc.transform.react ?? {};
-          entry3.options.jsc.transform.react.development = effectiveReactDev;
-          entry3.options.jsc.transform.react.refresh = effectiveReactDev && isDev;
+      if (!rule?.use || !Array.isArray(rule.use))
+        continue;
+      for (const entry2 of rule.use) {
+        if (entry2?.loader?.includes("swc-loader")) {
+          entry2.options = entry2.options ?? {};
+          entry2.options.jsc = entry2.options.jsc ?? {};
+          entry2.options.jsc.transform = entry2.options.jsc.transform ?? {};
+          entry2.options.jsc.transform.react = entry2.options.jsc.transform.react ?? {};
+          entry2.options.jsc.transform.react.development = effectiveReactDev;
+          entry2.options.jsc.transform.react.refresh = effectiveReactDev && isDev;
         }
       }
     }
   }
   const extraPlugins = [];
   const defineValues = { ...opts.define ?? {} };
-  if (!isServerBuild && opts.reactMode !== void 0) {
+  if (!isServerBuild && opts.reactMode !== undefined) {
     defineValues["process.env.NODE_ENV"] = JSON.stringify(opts.reactMode);
   }
   if (Object.keys(defineValues).length > 0) {
@@ -233,10 +219,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
   const resolveConfig = {
     extensions: [".tsx", ".ts", ".js", ".jsx"],
     alias: resolveAliases,
-    // for server builds prefer the package "main"/"module" fields and avoid "browser" so we don't pick browser-specific entrypoints
     mainFields: isServerBuild ? ["main", "module"] : ["browser", "module", "main"],
-    // for server builds exclude the "browser" condition so packages with package.json
-    // "exports" conditions (e.g. @emotion/*) resolve their Node/CJS entry, not the browser build
     ...isServerBuild ? { conditionNames: ["node", "require", "default"] } : {}
   };
   const optimization = !isServerBuild && !isDev ? {
@@ -253,28 +236,21 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
       }
     },
     ...opts.optimization ?? {}
-  } : opts.optimization ? { ...opts.optimization } : void 0;
+  } : opts.optimization ? { ...opts.optimization } : undefined;
   return {
-    entry: entry2,
+    entry,
     output: {
       ...opts.output,
       clean: false
     },
     mode: opts.mode,
-    // Persist transformed modules to disk — subsequent starts only recompile
-    // changed files, making repeat dev starts significantly faster.
     cache: true,
     externals,
-    // externalsPresets.node externalises ALL Node.js built-ins (bare names
-    // and the node: prefix) for both static and dynamic imports.  This
-    // complements the explicit `externals` array: the preset handles the
-    // node: URI scheme that rspack cannot resolve as a file, while the
-    // array keeps '@emotion/server' as an explicit external.
     ...isServerBuild ? { externalsPresets: { node: true } } : {},
-    ...optimization !== void 0 ? { optimization } : {},
+    ...optimization !== undefined ? { optimization } : {},
     plugins: [
       !isServerBuild && new rspack.HtmlRspackPlugin({
-        publicPath: base2 || "/",
+        publicPath: base || "/",
         template: opts.htmlTemplate ? pathMod.resolve(process.cwd(), opts.htmlTemplate) : clientScriptPath,
         scriptLoading: "module",
         filename: "out.html",
@@ -287,10 +263,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
             const asset = compilation.assets["out.html"];
             if (asset) {
               const html = asset.source();
-              const updated = html.replace(
-                /(<script\b[^>]*\btype="module"[^>]*)(>)/g,
-                (match, before, end) => before.includes("async") ? match : `${before} async${end}`
-              );
+              const updated = html.replace(/(<script\b[^>]*\btype="module"[^>]*)(>)/g, (match, before, end) => before.includes("async") ? match : `${before} async${end}`);
               compilation.assets["out.html"] = {
                 source: () => updated,
                 size: () => Buffer.byteLength(updated)
@@ -300,35 +273,27 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
           });
         }
       },
-      isDev && !isServerBuild && new ReactRefreshPlugin(),
-      includeHotPlugin && isDev && !isServerBuild && new rspack.HotModuleReplacementPlugin(),
+      isDev && !isServerBuild && new ReactRefreshPlugin,
+      includeHotPlugin && isDev && !isServerBuild && new rspack.HotModuleReplacementPlugin,
       ...extraPlugins,
       ...opts.plugins ?? []
     ],
     ...localConfig,
-    // Merge base resolve (modules, tsConfig, extensions) with per-build resolve
-    // (alias, mainFields). The spread order matters: resolveConfig wins for keys
-    // it defines, localConfig.resolve wins for keys it defines exclusively.
     resolve: {
       ...localConfig.resolve,
       ...resolveConfig
     },
-    // HMR is not implemented for module chunk format, so disable outputModule
-    // for client builds. SSR builds still need it for dynamic import() of exports.
     experiments: {
       ...localConfig.experiments || {},
       outputModule: isServerBuild
     },
-    // Prevent rspack from watching its own build output — without this the
-    // SSR watcher writing .hadars/index.ssr.js triggers the client compiler
-    // and vice versa, causing an infinite rebuild loop.
     watchOptions: {
       ignored: ["**/node_modules/**", "**/.hadars/**", "/tmp/**"]
     }
   };
 };
-var compileEntry = async (entry2, opts) => {
-  const compiler = rspack(buildCompilerConfig(entry2, opts, true));
+var compileEntry = async (entry, opts) => {
+  const compiler = rspack(buildCompilerConfig(entry, opts, true));
   if (opts.watch) {
     await new Promise((resolve, reject) => {
       let first = true;
@@ -376,9 +341,11 @@ var compileEntry = async (entry2, opts) => {
 var args = process.argv.slice(2);
 var argv = {};
 for (const a of args) {
-  if (!a.startsWith("--")) continue;
+  if (!a.startsWith("--"))
+    continue;
   const idx = a.indexOf("=");
-  if (idx === -1) continue;
+  if (idx === -1)
+    continue;
   const key = a.slice(2, idx);
   const val = a.slice(idx + 1);
   argv[key] = val;
@@ -387,9 +354,9 @@ var entry = argv["entry"];
 var outDir = argv["outDir"] || ".hadars";
 var outFile = argv["outFile"] || "index.ssr.js";
 var base = argv["base"] || "";
-var swcPlugins = argv["swcPlugins"] ? JSON.parse(argv["swcPlugins"]) : void 0;
-var define = argv["define"] ? JSON.parse(argv["define"]) : void 0;
-var moduleRules = argv["moduleRules"] ? JSON.parse(argv["moduleRules"], (_k, v) => v && typeof v === "object" && "__re" in v ? new RegExp(v.__re, v.__flags) : v) : void 0;
+var swcPlugins = argv["swcPlugins"] ? JSON.parse(argv["swcPlugins"]) : undefined;
+var define = argv["define"] ? JSON.parse(argv["define"]) : undefined;
+var moduleRules = argv["moduleRules"] ? JSON.parse(argv["moduleRules"], (_k, v) => v && typeof v === "object" && ("__re" in v) ? new RegExp(v.__re, v.__flags) : v) : undefined;
 if (!entry) {
   console.error("ssr-watch: missing --entry argument");
   process.exit(1);
@@ -417,8 +384,7 @@ if (!entry) {
       }
     });
     console.log("ssr-watch: initial-build-complete");
-    await new Promise(() => {
-    });
+    await new Promise(() => {});
   } catch (err) {
     console.error("ssr-watch: error", err);
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hadars",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Minimal SSR framework for React — rspack, HMR, TypeScript, Bun/Node/Deno",
   "module": "./dist/index.js",
   "type": "module",
@@ -11,10 +11,6 @@
   "types": "dist/index.d.ts",
   "files": [
     "dist",
-    "src",
-    "cli-lib.ts",
-    "cli.ts",
-    "index.ts",
     "LICENSE"
   ],
   "exports": {
@@ -40,7 +36,7 @@
   },
   "scripts": {
     "build:lib": "tsup src/index.tsx src/lambda.ts src/cloudflare.ts src/slim-react/index.ts src/slim-react/jsx-runtime.ts --format esm,cjs --dts --out-dir dist --clean --external '@rspack/*' --external '@rspack/binding'",
-    "build:cli": "node build-scripts/build-cli.mjs",
+    "build:cli": "bun build-scripts/build-cli.mjs",
     "build:all": "node build-scripts/build-all.mjs",
     "test": "bun test test/render-compare.test.tsx && bun test test/ssr.test.ts",
     "prepare": "npm run build:all",
@@ -75,7 +71,8 @@
     "@rspack/core": "1.6.8",
     "@rspack/dev-server": "^1.2.1",
     "@rspack/plugin-react-refresh": "^1.6.1",
-    "@swc/core": "^1.15.18",
+    "@svgr/webpack": "^8.1.0",
+    "@swc/core": "^1.15.24",
     "@types/bun": "latest",
     "react-refresh": "^0.17.0"
   },
@@ -84,16 +81,17 @@
     "@types/react-dom": "^19.2.3",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
-    "tsup": "^8.3.5",
+    "tsup": "^8.5.1",
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@svgr/webpack": "^8.1.0",
-    "esbuild": "^0.27.4",
     "postcss": "^8.5.8",
     "postcss-load-config": "^6.0.1",
     "postcss-loader": "^8.2.1"
   },
+  "overrides": {
+    "js-yaml": "^4.1.1"
+  },
   "license": "MIT",
   "repository": {
     "type": "git",