hadars 0.1.24 → 0.1.26

package/dist/slim-react/index.js

@@ -7,44 +7,36 @@ import {
   createElement,
   jsx
 } from "../chunk-OS3V4CPN.js";
-import {
-  __require
-} from "../chunk-EZUCZHGV.js";
 
 // src/slim-react/renderContext.ts
-var CONTEXT_STORE_KEY = "__slimReactContextStore";
+var MAP_KEY = "__slimReactContextMap";
 var _g = globalThis;
-if (!_g[CONTEXT_STORE_KEY]) {
-  try {
-    const { AsyncLocalStorage } = __require("node:async_hooks");
-    _g[CONTEXT_STORE_KEY] = new AsyncLocalStorage();
-  } catch {
-    _g[CONTEXT_STORE_KEY] = null;
-  }
+if (!("__slimReactContextMap" in _g))
+  _g[MAP_KEY] = null;
+function swapContextMap(map) {
+  const prev = _g[MAP_KEY];
+  _g[MAP_KEY] = map;
+  return prev;
 }
-var _contextStore = _g[CONTEXT_STORE_KEY];
-function runWithContextStore(fn) {
-  return _contextStore ? _contextStore.run(/* @__PURE__ */ new Map(), fn) : fn();
+function captureMap() {
+  return _g[MAP_KEY];
 }
 function getContextValue(context) {
-  const store = _contextStore?.getStore();
-  if (store && store.has(context))
-    return store.get(context);
+  const map = _g[MAP_KEY];
+  if (map && map.has(context))
+    return map.get(context);
   const c = context;
   return "_defaultValue" in c ? c._defaultValue : c._currentValue;
 }
 function pushContextValue(context, value) {
-  const store = _contextStore?.getStore();
+  const map = _g[MAP_KEY];
   const c = context;
-  const prev = store && store.has(context) ? store.get(context) : "_defaultValue" in c ? c._defaultValue : c._currentValue;
-  if (store)
-    store.set(context, value);
+  const prev = map && map.has(context) ? map.get(context) : "_defaultValue" in c ? c._defaultValue : c._currentValue;
+  map?.set(context, value);
   return prev;
 }
 function popContextValue(context, prev) {
-  const store = _contextStore?.getStore();
-  if (store)
-    store.set(context, prev);
+  _g[MAP_KEY]?.set(context, prev);
 }
 var GLOBAL_KEY = "__slimReactRenderState";
 var EMPTY = { id: 0, overflow: "", bits: 0 };
@@ -590,10 +582,18 @@ function renderComponent(type, props, writer, isSvg) {
     };
     const r2 = renderChildren(props.children, writer, isSvg);
     if (r2 && typeof r2.then === "function") {
-      return r2.then(finish2, (e) => {
-        finish2();
-        throw e;
-      });
+      const m = captureMap();
+      return r2.then(
+        () => {
+          swapContextMap(m);
+          finish2();
+        },
+        (e) => {
+          swapContextMap(m);
+          finish2();
+          throw e;
+        }
+      );
     }
     finish2();
     return;
@@ -623,26 +623,45 @@ function renderComponent(type, props, writer, isSvg) {
       popContextValue(ctx, prevCtxValue);
   };
   if (result instanceof Promise) {
+    const m = captureMap();
     return result.then((resolved) => {
+      swapContextMap(m);
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        return r2.then(finish, (e) => {
-          finish();
-          throw e;
-        });
+        const m2 = captureMap();
+        return r2.then(
+          () => {
+            swapContextMap(m2);
+            finish();
+          },
+          (e) => {
+            swapContextMap(m2);
+            finish();
+            throw e;
+          }
+        );
       }
       finish();
     }, (e) => {
+      swapContextMap(m);
       finish();
       throw e;
     });
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    return r.then(finish, (e) => {
-      finish();
-      throw e;
-    });
+    const m = captureMap();
+    return r.then(
+      () => {
+        swapContextMap(m);
+        finish();
+      },
+      (e) => {
+        swapContextMap(m);
+        finish();
+        throw e;
+      }
+    );
   }
   finish();
 }
@@ -658,7 +677,9 @@ function renderChildArray(children, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(children[i], writer, isSvg);
     if (r && typeof r.then === "function") {
+      const m = captureMap();
       return r.then(() => {
+        swapContextMap(m);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -675,7 +696,9 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(children[i], writer, isSvg);
     if (r && typeof r.then === "function") {
+      const m = captureMap();
       return r.then(() => {
+        swapContextMap(m);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -702,7 +725,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       const buffer = new BufferWriter();
       const r = renderNode(children, buffer, isSvg);
       if (r && typeof r.then === "function") {
+        const m = captureMap();
         await r;
+        swapContextMap(m);
       }
       writer.write("<!--$-->");
       buffer.flush(writer);
@@ -710,7 +735,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       return;
     } catch (error) {
       if (error && typeof error.then === "function") {
+        const m = captureMap();
         await error;
+        swapContextMap(m);
         attempts++;
       } else {
         throw error;
@@ -721,16 +748,21 @@ async function renderSuspense(props, writer, isSvg = false) {
   writer.write("<!--$?-->");
   if (fallback) {
     const r = renderNode(fallback, writer, isSvg);
-    if (r && typeof r.then === "function")
+    if (r && typeof r.then === "function") {
+      const m = captureMap();
       await r;
+      swapContextMap(m);
+    }
   }
   writer.write("<!--/$-->");
 }
 function renderToStream(element) {
   const encoder = new TextEncoder();
-  return runWithContextStore(() => new ReadableStream({
+  const contextMap = /* @__PURE__ */ new Map();
+  return new ReadableStream({
     async start(controller) {
       resetRenderState();
+      const prev = swapContextMap(contextMap);
       const writer = {
         lastWasText: false,
         write(chunk) {
@@ -744,19 +776,27 @@ function renderToStream(element) {
       };
       try {
         const r = renderNode(element, writer);
-        if (r && typeof r.then === "function")
+        if (r && typeof r.then === "function") {
+          const m = captureMap();
           await r;
+          swapContextMap(m);
+        }
         controller.close();
       } catch (error) {
         controller.error(error);
+      } finally {
+        swapContextMap(prev);
       }
     }
-  }));
+  });
 }
-function renderToString(element) {
-  return runWithContextStore(async () => {
+async function renderToString(element) {
+  const contextMap = /* @__PURE__ */ new Map();
+  const prev = swapContextMap(contextMap);
+  try {
     for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
       resetRenderState();
+      swapContextMap(contextMap);
       const chunks = [];
       const writer = {
         lastWasText: false,
@@ -771,19 +811,26 @@ function renderToString(element) {
       };
       try {
         const r = renderNode(element, writer);
-        if (r && typeof r.then === "function")
+        if (r && typeof r.then === "function") {
+          const m = captureMap();
           await r;
+          swapContextMap(m);
+        }
         return chunks.join("");
       } catch (error) {
         if (error && typeof error.then === "function") {
+          const m = captureMap();
           await error;
+          swapContextMap(m);
           continue;
         }
         throw error;
       }
     }
     throw new Error("[slim-react] renderToString exceeded maximum retries");
-  });
+  } finally {
+    swapContextMap(prev);
+  }
 }
 
 // src/slim-react/index.ts

package/dist/slim-react/jsx-runtime.js

@@ -2,7 +2,6 @@ import {
   Fragment,
   jsx
 } from "../chunk-OS3V4CPN.js";
-import "../chunk-EZUCZHGV.js";
 export {
   Fragment,
   jsx,

package/dist/ssr-render-worker.js

@@ -1,11 +1,3 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
 // src/ssr-render-worker.ts
 import { workerData, parentPort } from "node:worker_threads";
 import { pathToFileURL } from "node:url";
@@ -75,39 +67,34 @@ function createElement(type, props, ...children) {
 }
 
 // src/slim-react/renderContext.ts
-var CONTEXT_STORE_KEY = "__slimReactContextStore";
+var MAP_KEY = "__slimReactContextMap";
 var _g = globalThis;
-if (!_g[CONTEXT_STORE_KEY]) {
-  try {
-    const { AsyncLocalStorage } = __require("node:async_hooks");
-    _g[CONTEXT_STORE_KEY] = new AsyncLocalStorage();
-  } catch {
-    _g[CONTEXT_STORE_KEY] = null;
-  }
+if (!("__slimReactContextMap" in _g))
+  _g[MAP_KEY] = null;
+function swapContextMap(map) {
+  const prev = _g[MAP_KEY];
+  _g[MAP_KEY] = map;
+  return prev;
 }
-var _contextStore = _g[CONTEXT_STORE_KEY];
-function runWithContextStore(fn) {
-  return _contextStore ? _contextStore.run(/* @__PURE__ */ new Map(), fn) : fn();
+function captureMap() {
+  return _g[MAP_KEY];
 }
 function getContextValue(context) {
-  const store = _contextStore?.getStore();
-  if (store && store.has(context))
-    return store.get(context);
+  const map = _g[MAP_KEY];
+  if (map && map.has(context))
+    return map.get(context);
   const c = context;
   return "_defaultValue" in c ? c._defaultValue : c._currentValue;
 }
 function pushContextValue(context, value) {
-  const store = _contextStore?.getStore();
+  const map = _g[MAP_KEY];
   const c = context;
-  const prev = store && store.has(context) ? store.get(context) : "_defaultValue" in c ? c._defaultValue : c._currentValue;
-  if (store)
-    store.set(context, value);
+  const prev = map && map.has(context) ? map.get(context) : "_defaultValue" in c ? c._defaultValue : c._currentValue;
+  map?.set(context, value);
   return prev;
 }
 function popContextValue(context, prev) {
-  const store = _contextStore?.getStore();
-  if (store)
-    store.set(context, prev);
+  _g[MAP_KEY]?.set(context, prev);
 }
 var GLOBAL_KEY = "__slimReactRenderState";
 var EMPTY = { id: 0, overflow: "", bits: 0 };
@@ -547,10 +534,18 @@ function renderComponent(type, props, writer, isSvg) {
     };
     const r2 = renderChildren(props.children, writer, isSvg);
     if (r2 && typeof r2.then === "function") {
-      return r2.then(finish2, (e) => {
-        finish2();
-        throw e;
-      });
+      const m = captureMap();
+      return r2.then(
+        () => {
+          swapContextMap(m);
+          finish2();
+        },
+        (e) => {
+          swapContextMap(m);
+          finish2();
+          throw e;
+        }
+      );
     }
     finish2();
     return;
@@ -580,26 +575,45 @@ function renderComponent(type, props, writer, isSvg) {
       popContextValue(ctx, prevCtxValue);
   };
   if (result instanceof Promise) {
+    const m = captureMap();
     return result.then((resolved) => {
+      swapContextMap(m);
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        return r2.then(finish, (e) => {
-          finish();
-          throw e;
-        });
+        const m2 = captureMap();
+        return r2.then(
+          () => {
+            swapContextMap(m2);
+            finish();
+          },
+          (e) => {
+            swapContextMap(m2);
+            finish();
+            throw e;
+          }
+        );
       }
       finish();
     }, (e) => {
+      swapContextMap(m);
       finish();
       throw e;
     });
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    return r.then(finish, (e) => {
-      finish();
-      throw e;
-    });
+    const m = captureMap();
+    return r.then(
+      () => {
+        swapContextMap(m);
+        finish();
+      },
+      (e) => {
+        swapContextMap(m);
+        finish();
+        throw e;
+      }
+    );
   }
   finish();
 }
@@ -615,7 +629,9 @@ function renderChildArray(children, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(children[i], writer, isSvg);
     if (r && typeof r.then === "function") {
+      const m = captureMap();
       return r.then(() => {
+        swapContextMap(m);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -632,7 +648,9 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(children[i], writer, isSvg);
     if (r && typeof r.then === "function") {
+      const m = captureMap();
       return r.then(() => {
+        swapContextMap(m);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -659,7 +677,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       const buffer = new BufferWriter();
       const r = renderNode(children, buffer, isSvg);
       if (r && typeof r.then === "function") {
+        const m = captureMap();
         await r;
+        swapContextMap(m);
       }
       writer.write("<!--$-->");
       buffer.flush(writer);
@@ -667,7 +687,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       return;
     } catch (error) {
       if (error && typeof error.then === "function") {
+        const m = captureMap();
         await error;
+        swapContextMap(m);
         attempts++;
       } else {
         throw error;
@@ -678,15 +700,21 @@ async function renderSuspense(props, writer, isSvg = false) {
   writer.write("<!--$?-->");
   if (fallback) {
     const r = renderNode(fallback, writer, isSvg);
-    if (r && typeof r.then === "function")
+    if (r && typeof r.then === "function") {
+      const m = captureMap();
       await r;
+      swapContextMap(m);
+    }
   }
   writer.write("<!--/$-->");
 }
-function renderToString(element) {
-  return runWithContextStore(async () => {
+async function renderToString(element) {
+  const contextMap = /* @__PURE__ */ new Map();
+  const prev = swapContextMap(contextMap);
+  try {
     for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
       resetRenderState();
+      swapContextMap(contextMap);
       const chunks = [];
       const writer = {
         lastWasText: false,
@@ -701,19 +729,26 @@ function renderToString(element) {
       };
       try {
         const r = renderNode(element, writer);
-        if (r && typeof r.then === "function")
+        if (r && typeof r.then === "function") {
+          const m = captureMap();
           await r;
+          swapContextMap(m);
+        }
         return chunks.join("");
       } catch (error) {
         if (error && typeof error.then === "function") {
+          const m = captureMap();
           await error;
+          swapContextMap(m);
           continue;
         }
         throw error;
       }
     }
     throw new Error("[slim-react] renderToString exceeded maximum retries");
-  });
+  } finally {
+    swapContextMap(prev);
+  }
 }
 
 // src/ssr-render-worker.ts

package/dist/ssr-watch.js

@@ -171,30 +171,22 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     // Route all React imports to slim-react for SSR.
     react: slimReactIndex,
     "react/jsx-runtime": slimReactJsx,
-    "react/jsx-dev-runtime": slimReactJsx,
-    // Keep emotion on the project's node_modules (server-safe entry).
-    "@emotion/react": path.resolve(process.cwd(), "node_modules", "@emotion", "react"),
-    "@emotion/server": path.resolve(process.cwd(), "node_modules", "@emotion", "server"),
-    "@emotion/cache": path.resolve(process.cwd(), "node_modules", "@emotion", "cache"),
-    "@emotion/styled": path.resolve(process.cwd(), "node_modules", "@emotion", "styled")
+    "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;
   const externals = isServerBuild ? [
     // Node.js built-ins — must not be bundled; resolved by the runtime.
-    // Both the bare name and the node: prefix are listed because rspack
-    // may encounter either form depending on how the import is written.
-    "node:async_hooks",
-    "async_hooks",
     "node:fs",
     "node:path",
     "node:os",
     "node:stream",
     "node:util",
-    // 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",
-    "@emotion/server",
-    "@emotion/cache",
-    "@emotion/styled"
+    // @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;
   const extraPlugins = [];
   if (opts.define && typeof opts.define === "object") {
@@ -209,7 +201,10 @@ 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: isServerBuild ? ["main", "module"] : ["browser", "module", "main"]
+    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 ? {
     moduleIds: "deterministic",

package/package.json

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