hadars 0.1.22 → 0.1.23

package/dist/cli.js

@@ -872,7 +872,7 @@ var __dirname = 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");
-var getConfigBase = (mode) => {
+var getConfigBase = (mode, isServerBuild = false) => {
   const isDev = mode === "development";
   return {
     experiments: {
@@ -971,9 +971,12 @@ var getConfigBase = (mode) => {
   };
 };
 var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
-  const Config = getConfigBase(opts.mode);
   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 Config = getConfigBase(opts.mode, isServerBuild);
   const localConfig = {
     ...Config,
     module: {
@@ -1022,12 +1025,9 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
   if (opts.moduleRules && opts.moduleRules.length > 0) {
     localConfig.module.rules.push(...opts.moduleRules);
   }
-  const isServerBuild2 = Boolean(
-    opts.output && typeof opts.output === "object" && (opts.output.library || String(opts.output.filename || "").includes("ssr"))
-  );
   const slimReactIndex = pathMod.resolve(packageDir, "slim-react", "index.js");
   const slimReactJsx = pathMod.resolve(packageDir, "slim-react", "jsx-runtime.js");
-  const resolveAliases = isServerBuild2 ? {
+  const resolveAliases = isServerBuild ? {
     // Route all React imports to slim-react for SSR.
     react: slimReactIndex,
     "react/jsx-runtime": slimReactJsx,
@@ -1038,7 +1038,7 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
     "@emotion/cache": path.resolve(process.cwd(), "node_modules", "@emotion", "cache"),
     "@emotion/styled": path.resolve(process.cwd(), "node_modules", "@emotion", "styled")
   } : void 0;
-  const externals = isServerBuild2 ? [
+  const externals = isServerBuild ? [
     // react / react-dom are replaced by slim-react via alias above — not external.
     // emotion should be external on server builds to avoid client/browser code
     "@emotion/react",
@@ -1059,9 +1059,9 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
     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: isServerBuild2 ? ["main", "module"] : ["browser", "module", "main"]
+    mainFields: isServerBuild ? ["main", "module"] : ["browser", "module", "main"]
   };
-  const optimization = !isServerBuild2 && !isDev ? {
+  const optimization = !isServerBuild && !isDev ? {
     moduleIds: "deterministic",
     splitChunks: {
       chunks: "all",
@@ -1089,7 +1089,7 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
     externals,
     ...optimization !== void 0 ? { optimization } : {},
     plugins: [
-      new rspack.HtmlRspackPlugin({
+      !isServerBuild && new rspack.HtmlRspackPlugin({
         publicPath: base || "/",
         template: opts.htmlTemplate ? pathMod.resolve(process.cwd(), opts.htmlTemplate) : clientScriptPath,
         scriptLoading: "module",
@@ -1097,12 +1097,7 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
         inject: "head",
         minify: opts.mode === "production"
       }),
-      // Add `async` to the emitted module script so DOMContentLoaded fires
-      // as soon as HTML is parsed — without waiting for the bundle to execute.
-      // `<script type="module" async>` is valid: it downloads in parallel and
-      // executes without blocking DOMContentLoaded, while retaining module
-      // semantics (strict mode, ES imports, etc.).
-      {
+      !isServerBuild && {
         apply(compiler) {
           compiler.hooks.emit.tapAsync("HadarsAsyncModuleScript", (compilation, cb) => {
             const asset = compilation.assets["out.html"];
@@ -1121,8 +1116,8 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
           });
         }
       },
-      isDev && !isServerBuild2 && new ReactRefreshPlugin(),
-      includeHotPlugin && isDev && new rspack.HotModuleReplacementPlugin(),
+      isDev && !isServerBuild && new ReactRefreshPlugin(),
+      includeHotPlugin && isDev && !isServerBuild && new rspack.HotModuleReplacementPlugin(),
       ...extraPlugins
     ],
     ...localConfig,
@@ -1137,7 +1132,7 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
     // for client builds. SSR builds still need it for dynamic import() of exports.
     experiments: {
       ...localConfig.experiments || {},
-      outputModule: isServerBuild2
+      outputModule: isServerBuild
     },
     // Prevent rspack from watching its own build output — without this the
     // SSR watcher writing .hadars/index.ssr.js triggers the client compiler

package/dist/ssr-watch.js

@@ -12,7 +12,7 @@ var __dirname = 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");
-var getConfigBase = (mode) => {
+var getConfigBase = (mode, isServerBuild = false) => {
   const isDev = mode === "development";
   return {
     experiments: {
@@ -111,9 +111,12 @@ var getConfigBase = (mode) => {
   };
 };
 var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
-  const Config = getConfigBase(opts.mode);
   const { base: base2 } = 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 Config = getConfigBase(opts.mode, isServerBuild);
   const localConfig = {
     ...Config,
     module: {
@@ -162,12 +165,9 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
   if (opts.moduleRules && opts.moduleRules.length > 0) {
     localConfig.module.rules.push(...opts.moduleRules);
   }
-  const isServerBuild2 = Boolean(
-    opts.output && typeof opts.output === "object" && (opts.output.library || String(opts.output.filename || "").includes("ssr"))
-  );
   const slimReactIndex = pathMod.resolve(packageDir, "slim-react", "index.js");
   const slimReactJsx = pathMod.resolve(packageDir, "slim-react", "jsx-runtime.js");
-  const resolveAliases = isServerBuild2 ? {
+  const resolveAliases = isServerBuild ? {
     // Route all React imports to slim-react for SSR.
     react: slimReactIndex,
     "react/jsx-runtime": slimReactJsx,
@@ -178,7 +178,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     "@emotion/cache": path.resolve(process.cwd(), "node_modules", "@emotion", "cache"),
     "@emotion/styled": path.resolve(process.cwd(), "node_modules", "@emotion", "styled")
   } : void 0;
-  const externals = isServerBuild2 ? [
+  const externals = isServerBuild ? [
     // react / react-dom are replaced by slim-react via alias above — not external.
     // emotion should be external on server builds to avoid client/browser code
     "@emotion/react",
@@ -199,9 +199,9 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     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: isServerBuild2 ? ["main", "module"] : ["browser", "module", "main"]
+    mainFields: isServerBuild ? ["main", "module"] : ["browser", "module", "main"]
   };
-  const optimization = !isServerBuild2 && !isDev ? {
+  const optimization = !isServerBuild && !isDev ? {
     moduleIds: "deterministic",
     splitChunks: {
       chunks: "all",
@@ -229,7 +229,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     externals,
     ...optimization !== void 0 ? { optimization } : {},
     plugins: [
-      new rspack.HtmlRspackPlugin({
+      !isServerBuild && new rspack.HtmlRspackPlugin({
         publicPath: base2 || "/",
         template: opts.htmlTemplate ? pathMod.resolve(process.cwd(), opts.htmlTemplate) : clientScriptPath,
         scriptLoading: "module",
@@ -237,12 +237,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
         inject: "head",
         minify: opts.mode === "production"
       }),
-      // Add `async` to the emitted module script so DOMContentLoaded fires
-      // as soon as HTML is parsed — without waiting for the bundle to execute.
-      // `<script type="module" async>` is valid: it downloads in parallel and
-      // executes without blocking DOMContentLoaded, while retaining module
-      // semantics (strict mode, ES imports, etc.).
-      {
+      !isServerBuild && {
         apply(compiler) {
           compiler.hooks.emit.tapAsync("HadarsAsyncModuleScript", (compilation, cb) => {
             const asset = compilation.assets["out.html"];
@@ -261,8 +256,8 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
           });
         }
       },
-      isDev && !isServerBuild2 && new ReactRefreshPlugin(),
-      includeHotPlugin && isDev && new rspack.HotModuleReplacementPlugin(),
+      isDev && !isServerBuild && new ReactRefreshPlugin(),
+      includeHotPlugin && isDev && !isServerBuild && new rspack.HotModuleReplacementPlugin(),
       ...extraPlugins
     ],
     ...localConfig,
@@ -277,7 +272,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     // for client builds. SSR builds still need it for dynamic import() of exports.
     experiments: {
       ...localConfig.experiments || {},
-      outputModule: isServerBuild2
+      outputModule: isServerBuild
     },
     // Prevent rspack from watching its own build output — without this the
     // SSR watcher writing .hadars/index.ssr.js triggers the client compiler

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hadars",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "description": "Minimal SSR framework for React — rspack, HMR, TypeScript, Bun/Node/Deno",
   "module": "./dist/index.js",
   "type": "module",

package/src/utils/rspack.ts

@@ -18,7 +18,7 @@ const loaderPath = existsSync(pathMod.resolve(packageDir, 'loader.cjs'))
     ? pathMod.resolve(packageDir, 'loader.cjs')
     : pathMod.resolve(packageDir, 'loader.ts');
 
-const getConfigBase = (mode: "development" | "production"): Omit<Configuration, "entry" | "output" | "plugins"> => {
+const getConfigBase = (mode: "development" | "production", isServerBuild = false): Omit<Configuration, "entry" | "output" | "plugins"> => {
     const isDev = mode === 'development';
     return {
         experiments: {
@@ -141,9 +141,12 @@ const buildCompilerConfig = (
     opts: EntryOptions,
     includeHotPlugin: boolean,
 ): Configuration => {
-    const Config = getConfigBase(opts.mode);
     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 Config = getConfigBase(opts.mode, isServerBuild);
 
     // shallow-clone base config to avoid mutating shared Config while preserving RegExp and plugin instances
     const localConfig: any = {
@@ -203,15 +206,6 @@ const buildCompilerConfig = (
         localConfig.module.rules.push(...opts.moduleRules);
     }
 
-    // For server (SSR) builds we should avoid bundling react/react-dom so
-    // the runtime uses the same React instance as the host. If the output
-    // is a library/module (i.e. `opts.output.library` present or filename
-    // contains "ssr"), treat it as a server build and mark react/react-dom
-    // as externals and alias React imports to the project's node_modules.
-    const isServerBuild = Boolean(
-        (opts.output && typeof opts.output === 'object' && (opts.output.library || String(opts.output.filename || '').includes('ssr')))
-    );
-
     // slim-react: the SSR-only React-compatible renderer bundled with hadars.
     // On server builds we replace the real React with slim-react so that hooks
     // get safe SSR stubs, context works, and renderToStream / Suspense are
@@ -291,7 +285,7 @@ const buildCompilerConfig = (
         externals,
         ...(optimization !== undefined ? { optimization } : {}),
         plugins: [
-            new rspack.HtmlRspackPlugin({
+            !isServerBuild && new rspack.HtmlRspackPlugin({
                 publicPath: base || '/',
                 template: opts.htmlTemplate
                     ? pathMod.resolve(process.cwd(), opts.htmlTemplate)
@@ -301,12 +295,7 @@ const buildCompilerConfig = (
                 inject: 'head',
                 minify: opts.mode === 'production',
             }),
-            // Add `async` to the emitted module script so DOMContentLoaded fires
-            // as soon as HTML is parsed — without waiting for the bundle to execute.
-            // `<script type="module" async>` is valid: it downloads in parallel and
-            // executes without blocking DOMContentLoaded, while retaining module
-            // semantics (strict mode, ES imports, etc.).
-            {
+            !isServerBuild && {
                 apply(compiler: any) {
                     compiler.hooks.emit.tapAsync('HadarsAsyncModuleScript', (compilation: any, cb: () => void) => {
                         const asset = compilation.assets['out.html'];
@@ -327,7 +316,7 @@ const buildCompilerConfig = (
                 },
             },
             isDev && !isServerBuild && new ReactRefreshPlugin(),
-            includeHotPlugin && isDev && new rspack.HotModuleReplacementPlugin(),
+            includeHotPlugin && isDev && !isServerBuild && new rspack.HotModuleReplacementPlugin(),
             ...extraPlugins,
         ],
         ...localConfig,