@absolutejs/absolute 0.19.0-beta.98 → 0.19.0-beta.99

package/dist/dev/client/handlers/react.ts

@@ -67,16 +67,7 @@ const applyRefreshImport = (
 	const clientStart = performance.now();
 	import(`${moduleUrl}?t=${Date.now()}`)
 		.then(() => {
-			const result = refreshRuntime.performReactRefresh();
-
-			// If no components were refreshed (data file HMR), force a
-			// re-render. The mutable store (globalThis.__HMR_DATA__) has
-			// fresh values — components just need to re-execute their
-			// render functions to read them.
-			if (!result) {
-				forceReactRerender();
-			}
-
+			refreshRuntime.performReactRefresh();
 			sendTiming(clientStart, serverDuration);
 
 			return undefined;
@@ -90,18 +81,6 @@ const applyRefreshImport = (
 		});
 };
 
-// Force React to re-render the entire tree. Components read from
-// the mutable HMR data store (destructured at render time via
-// rewriteDataImports), so re-rendering picks up fresh values.
-const forceReactRerender = () => {
-	const boundary = window.__ERROR_BOUNDARY__ as
-		| { hmrUpdate?: () => void }
-		| undefined;
-	if (boundary?.hmrUpdate) {
-		boundary.hmrUpdate();
-	}
-};
-
 const reloadReactCSS = (cssPath: string) => {
 	const existingCSSLinks = document.head.querySelectorAll<HTMLLinkElement>(
 		'link[rel="stylesheet"]'

package/dist/index.js

@@ -278,9 +278,6 @@ var indexContentCache, resolveDevClientDir = () => {
       `	reset() {`,
       `		this.setState({ hasError: false });`,
       `	}`,
-      `	hmrUpdate() {`,
-      `		this.forceUpdate();`,
-      `	}`,
       `	render() {`,
       `		if (this.state.hasError) return null;`,
       ``,
@@ -202325,6 +202322,15 @@ var init_pageHandler = __esm(() => {
 });
 
 // src/dev/transformCache.ts
+var exports_transformCache = {};
+__export(exports_transformCache, {
+  setTransformed: () => setTransformed,
+  invalidateAll: () => invalidateAll,
+  invalidate: () => invalidate,
+  getTransformed: () => getTransformed,
+  getInvalidationVersion: () => getInvalidationVersion,
+  findNearestComponent: () => findNearestComponent
+});
 var globalStore, cache, importers, getTransformed = (filePath) => cache.get(filePath)?.content, setTransformed = (filePath, content, mtime, imports) => {
   const resolvedImports = imports ?? [];
   cache.set(filePath, { content, imports: resolvedImports, mtime });
@@ -202343,9 +202349,29 @@ var globalStore, cache, importers, getTransformed = (filePath) => cache.get(file
       cache.delete(parent);
     }
   }
-}, dataFiles, markAsDataFile = (filePath) => {
-  dataFiles.add(filePath);
-}, isDataFile = (filePath) => dataFiles.has(filePath);
+}, invalidateAll = () => {
+  cache.clear();
+  importers.clear();
+}, findNearestComponent = (filePath) => {
+  const visited = new Set;
+  const queue = [filePath];
+  while (queue.length > 0) {
+    const current = queue.shift();
+    if (visited.has(current))
+      continue;
+    visited.add(current);
+    const parents = importers.get(current);
+    if (!parents)
+      continue;
+    for (const parent of parents) {
+      if (parent.endsWith(".tsx") || parent.endsWith(".jsx")) {
+        return parent;
+      }
+      queue.push(parent);
+    }
+  }
+  return;
+};
 var init_transformCache = __esm(() => {
   globalStore = globalThis;
   cache = globalStore.__transformCache ?? new Map;
@@ -202354,8 +202380,6 @@ var init_transformCache = __esm(() => {
   globalStore.__transformImporters = importers;
   invalidationVersions = globalStore.__transformInvalidationVersions ?? new Map;
   globalStore.__transformInvalidationVersions = invalidationVersions;
-  dataFiles = globalStore.__transformDataFiles ?? new Set;
-  globalStore.__transformDataFiles = dataFiles;
 });
 
 // src/dev/moduleServer.ts
@@ -202499,55 +202523,6 @@ ${stubs}
     return _match;
   });
   return result;
-}, NAMED_IMPORT_RE, rewriteDataImports = (code, projectRoot) => {
-  const rewrites = [];
-  let counter = 0;
-  let m;
-  NAMED_IMPORT_RE.lastIndex = 0;
-  while ((m = NAMED_IMPORT_RE.exec(code)) !== null) {
-    const [fullMatch, names, q1, srcUrl2, q2] = m;
-    if (!names || !srcUrl2)
-      continue;
-    const urlPath = srcUrl2.replace(/^\/@src\//, "").split("?")[0];
-    if (!urlPath || !urlPath.endsWith(".ts") || urlPath.endsWith(".d.ts"))
-      continue;
-    const absPath = resolve18(projectRoot, urlPath);
-    if (!isDataFile(absPath)) {
-      if (!urlPath.endsWith(".tsx") && existsSync13(absPath)) {
-        try {
-          const src = readFileSync9(absPath, "utf-8");
-          const exps = tsTranspiler2.scan(src).exports;
-          if (isDataOnlyFile(exps, src, absPath))
-            markAsDataFile(absPath);
-        } catch {}
-      }
-      if (!isDataFile(absPath))
-        continue;
-    }
-    const alias = `__hmr_${counter++}`;
-    const importedNames = names.split(",").map((n) => n.trim().split(/\s+as\s+/)).filter(([n]) => n).map(([orig, asName]) => ({
-      local: (asName ?? orig).trim(),
-      orig: orig.trim()
-    }));
-    rewrites.push({
-      alias,
-      fullMatch,
-      importLine: `import ${alias} from ${q1}${srcUrl2}${q2}`,
-      names: importedNames
-    });
-  }
-  if (rewrites.length === 0)
-    return code;
-  let result = code;
-  for (const r of rewrites) {
-    result = result.replace(r.fullMatch, r.importLine);
-  }
-  for (const r of rewrites) {
-    for (const { orig, local } of r.names) {
-      result = result.replace(new RegExp(`(?<![.\\w])${local}(?![\\w])`, "g"), `${r.alias}.${orig}`);
-    }
-  }
-  return result;
 }, HOOK_NAMES, REFRESH_PREAMBLE, JSX_AUTO_RE, JSXS_AUTO_RE, JSX_PROD_RE, FRAGMENT_RE, addJsxImport = (code) => {
   const imports = [];
   const jsxDevMatch = JSX_AUTO_RE.exec(code);
@@ -202585,36 +202560,7 @@ ${stubs}
 ` + transpiled;
   const relPath = relative7(projectRoot, filePath).replace(/\\/g, "/");
   transpiled = transpiled.replace(/\binput\.tsx:/g, `${relPath}:`);
-  let result = rewriteImports2(transpiled, filePath, projectRoot, rewriter);
-  result = rewriteDataImports(result, projectRoot);
-  return result;
-}, isDataOnlyFile = (exports, _source, filePath) => {
-  if (exports.length === 0)
-    return false;
-  if (filePath) {
-    const normalized = filePath.replace(/\\/g, "/");
-    if (!normalized.includes("/data/"))
-      return false;
-  }
-  if (exports.some((e) => /^[A-Z]/.test(e) || /^use[A-Z]/.test(e)))
-    return false;
-  return true;
-}, wrapDataExports = (transpiled, filePath, exports) => {
-  const storeKey = filePath.replace(/\\/g, "/");
-  let result = transpiled;
-  for (const name of exports) {
-    result = result.replace(new RegExp(`export\\s+(const|let|var)\\s+${name}\\s*=`), `$1 ${name} =`);
-  }
-  const preamble = `const __hmr = ((globalThis.__HMR_DATA__ ??= {})[${JSON.stringify(storeKey)}] ??= {});
-`;
-  const storeWrites = exports.map((name) => `__hmr.${name} = ${name};`).join(`
-`);
-  const namedExport = exports.length > 0 ? `export { ${exports.join(", ")} };
-` : "";
-  return preamble + result + `
-` + storeWrites + `
-` + namedExport + `export default __hmr;
-`;
+  return rewriteImports2(transpiled, filePath, projectRoot, rewriter);
 }, transformPlainFile = (filePath, projectRoot, rewriter) => {
   const raw = readFileSync9(filePath, "utf-8");
   const ext = extname3(filePath);
@@ -202626,13 +202572,7 @@ ${stubs}
   if (isTS) {
     transpiled = preserveTypeExports(raw, transpiled, valueExports);
   }
-  if (isTS && !isTSX && isDataOnlyFile(valueExports, transpiled, filePath)) {
-    transpiled = wrapDataExports(transpiled, filePath, valueExports);
-    markAsDataFile(filePath);
-  }
-  let result = rewriteImports2(transpiled, filePath, projectRoot, rewriter);
-  result = rewriteDataImports(result, projectRoot);
-  return result;
+  return rewriteImports2(transpiled, filePath, projectRoot, rewriter);
 }, svelteExternalCss, svelteCompiler = null, vueCompiler = null, warmCompilers = async (frameworks) => {
   const [sc, vc] = await Promise.all([
     frameworks.svelte ? import("svelte/compiler") : undefined,
@@ -202774,12 +202714,16 @@ ${code}`;
   if (existsSync13(`${path}.js`))
     return `${path}.js`;
   return path;
-}, jsResponse = (body) => new Response(body, {
-  headers: {
-    "Cache-Control": "no-cache",
-    "Content-Type": "application/javascript"
-  }
-}), handleCssRequest = (filePath) => {
+}, jsResponse = (body) => {
+  const etag = `"${Bun.hash(body).toString(36)}"`;
+  return new Response(body, {
+    headers: {
+      "Cache-Control": "no-cache",
+      "Content-Type": "application/javascript",
+      ETag: etag
+    }
+  });
+}, handleCssRequest = (filePath) => {
   const raw = readFileSync9(filePath, "utf-8");
   const escaped = raw.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$/g, "\\$");
   return [
@@ -203010,7 +202954,6 @@ var init_moduleServer = __esm(() => {
   STRING_CONTENTS_RE = /`(?:[^`\\]|\\.)*`|'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"/gs;
   REACT_EXTENSIONS = new Set([".tsx", ".jsx"]);
   mtimeCache = new Map;
-  NAMED_IMPORT_RE = /import\s*\{([^}]+)\}\s*from\s*(["'])(\/\@src\/[^"']+)(["']);?/g;
   HOOK_NAMES = new Set([
     "useState",
     "useReducer",
@@ -203573,7 +203516,15 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, parseError
     for (const file4 of reactFiles) {
       invalidateModule2(file4);
     }
-    const pageModuleUrl = await getReactModuleUrl(primaryFile);
+    const isComponentFile = primaryFile.endsWith(".tsx") || primaryFile.endsWith(".jsx");
+    let broadcastTarget = primaryFile;
+    if (!isComponentFile) {
+      const { findNearestComponent: findNearestComponent2 } = await Promise.resolve().then(() => (init_transformCache(), exports_transformCache));
+      const nearest = findNearestComponent2(resolve21(primaryFile));
+      if (nearest)
+        broadcastTarget = nearest;
+    }
+    const pageModuleUrl = await getReactModuleUrl(broadcastTarget);
     if (pageModuleUrl) {
       const serverDuration = Date.now() - startTime;
       state.lastHmrPath = relative8(process.cwd(), primaryFile).replace(/\\/g, "/");
@@ -205016,8 +204967,19 @@ var STORE_KEY = "__elysiaStore", getGlobalValue = (key) => Reflect.get(globalThi
     const pathname = rawUrl.slice(pathStart, pathEnd);
     if (moduleServerHandler) {
       const moduleResponse = await moduleServerHandler(pathname);
-      if (moduleResponse)
+      if (moduleResponse) {
+        const etag = moduleResponse.headers.get("ETag");
+        if (etag) {
+          const ifNoneMatch = request.headers.get("If-None-Match");
+          if (ifNoneMatch === etag) {
+            return new Response(null, {
+              headers: { ETag: etag },
+              status: 304
+            });
+          }
+        }
         return moduleResponse;
+      }
     }
     const bytes = lookupAsset(hmrState2.assetStore, pathname);
     if (!bytes) {
@@ -205361,5 +205323,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=78D70B808786BC8A64756E2164756E21
+//# debugId=8B0D6BD8707201AE64756E2164756E21
 //# sourceMappingURL=index.js.map