hadars 1.0.0 → 1.0.2

package/dist/slim-react/index.js

@@ -3,6 +3,7 @@ import {
   Component,
   PureComponent,
   Suspense,
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   cloneElement,
   createContext,
   forwardRef,
@@ -12,6 +13,7 @@ import {
   renderPreflight,
   renderToStream,
   renderToString,
+  setReactVersion,
   slim_react_default,
   startTransition,
   use,
@@ -34,7 +36,7 @@ import {
   useSyncExternalStore,
   useTransition,
   version
-} from "../chunk-2TMQUXFL.js";
+} from "../chunk-QOTDCUE5.js";
 import {
   FRAGMENT_TYPE,
   Fragment,
@@ -52,6 +54,7 @@ export {
   SLIM_ELEMENT,
   SUSPENSE_TYPE,
   Suspense,
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
   cloneElement,
   createContext,
   createElement,
@@ -67,6 +70,7 @@ export {
   renderToStream as renderToReadableStream,
   renderToStream,
   renderToString,
+  setReactVersion,
   startTransition,
   use,
   useActionState,

package/dist/ssr-render-worker.js

@@ -7,24 +7,6 @@ var SLIM_ELEMENT = Symbol.for("react.element");
 var REACT19_ELEMENT = Symbol.for("react.transitional.element");
 var FRAGMENT_TYPE = Symbol.for("react.fragment");
 var SUSPENSE_TYPE = Symbol.for("react.suspense");
-// src/slim-react/jsx.ts
-function createElement(type, props, ...children) {
-  const normalizedProps = { ...props || {} };
-  if (children.length === 1) {
-    normalizedProps.children = children[0];
-  } else if (children.length > 1) {
-    normalizedProps.children = children;
-  }
-  const key = normalizedProps.key ?? null;
-  delete normalizedProps.key;
-  return {
-    $$typeof: SLIM_ELEMENT,
-    type,
-    props: normalizedProps,
-    key
-  };
-}
-
 // src/slim-react/renderContext.ts
 var MAP_KEY = "__slimReactContextMap";
 var _g = globalThis;
@@ -49,8 +31,7 @@ function getContextValue(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;
+  return context._currentValue;
 }
 function pushContextValue(context, value) {
   let map = _g[MAP_KEY];
@@ -58,8 +39,7 @@ function pushContextValue(context, value) {
     map = new Map;
     _g[MAP_KEY] = map;
   }
-  const c = context;
-  const prev = map.has(context) ? map.get(context) : ("_defaultValue" in c) ? c._defaultValue : c._currentValue;
+  const prev = map.has(context) ? map.get(context) : context._currentValue;
   map.set(context, value);
   return prev;
 }
@@ -164,14 +144,35 @@ function getTreeId() {
   const stripped = (id & ~(1 << 31 - Math.clz32(id))).toString(32);
   return stripped + overflow;
 }
+var REACT_MAJOR = typeof __HADARS_REACT_MAJOR__ !== "undefined" ? parseInt(String(__HADARS_REACT_MAJOR__), 10) : 19;
+var REACT_VERSION = REACT_MAJOR < 19 ? "18.3.1" : "19.1.1";
 function makeId() {
   const st = s();
   const treeId = getTreeId();
   const n = st.localIdCounter++;
-  let id = "_R_" + st.idPrefix + treeId;
-  if (n > 0)
-    id += "H" + n.toString(32);
-  return id + "_";
+  const suffix = n > 0 ? "H" + n.toString(32) : "";
+  if (REACT_MAJOR < 19) {
+    return ":" + st.idPrefix + "R" + treeId + suffix + ":";
+  }
+  return "_R_" + st.idPrefix + treeId + suffix + "_";
+}
+
+// src/slim-react/jsx.ts
+function createElement(type, props, ...children) {
+  const normalizedProps = { ...props || {} };
+  if (children.length === 1) {
+    normalizedProps.children = children[0];
+  } else if (children.length > 1) {
+    normalizedProps.children = children;
+  }
+  const key = normalizedProps.key ?? null;
+  delete normalizedProps.key;
+  return {
+    $$typeof: SLIM_ELEMENT,
+    type,
+    props: normalizedProps,
+    key
+  };
 }
 
 // src/slim-react/hooks.ts
@@ -224,8 +225,24 @@ function use(usable) {
 }
 // src/slim-react/dispatcher.ts
 import * as ReactNS from "react";
-var _reactInternalsKey = "__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE";
-var _internals = ReactNS[_reactInternalsKey];
+var _r19;
+var _r18;
+var _detected = false;
+var _k19 = "__CLIENT_INTERNALS_DO_NOT_USE" + "_OR_WARN_USERS_THEY_CANNOT_UPGRADE";
+var _k18 = "__SECRET_INTERNALS_DO_NOT_USE" + "_OR_YOU_WILL_BE_FIRED";
+function _detect() {
+  if (_detected)
+    return;
+  _detected = true;
+  const r19 = ReactNS[_k19];
+  if (r19) {
+    _r19 = r19;
+    return;
+  }
+  const raw = ReactNS[_k18];
+  if (raw?.ReactCurrentDispatcher)
+    _r18 = raw;
+}
 var slimDispatcher = {
   useId: makeId,
   readContext: (ctx) => getContextValue(ctx),
@@ -251,15 +268,25 @@ var slimDispatcher = {
   useHostTransitionStatus: () => false
 };
 function installDispatcher() {
-  if (!_internals)
-    return null;
-  const prev = _internals.H;
-  _internals.H = slimDispatcher;
-  return prev;
+  _detect();
+  if (_r19) {
+    const prev = _r19.H;
+    _r19.H = slimDispatcher;
+    return prev;
+  }
+  if (_r18) {
+    const prev = _r18.ReactCurrentDispatcher.current;
+    _r18.ReactCurrentDispatcher.current = slimDispatcher;
+    return prev;
+  }
+  return null;
 }
 function restoreDispatcher(prev) {
-  if (_internals)
-    _internals.H = prev;
+  _detect();
+  if (_r19)
+    _r19.H = prev;
+  else if (_r18)
+    _r18.ReactCurrentDispatcher.current = prev;
 }
 
 // src/slim-react/render.ts
@@ -520,7 +547,7 @@ function writeAttributes(writer, props, isSvg, skip) {
     if (isSvg && key in SVG_ATTR_MAP) {
       attrName = SVG_ATTR_MAP[key];
     } else {
-      attrName = key === "className" ? "class" : key === "htmlFor" ? "for" : key === "tabIndex" ? "tabindex" : key === "defaultValue" ? "value" : key === "defaultChecked" ? "checked" : key;
+      attrName = key === "className" ? "class" : key === "htmlFor" ? "for" : key === "tabIndex" ? "tabindex" : key === "defaultValue" ? "value" : key === "defaultChecked" ? "checked" : key === "contentEditable" && REACT_MAJOR < 19 ? "contenteditable" : key;
     }
     if (value === false || value == null) {
       if (value === false && (attrName.charCodeAt(0) === 97 && attrName.startsWith("aria-") || attrName.charCodeAt(0) === 100 && attrName.startsWith("data-"))) {
@@ -731,7 +758,8 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     const LazyComp = resolved?.default ?? resolved;
     return renderComponent(LazyComp, props, writer, isSvg);
   }
-  if (typeOf === REACT_CONSUMER) {
+  const isConsumer = typeOf === REACT_CONSUMER || typeOf === REACT_CONTEXT && "_context" in type && !("value" in props);
+  if (isConsumer) {
     const ctx2 = type._context;
     const value = ctx2 ? getContextValue(ctx2) : undefined;
     const result2 = typeof props.children === "function" ? props.children(value) : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hadars",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Minimal SSR framework for React — rspack, HMR, TypeScript, Bun/Node/Deno",
   "module": "./dist/index.js",
   "type": "module",
@@ -58,8 +58,8 @@
     "node": ">=18.0.0"
   },
   "peerDependencies": {
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0",
     "typescript": "^5"
   },
   "peerDependenciesMeta": {