@absolutejs/absolute 0.18.3-beta.9 → 0.18.4

package/dist/index.js

@@ -173552,18 +173552,21 @@ __export(exports_devBuild, {
 import { readdir as readdir2 } from "fs/promises";
 import { statSync } from "fs";
 import { resolve as resolve20 } from "path";
-var FRAMEWORK_DIR_KEYS, reloadConfig = async () => {
+var FRAMEWORK_DIR_KEYS, parseDirectoryConfig = (source) => {
+  const config = {};
+  const dirPattern = /(\w+Directory)\s*:\s*['"]([^'"]+)['"]/g;
+  let match;
+  while ((match = dirPattern.exec(source)) !== null) {
+    const [, key, value] = match;
+    if (key && value)
+      Object.assign(config, { [key]: value });
+  }
+  return Object.keys(config).length > 0 ? config : null;
+}, reloadConfig = async () => {
   try {
     const configPath2 = resolve20(process.env.ABSOLUTE_CONFIG ?? "absolute.config.ts");
     const source = await Bun.file(configPath2).text();
-    const config = {};
-    const dirPattern = /(\w+Directory)\s*:\s*['"]([^'"]+)['"]/g;
-    let match;
-    while ((match = dirPattern.exec(source)) !== null) {
-      const [, key, value] = match;
-      config[key] = value;
-    }
-    return Object.keys(config).length > 0 ? config : null;
+    return parseDirectoryConfig(source);
   } catch {
     return null;
   }
@@ -173573,13 +173576,7 @@ var FRAMEWORK_DIR_KEYS, reloadConfig = async () => {
     return;
   const state = cached.hmrState;
   const oldConfig = state.config;
-  let hasChanges = false;
-  for (const key of FRAMEWORK_DIR_KEYS) {
-    if (newConfig[key] !== oldConfig[key]) {
-      hasChanges = true;
-      break;
-    }
-  }
+  const hasChanges = FRAMEWORK_DIR_KEYS.some((key) => newConfig[key] !== oldConfig[key]);
   if (!hasChanges)
     return;
   const oldWatchPaths = new Set(getWatchPaths(oldConfig, state.resolvedPaths));
@@ -173594,7 +173591,7 @@ var FRAMEWORK_DIR_KEYS, reloadConfig = async () => {
     setAngularVendorPaths(computeAngularVendorPaths());
   }
   const newWatchPaths = getWatchPaths(state.config, state.resolvedPaths);
-  const addedPaths = newWatchPaths.filter((p) => !oldWatchPaths.has(p));
+  const addedPaths = newWatchPaths.filter((path) => !oldWatchPaths.has(path));
   if (addedPaths.length > 0) {
     buildInitialDependencyGraph(state.dependencyGraph, addedPaths);
     addFileWatchers(state, addedPaths, (filePath) => {
@@ -173604,11 +173601,18 @@ var FRAMEWORK_DIR_KEYS, reloadConfig = async () => {
       });
     });
   }
-}, rebuildManifest = async (cached) => {
-  const state = cached.hmrState;
+}, removeStaleKeys = (target, source) => {
+  for (const key of Object.keys(target)) {
+    if (!(key in source))
+      delete target[key];
+  }
+}, REBUILD_POLL_MS = 10, waitForRebuild = async (state) => {
   while (state.isRebuilding) {
-    await Bun.sleep(10);
+    await Bun.sleep(REBUILD_POLL_MS);
   }
+}, rebuildManifest = async (cached) => {
+  const state = cached.hmrState;
+  await waitForRebuild(state);
   state.isRebuilding = true;
   try {
     const newManifest = await build2({
@@ -173620,19 +173624,15 @@ var FRAMEWORK_DIR_KEYS, reloadConfig = async () => {
         throwOnError: true
       }
     });
-    if (newManifest) {
-      for (const key of Object.keys(cached.manifest)) {
-        if (!(key in newManifest)) {
-          delete cached.manifest[key];
-        }
-      }
-      Object.assign(cached.manifest, newManifest);
-      state.manifest = cached.manifest;
-      await populateAssetStore(state.assetStore, cached.manifest, state.resolvedPaths.buildDir);
-      await cleanStaleAssets(state.assetStore, cached.manifest, state.resolvedPaths.buildDir);
-    }
-    state.rebuildCount++;
+    if (!newManifest)
+      return;
+    removeStaleKeys(cached.manifest, newManifest);
+    Object.assign(cached.manifest, newManifest);
+    state.manifest = cached.manifest;
+    await populateAssetStore(state.assetStore, cached.manifest, state.resolvedPaths.buildDir);
+    await cleanStaleAssets(state.assetStore, cached.manifest, state.resolvedPaths.buildDir);
   } catch {} finally {
+    state.rebuildCount++;
     state.isRebuilding = false;
     state.fileChangeQueue.clear();
   }
@@ -173647,15 +173647,15 @@ var FRAMEWORK_DIR_KEYS, reloadConfig = async () => {
   if (cached?.hmrState.config.angularDirectory) {
     setAngularVendorPaths(computeAngularVendorPaths());
   }
-  if (serverMtime !== lastMtime) {
-    logServerReload();
-    if (cached) {
-      await detectConfigChanges(cached);
-      await rebuildManifest(cached);
-    }
-  } else {
+  if (serverMtime === lastMtime) {
     globalThis.__hmrSkipServerRestart = true;
+    return;
   }
+  logServerReload();
+  if (!cached)
+    return;
+  await detectConfigChanges(cached);
+  await rebuildManifest(cached);
 }, tryReadPackageVersion = async (path) => {
   const pkg = await Bun.file(path).json().catch(() => null);
   if (!pkg || pkg.name !== "@absolutejs/absolute") {
@@ -173716,9 +173716,9 @@ var FRAMEWORK_DIR_KEYS, reloadConfig = async () => {
     await buildReactVendor(state.resolvedPaths.buildDir);
     const vendorDir = resolve20(state.resolvedPaths.buildDir, "react", "vendor");
     await loadVendorFiles(state.assetStore, vendorDir, "react");
-    if (!globalThis.__reactModuleRef) {
-      globalThis.__reactModuleRef = await import("react");
-    }
+  }
+  if (config.reactDirectory && !globalThis.__reactModuleRef) {
+    globalThis.__reactModuleRef = await import("react");
   }
   if (config.angularDirectory) {
     await buildAngularVendor(state.resolvedPaths.buildDir);
@@ -173763,6 +173763,45 @@ var init_devBuild = __esm(() => {
   ];
 });
 
+// src/react/bridgeInternals.ts
+var INTERNALS_KEYS, isRecord = (val) => typeof val === "object" && val !== null, findInternals = (mod) => {
+  for (const key of INTERNALS_KEYS) {
+    const val = mod[key];
+    if (isRecord(val))
+      return val;
+  }
+  return;
+}, bridgeReactInternals = async () => {
+  const pinned = globalThis.__reactModuleRef;
+  if (!pinned)
+    return;
+  const react = await import("react");
+  if (pinned === react)
+    return;
+  const pinnedInternals = findInternals(pinned);
+  const currentInternals = findInternals(react);
+  if (!pinnedInternals || !currentInternals || pinnedInternals === currentInternals)
+    return;
+  for (const prop of Object.keys(pinnedInternals)) {
+    Object.defineProperty(currentInternals, prop, {
+      configurable: true,
+      enumerable: true,
+      get() {
+        return pinnedInternals[prop];
+      },
+      set(value) {
+        pinnedInternals[prop] = value;
+      }
+    });
+  }
+};
+var init_bridgeInternals = __esm(() => {
+  INTERNALS_KEYS = [
+    "__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE",
+    "__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED"
+  ];
+});
+
 // src/plugins/hmr.ts
 var exports_hmr = {};
 __export(exports_hmr, {
@@ -173781,7 +173820,10 @@ var STORE_KEY = "__elysiaStore", getGlobalValue = (key) => Reflect.get(globalThi
   Reflect.set(globalThis, STORE_KEY, app.store);
 }, hmr = (hmrState2, manifest) => (app) => {
   restoreStore(app);
-  return app.onBeforeHandle(({ request }) => {
+  return app.onBeforeHandle(async ({ request }) => {
+    if (globalThis.__reactModuleRef) {
+      await bridgeReactInternals();
+    }
     const rawUrl = request.url;
     const qIdx = rawUrl.indexOf("?");
     const pathEnd = qIdx === UNFOUND_INDEX ? rawUrl.length : qIdx;
@@ -173813,6 +173855,7 @@ var STORE_KEY = "__elysiaStore", getGlobalValue = (key) => Reflect.get(globalThi
 var init_hmr = __esm(() => {
   init_constants();
   init_assetStore();
+  init_bridgeInternals();
   init_webSocket();
 });
 // types/client.ts
@@ -173890,41 +173933,16 @@ body{min-height:100vh;background:linear-gradient(135deg,rgba(15,23,42,0.98) 0%,r
 };
 
 // src/react/pageHandler.ts
-var ensureReactConsistency = (react) => {
-  const pinned = globalThis.__reactModuleRef;
-  if (!pinned || pinned === react)
-    return;
-  const KEY = "__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED";
-  const pinnedInternals = pinned[KEY];
-  const currentInternals = react[KEY];
-  if (!pinnedInternals || !currentInternals || pinnedInternals === currentInternals)
-    return;
-  for (const prop of Object.keys(pinnedInternals)) {
-    Object.defineProperty(currentInternals, prop, {
-      get() {
-        return pinnedInternals[prop];
-      },
-      set(v) {
-        pinnedInternals[prop] = v;
-      },
-      configurable: true,
-      enumerable: true
-    });
-  }
-};
 var handleReactPageRequest = async (PageComponent, index, ...props) => {
   try {
     const [maybeProps] = props;
-    const react = await import("react");
-    ensureReactConsistency(react);
-    const { createElement } = react;
+    const { createElement } = await import("react");
     const { renderToReadableStream } = await import("react-dom/server");
     const element = maybeProps !== undefined ? createElement(PageComponent, maybeProps) : createElement(PageComponent);
-    const refreshStubs = "window.$RefreshReg$=function(){};window.$RefreshSig$=function(){return function(t){return t}};";
     const propsScript = maybeProps ? `window.__INITIAL_PROPS__=${JSON.stringify(maybeProps)}` : "";
     const stream = await renderToReadableStream(element, {
       bootstrapModules: [index],
-      bootstrapScriptContent: refreshStubs + propsScript || undefined,
+      bootstrapScriptContent: propsScript || undefined,
       onError(error) {
         console.error("[SSR] React streaming error:", error);
       }
@@ -174219,5 +174237,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=ED32E2EDE9B6F56B64756E2164756E21
+//# debugId=9D6F07D79897397964756E2164756E21
 //# sourceMappingURL=index.js.map