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

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

@@ -40,25 +40,7 @@ export const handleReactUpdate = (message: {
 		return;
 	}
 
-	const componentKey = window.__REACT_COMPONENT_KEY__;
-	const newUrl = componentKey && message.data.manifest?.[componentKey];
-
-	if (newUrl && refreshRuntime) {
-		// Bundled files have bare specifiers (react-dom/client) that
-		// the browser can't resolve via import(). Only use import()
-		// for module server URLs (/@src/). Bundled files need a reload.
-		if (newUrl.startsWith('/@src/')) {
-			applyRefreshImport(newUrl, refreshRuntime, serverDuration);
-
-			return;
-		}
-
-		// Bundled file — reload to load the new script tag
-		window.location.reload();
-
-		return;
-	}
-
+	// No module URL — shouldn't happen, but reload as safety fallback
 	window.location.reload();
 };
 
@@ -87,24 +69,14 @@ const applyRefreshImport = (
 		.then(() => {
 			const result = refreshRuntime.performReactRefresh();
 
-			// If Fast Refresh was a no-op (data/utility file with no
-			// component exports), re-import the page entry so the
-			// component tree re-renders with the updated data.
-			// Chain invalidation ensures all intermediate modules have
-			// fresh ?v= params, so the browser re-fetches the whole chain.
-			if (!result && window.__REACT_PAGE_MODULE__) {
-				return import(
-					`${window.__REACT_PAGE_MODULE__}?t=${Date.now()}`
-				).then(() => {
-					refreshRuntime.performReactRefresh();
-
-					return undefined;
-				});
+			// 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();
 			}
 
-			return undefined;
-		})
-		.then(() => {
 			sendTiming(clientStart, serverDuration);
 
 			return undefined;
@@ -118,6 +90,18 @@ 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

@@ -202,7 +202,7 @@ __export(exports_generateReactIndexes, {
 });
 import { existsSync, mkdirSync } from "fs";
 import { readdir, rm, writeFile } from "fs/promises";
-import { basename, join, relative, resolve as resolve2 } from "path";
+import { basename, join, resolve as resolve2 } from "path";
 var {Glob } = globalThis.Bun;
 var indexContentCache, resolveDevClientDir = () => {
   const fromSource = resolve2(import.meta.dir, "../dev/client");
@@ -239,7 +239,6 @@ var indexContentCache, resolveDevClientDir = () => {
     const hmrPreamble = isDev ? [
       `window.__HMR_FRAMEWORK__ = "react";`,
       `window.__REACT_COMPONENT_KEY__ = "${componentName}Index";`,
-      `window.__REACT_PAGE_MODULE__ = "/@src/${relative(process.cwd(), resolve2(reactPagesDirectory, componentName + ".tsx")).replace(/\\\\/g, "/")}";`,
       `import '${refreshSetupPath}';`,
       `import '${hmrClientPath}';`,
       `import { showErrorOverlay, hideErrorOverlay } from '${errorOverlayPath}';
@@ -279,6 +278,9 @@ var indexContentCache, resolveDevClientDir = () => {
       `	reset() {`,
       `		this.setState({ hasError: false });`,
       `	}`,
+      `	hmrUpdate() {`,
+      `		this.forceUpdate();`,
+      `	}`,
       `	render() {`,
       `		if (this.state.hasError) return null;`,
       ``,
@@ -946,7 +948,7 @@ var devVendorPaths = null, getDevVendorPaths = () => devVendorPaths, setDevVendo
 
 // src/build/angularLinkerPlugin.ts
 import { existsSync as existsSync7, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname2, join as join4, relative as relative2, resolve as resolve5 } from "path";
+import { dirname as dirname2, join as join4, relative, resolve as resolve5 } from "path";
 import { createHash } from "crypto";
 var CACHE_DIR, angularLinkerPlugin;
 var init_angularLinkerPlugin = __esm(() => {
@@ -989,7 +991,7 @@ var init_angularLinkerPlugin = __esm(() => {
               dirname: dirname2,
               exists: existsSync7,
               readFile: readFileSync3,
-              relative: relative2,
+              relative,
               resolve: resolve5
             },
             linkerJitMode: false,
@@ -1030,11 +1032,11 @@ var HASHED_FILE_PATTERN, cleanStaleOutputs = async (buildPath, currentOutputPath
   const currentPaths = new Set(currentOutputPaths.map((path) => resolve6(path)));
   const glob = new Glob4("**/*");
   const removals = [];
-  for (const relative3 of glob.scanSync({ cwd: buildPath })) {
-    const absolute = resolve6(buildPath, relative3);
+  for (const relative2 of glob.scanSync({ cwd: buildPath })) {
+    const absolute = resolve6(buildPath, relative2);
     if (currentPaths.has(absolute))
       continue;
-    if (!HASHED_FILE_PATTERN.test(relative3))
+    if (!HASHED_FILE_PATTERN.test(relative2))
       continue;
     removals.push(rm2(absolute, { force: true }));
   }
@@ -1188,12 +1190,12 @@ var init_startupBanner = __esm(() => {
 // src/utils/logger.ts
 var colors2, frameworkColors, formatPath = (filePath) => {
   const cwd = process.cwd();
-  let relative3 = filePath.startsWith(cwd) ? filePath.slice(cwd.length + 1) : filePath;
-  relative3 = relative3.replace(/\\/g, "/");
-  if (!relative3.startsWith("/")) {
-    relative3 = `/${relative3}`;
+  let relative2 = filePath.startsWith(cwd) ? filePath.slice(cwd.length + 1) : filePath;
+  relative2 = relative2.replace(/\\/g, "/");
+  if (!relative2.startsWith("/")) {
+    relative2 = `/${relative2}`;
   }
-  return relative3;
+  return relative2;
 }, getFrameworkColor = (framework) => frameworkColors[framework] || colors2.white, log = (action, options) => {
   const timestamp = `${colors2.dim}${formatTimestamp()}${colors2.reset}`;
   const tag = `${colors2.cyan}[hmr]${colors2.reset}`;
@@ -1252,11 +1254,11 @@ var init_logger = __esm(() => {
 });
 
 // src/utils/validateSafePath.ts
-import { resolve as resolve7, relative as relative3 } from "path";
+import { resolve as resolve7, relative as relative2 } from "path";
 var validateSafePath = (targetPath, baseDirectory) => {
   const absoluteBase = resolve7(baseDirectory);
   const absoluteTarget = resolve7(baseDirectory, targetPath);
-  const relativePath = normalizePath(relative3(absoluteBase, absoluteTarget));
+  const relativePath = normalizePath(relative2(absoluteBase, absoluteTarget));
   if (relativePath.startsWith("../") || relativePath === "..") {
     throw new Error(`Unsafe path: ${targetPath}`);
   }
@@ -1278,7 +1280,7 @@ import {
   basename as basename2,
   extname as extname2,
   resolve as resolve8,
-  relative as relative4,
+  relative as relative3,
   sep
 } from "path";
 import { env } from "process";
@@ -1342,7 +1344,7 @@ var resolveDevClientDir2 = () => {
     const isModule = src.endsWith(".svelte.ts") || src.endsWith(".svelte.js");
     const preprocessed = isModule ? raw : (await preprocess(raw, {})).code;
     const transpiled = src.endsWith(".ts") || src.endsWith(".svelte.ts") ? transpiler.transformSync(preprocessed) : preprocessed;
-    const relDir = dirname3(relative4(svelteRoot, src)).replace(/\\/g, "/");
+    const relDir = dirname3(relative3(svelteRoot, src)).replace(/\\/g, "/");
     const baseName = basename2(src).replace(/\.svelte(\.(ts|js))?$/, "");
     const importPaths = Array.from(transpiled.matchAll(/from\s+['"]([^'"]+)['"]/g)).map((match) => match[1]).filter((path) => path !== undefined);
     const resolvedImports = await Promise.all(importPaths.map((importPath) => resolveSvelte(importPath, src)));
@@ -1361,7 +1363,7 @@ var resolveDevClientDir2 = () => {
       }).js.code;
       let code = raw2.replace(/\.svelte(?:\.(?:ts|js))?(['"])/g, ".js$1");
       if (mode === "client" && isDev) {
-        const moduleKey = `/@src/${relative4(process.cwd(), src).replace(/\\/g, "/")}`;
+        const moduleKey = `/@src/${relative3(process.cwd(), src).replace(/\\/g, "/")}`;
         code = code.replace(/if\s*\(import\.meta\.hot\)\s*\{/, `if (typeof window !== "undefined") {
   if (!window.__SVELTE_HMR_ACCEPT__) window.__SVELTE_HMR_ACCEPT__ = {};
   var __hmr_accept = function(cb) { window.__SVELTE_HMR_ACCEPT__[${JSON.stringify(moduleKey)}] = cb; };`);
@@ -1396,10 +1398,10 @@ var resolveDevClientDir2 = () => {
   };
   const roots = await Promise.all(entryPoints.map(build2));
   await Promise.all(roots.map(async ({ client: client2 }) => {
-    const relClientDir = dirname3(relative4(clientDir, client2));
+    const relClientDir = dirname3(relative3(clientDir, client2));
     const name = basename2(client2, extname2(client2));
     const indexPath = join6(indexDir, relClientDir, `${name}.js`);
-    const importRaw = relative4(dirname3(indexPath), client2).split(sep).join("/");
+    const importRaw = relative3(dirname3(indexPath), client2).split(sep).join("/");
     const importPath = importRaw.startsWith(".") || importRaw.startsWith("/") ? importRaw : `./${importRaw}`;
     const hmrImports = isDev ? `window.__HMR_FRAMEWORK__ = "svelte";
 import "${hmrClientPath3}";
@@ -1439,7 +1441,7 @@ if (typeof window !== "undefined") {
   return {
     svelteClientPaths: roots.map(({ client: client2 }) => client2),
     svelteIndexPaths: roots.map(({ client: client2 }) => {
-      const rel = dirname3(relative4(clientDir, client2));
+      const rel = dirname3(relative3(clientDir, client2));
       return join6(indexDir, rel, basename2(client2));
     }),
     svelteServerPaths: roots.map(({ ssr }) => ssr)
@@ -1464,7 +1466,7 @@ __export(exports_compileVue, {
 });
 import { existsSync as existsSync9 } from "fs";
 import { mkdir as mkdir2 } from "fs/promises";
-import { basename as basename3, dirname as dirname4, join as join7, relative as relative5, resolve as resolve9 } from "path";
+import { basename as basename3, dirname as dirname4, join as join7, relative as relative4, resolve as resolve9 } from "path";
 var {file: file3, write: write2, Transpiler: Transpiler2 } = globalThis.Bun;
 var resolveDevClientDir3 = () => {
   const fromSource = resolve9(import.meta.dir, "../dev/client");
@@ -1509,7 +1511,7 @@ var resolveDevClientDir3 = () => {
     return "template-only";
   }
   return "full";
-}, generateVueHmrId = (sourceFilePath, vueRootDir) => relative5(vueRootDir, sourceFilePath).replace(/\\/g, "/").replace(/\.vue$/, ""), extractImports = (sourceCode) => Array.from(sourceCode.matchAll(/import\s+[\s\S]+?['"]([^'"]+)['"]/g)).map((match) => match[1]).filter((importPath) => importPath !== undefined), toJs = (filePath) => {
+}, generateVueHmrId = (sourceFilePath, vueRootDir) => relative4(vueRootDir, sourceFilePath).replace(/\\/g, "/").replace(/\.vue$/, ""), extractImports = (sourceCode) => Array.from(sourceCode.matchAll(/import\s+[\s\S]+?['"]([^'"]+)['"]/g)).map((match) => match[1]).filter((importPath) => importPath !== undefined), toJs = (filePath) => {
   if (filePath.endsWith(".vue"))
     return filePath.replace(/\.vue$/, ".js");
   if (filePath.endsWith(".ts"))
@@ -1536,7 +1538,7 @@ var resolveDevClientDir3 = () => {
   const cachedResult = cacheMap.get(sourceFilePath);
   if (cachedResult)
     return cachedResult;
-  const relativeFilePath = relative5(vueRootDir, sourceFilePath).replace(/\\/g, "/");
+  const relativeFilePath = relative4(vueRootDir, sourceFilePath).replace(/\\/g, "/");
   const relativeWithoutExtension = relativeFilePath.replace(/\.vue$/, "");
   const fileBaseName = basename3(sourceFilePath, ".vue");
   const componentId = toKebab(fileBaseName);
@@ -1665,7 +1667,7 @@ if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
     result.tsHelperPaths.forEach((path) => allTsHelperPaths.add(path));
     const entryBaseName = basename3(entryPath, ".vue");
     const indexOutputFile = join7(indexOutputDir, `${entryBaseName}.js`);
-    const clientOutputFile = join7(clientOutputDir, relative5(vueRootDir, entryPath).replace(/\\/g, "/").replace(/\.vue$/, ".js"));
+    const clientOutputFile = join7(clientOutputDir, relative4(vueRootDir, entryPath).replace(/\\/g, "/").replace(/\.vue$/, ".js"));
     await mkdir2(dirname4(indexOutputFile), { recursive: true });
     const vueHmrImports = isDev ? [
       `window.__HMR_FRAMEWORK__ = "vue";`,
@@ -1673,7 +1675,7 @@ if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
     ] : [];
     await write2(indexOutputFile, [
       ...vueHmrImports,
-      `import Comp from "${relative5(dirname4(indexOutputFile), clientOutputFile).replace(/\\/g, "/")}";`,
+      `import Comp from "${relative4(dirname4(indexOutputFile), clientOutputFile).replace(/\\/g, "/")}";`,
       'import { createSSRApp, createApp } from "vue";',
       "",
       "// HMR State Preservation: Check for preserved state from HMR",
@@ -1773,7 +1775,7 @@ if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
   await Promise.all(Array.from(allTsHelperPaths).map(async (tsPath) => {
     const sourceCode = await file3(tsPath).text();
     const transpiledCode = transpiler2.transformSync(sourceCode);
-    const relativeJsPath = relative5(vueRootDir, tsPath).replace(/\.ts$/, ".js");
+    const relativeJsPath = relative4(vueRootDir, tsPath).replace(/\.ts$/, ".js");
     const outClientPath = join7(clientOutputDir, relativeJsPath);
     const outServerPath = join7(serverOutputDir, relativeJsPath);
     await mkdir2(dirname4(outClientPath), { recursive: true });
@@ -10663,11 +10665,11 @@ ${lanes.join(`
         return toComponents;
       }
       const components = toComponents.slice(start);
-      const relative6 = [];
+      const relative5 = [];
       for (;start < fromComponents.length; start++) {
-        relative6.push("..");
+        relative5.push("..");
       }
-      return ["", ...relative6, ...components];
+      return ["", ...relative5, ...components];
     }
     function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
       Debug.assert(getRootLength(fromDirectory) > 0 === getRootLength(to) > 0, "Paths must either both be absolute or both be relative");
@@ -47963,9 +47965,9 @@ ${lanes.join(`
           if (!startsWithDirectory(target, realPathDirectory, getCanonicalFileName)) {
             return;
           }
-          const relative6 = getRelativePathFromDirectory(realPathDirectory, target, getCanonicalFileName);
+          const relative5 = getRelativePathFromDirectory(realPathDirectory, target, getCanonicalFileName);
           for (const symlinkDirectory of symlinkDirectories) {
-            const option = resolvePath(symlinkDirectory, relative6);
+            const option = resolvePath(symlinkDirectory, relative5);
             const result2 = cb(option, target === referenceRedirect);
             shouldFilterIgnoredPaths = true;
             if (result2)
@@ -170531,7 +170533,7 @@ __export(exports_compileAngular, {
   compileAngular: () => compileAngular
 });
 import { existsSync as existsSync10, readFileSync as readFileSync4, promises as fs } from "fs";
-import { join as join8, basename as basename4, sep as sep2, dirname as dirname5, resolve as resolve10, relative as relative6 } from "path";
+import { join as join8, basename as basename4, sep as sep2, dirname as dirname5, resolve as resolve10, relative as relative5 } from "path";
 import { createHash as createHash2 } from "crypto";
 var import_typescript, computeConfigHash = () => {
   try {
@@ -170840,7 +170842,7 @@ export default ${componentClassName};
       await fs.writeFile(ssrDepsFile, ssrDepsContent, "utf-8");
     }
     await fs.writeFile(rawServerFile, rewritten, "utf-8");
-    const relativePath = relative6(indexesDir, rawServerFile).replace(/\\/g, "/");
+    const relativePath = relative5(indexesDir, rawServerFile).replace(/\\/g, "/");
     const normalizedImportPath = relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
     const hmrPreamble = hmr ? `window.__HMR_FRAMEWORK__ = "angular";
 import "${hmrRuntimePath}";
@@ -171219,7 +171221,7 @@ import {
   rmSync,
   writeFileSync as writeFileSync3
 } from "fs";
-import { basename as basename5, join as join13, relative as relative7, resolve as resolve11 } from "path";
+import { basename as basename5, join as join13, relative as relative6, resolve as resolve11 } from "path";
 import { cwd, env as env2, exit } from "process";
 var {build: bunBuild6, Glob: Glob5 } = globalThis.Bun;
 var isDev, extractBuildError = (logs, pass, label, frameworkNames, isIncremental, throwOnError) => {
@@ -171784,7 +171786,7 @@ var isDev, extractBuildError = (logs, pass, label, frameworkNames, isIncremental
     const devIndexDir = join13(buildPath, "_src_indexes");
     mkdirSync8(devIndexDir, { recursive: true });
     const indexFiles = readDir(reactIndexesPath).filter((f) => f.endsWith(".tsx"));
-    const pagesRel = relative7(process.cwd(), resolve11(reactPagesPath)).replace(/\\/g, "/");
+    const pagesRel = relative6(process.cwd(), resolve11(reactPagesPath)).replace(/\\/g, "/");
     for (const file4 of indexFiles) {
       let content = readFileSync5(join13(reactIndexesPath, file4), "utf-8");
       content = content.replace(/from\s*['"]\.\.\/pages\/([^'"]+)['"]/g, `from '/@src/${pagesRel}/$1'`);
@@ -202323,15 +202325,6 @@ 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 });
@@ -202350,29 +202343,9 @@ var globalStore, cache, importers, getTransformed = (filePath) => cache.get(file
       cache.delete(parent);
     }
   }
-}, 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;
-};
+}, dataFiles, markAsDataFile = (filePath) => {
+  dataFiles.add(filePath);
+}, isDataFile = (filePath) => dataFiles.has(filePath);
 var init_transformCache = __esm(() => {
   globalStore = globalThis;
   cache = globalStore.__transformCache ?? new Map;
@@ -202381,6 +202354,8 @@ 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
@@ -202394,7 +202369,7 @@ __export(exports_moduleServer, {
   SRC_URL_PREFIX: () => SRC_URL_PREFIX
 });
 import { existsSync as existsSync13, readFileSync as readFileSync9, statSync } from "fs";
-import { basename as basename7, dirname as dirname7, extname as extname3, resolve as resolve18, relative as relative8 } from "path";
+import { basename as basename7, dirname as dirname7, extname as extname3, resolve as resolve18, relative as relative7 } from "path";
 var SRC_PREFIX = "/@src/", jsTranspiler2, tsTranspiler2, tsxTranspiler, TRANSPILABLE, ALL_EXPORTS_RE, STRING_CONTENTS_RE, preserveTypeExports = (originalSource, transpiled, valueExports) => {
   const codeOnly = originalSource.replace(STRING_CONTENTS_RE, '""');
   const allExports = [];
@@ -202457,7 +202432,7 @@ ${stubs}
   const fileDir = dirname7(filePath);
   result = result.replace(/(from\s*["'])(\.\.?\/[^"']+)(["'])/g, (_match, prefix, relPath, suffix) => {
     const absPath = resolve18(fileDir, relPath);
-    const rel = relative8(projectRoot, absPath);
+    const rel = relative7(projectRoot, absPath);
     let srcPath = rel;
     if (!extname3(srcPath)) {
       const extensions = [
@@ -202478,19 +202453,19 @@ ${stubs}
     }
     if (extname3(srcPath) === ".svelte") {
       const resolved = resolveSvelteModulePath(resolve18(projectRoot, srcPath));
-      const resolvedRel = relative8(projectRoot, resolved);
+      const resolvedRel = relative7(projectRoot, resolved);
       srcPath = resolvedRel;
     }
     return `${prefix}${srcUrl(srcPath, projectRoot)}${suffix}`;
   });
   result = result.replace(/(import\s*\(\s*["'])(\.\.?\/[^"']+)(["']\s*\))/g, (_match, prefix, relPath, suffix) => {
     const absPath = resolve18(fileDir, relPath);
-    const rel = relative8(projectRoot, absPath);
+    const rel = relative7(projectRoot, absPath);
     return `${prefix}${srcUrl(rel, projectRoot)}${suffix}`;
   });
   result = result.replace(/(import\s*["'])(\.\.?\/[^"']+)(["']\s*;?)/g, (_match, prefix, relPath, suffix) => {
     const absPath = resolve18(fileDir, relPath);
-    const rel = relative8(projectRoot, absPath);
+    const rel = relative7(projectRoot, absPath);
     let srcPath = rel;
     if (!extname3(srcPath)) {
       const extensions = [
@@ -202514,16 +202489,65 @@ ${stubs}
   });
   result = result.replace(/((?:from|import)\s*["'])(\/[^"']+\.(tsx?|jsx?|ts))(["'])/g, (_match, prefix, absPath, _ext, suffix) => {
     if (absPath.startsWith(projectRoot)) {
-      const rel2 = relative8(projectRoot, absPath).replace(/\\/g, "/");
+      const rel2 = relative7(projectRoot, absPath).replace(/\\/g, "/");
       return `${prefix}${srcUrl(rel2, projectRoot)}${suffix}`;
     }
-    const rel = relative8(projectRoot, absPath).replace(/\\/g, "/");
+    const rel = relative7(projectRoot, absPath).replace(/\\/g, "/");
     if (!rel.startsWith("..")) {
       return `${prefix}${srcUrl(rel, projectRoot)}${suffix}`;
     }
     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);
@@ -202559,9 +202583,38 @@ ${stubs}
   transpiled = `var $RefreshReg$ = window.$RefreshReg$ || function(){};
 ` + `var $RefreshSig$ = window.$RefreshSig$ || function(){ return function(t){ return t; }; };
 ` + transpiled;
-  const relPath = relative8(projectRoot, filePath).replace(/\\/g, "/");
+  const relPath = relative7(projectRoot, filePath).replace(/\\/g, "/");
   transpiled = transpiled.replace(/\binput\.tsx:/g, `${relPath}:`);
-  return rewriteImports2(transpiled, filePath, projectRoot, rewriter);
+  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;
+`;
 }, transformPlainFile = (filePath, projectRoot, rewriter) => {
   const raw = readFileSync9(filePath, "utf-8");
   const ext = extname3(filePath);
@@ -202573,7 +202626,13 @@ ${stubs}
   if (isTS) {
     transpiled = preserveTypeExports(raw, transpiled, valueExports);
   }
-  return rewriteImports2(transpiled, filePath, projectRoot, rewriter);
+  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;
 }, svelteExternalCss, svelteCompiler = null, vueCompiler = null, warmCompilers = async (frameworks) => {
   const [sc, vc] = await Promise.all([
     frameworks.svelte ? import("svelte/compiler") : undefined,
@@ -202626,11 +202685,11 @@ ${stubs}
     if (compiled.css?.code) {
       const cssPath = `${filePath}.css`;
       svelteExternalCss.set(cssPath, compiled.css.code);
-      const cssUrl = srcUrl(relative8(projectRoot, cssPath), projectRoot);
+      const cssUrl = srcUrl(relative7(projectRoot, cssPath), projectRoot);
       code = `import "${cssUrl}";
 ${code}`;
     }
-    const moduleUrl = `${SRC_PREFIX}${relative8(projectRoot, filePath).replace(/\\/g, "/")}`;
+    const moduleUrl = `${SRC_PREFIX}${relative7(projectRoot, filePath).replace(/\\/g, "/")}`;
     code = code.replace(/if\s*\(import\.meta\.hot\)\s*\{/, `if (typeof window !== "undefined") {
   if (!window.__SVELTE_HMR_ACCEPT__) window.__SVELTE_HMR_ACCEPT__ = {};
   var __hmr_accept = function(cb) { window.__SVELTE_HMR_ACCEPT__[${JSON.stringify(moduleUrl)}] = cb; };`);
@@ -202694,7 +202753,7 @@ ${code}`;
   }
   code = tsTranspiler2.transformSync(code);
   const hmrBase = vueDir ? resolve18(vueDir) : projectRoot;
-  const hmrId = relative8(hmrBase, filePath).replace(/\\/g, "/").replace(/\.vue$/, "");
+  const hmrId = relative7(hmrBase, filePath).replace(/\\/g, "/").replace(/\.vue$/, "");
   code = code.replace(/export\s+default\s+/, "var __hmr_comp__ = ");
   code += [
     "",
@@ -202951,6 +203010,7 @@ 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",
@@ -203053,7 +203113,7 @@ var init_simpleHTMXHMR = () => {};
 // src/dev/rebuildTrigger.ts
 import { existsSync as existsSync14 } from "fs";
 import { rm as rm8 } from "fs/promises";
-import { basename as basename8, relative as relative9, resolve as resolve21 } from "path";
+import { basename as basename8, relative as relative8, resolve as resolve21 } from "path";
 var moduleServerPromise, getModuleServer = () => moduleServerPromise, parseErrorLocationFromMessage = (msg) => {
   const pathLineCol = msg.match(/^([^\s:]+):(\d+)(?::(\d+))?/);
   if (pathLineCol) {
@@ -203487,7 +203547,7 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, parseError
 }, getModuleUrl = async (pageFile) => {
   const { invalidateModule: invalidateModule2, warmCache: warmCache2, SRC_URL_PREFIX: SRC_URL_PREFIX2 } = await Promise.resolve().then(() => (init_moduleServer(), exports_moduleServer));
   invalidateModule2(pageFile);
-  const rel = relative9(process.cwd(), pageFile).replace(/\\/g, "/");
+  const rel = relative8(process.cwd(), pageFile).replace(/\\/g, "/");
   const url = `${SRC_URL_PREFIX2}${rel}`;
   warmCache2(url);
   return url;
@@ -203513,18 +203573,10 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, parseError
     for (const file4 of reactFiles) {
       invalidateModule2(file4);
     }
-    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);
+    const pageModuleUrl = await getReactModuleUrl(primaryFile);
     if (pageModuleUrl) {
       const serverDuration = Date.now() - startTime;
-      state.lastHmrPath = relative9(process.cwd(), primaryFile).replace(/\\/g, "/");
+      state.lastHmrPath = relative8(process.cwd(), primaryFile).replace(/\\/g, "/");
       state.lastHmrFramework = "react";
       broadcastToClients(state, {
         data: {
@@ -203910,7 +203962,7 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, parseError
   const baseName = fileName.replace(/\.vue$/, "");
   const pascalName = toPascal(baseName);
   const vueRoot = config.vueDirectory;
-  const hmrId = vueRoot ? relative9(vueRoot, vuePagePath).replace(/\\/g, "/").replace(/\.vue$/, "") : baseName;
+  const hmrId = vueRoot ? relative8(vueRoot, vuePagePath).replace(/\\/g, "/").replace(/\.vue$/, "") : baseName;
   const cssKey = `${pascalName}CSS`;
   const cssUrl = manifest[cssKey] || null;
   const { vueHmrMetadata: vueHmrMetadata2 } = await Promise.resolve().then(() => (init_compileVue(), exports_compileVue));
@@ -205050,7 +205102,7 @@ var handleHTMLPageRequest = (pagePath) => file(pagePath);
 var handleHTMXPageRequest = (pagePath) => file(pagePath);
 // src/core/prepare.ts
 import { readFileSync as readFileSync10 } from "fs";
-import { relative as relative11, resolve as resolve23 } from "path";
+import { relative as relative10, resolve as resolve23 } from "path";
 
 // src/utils/loadConfig.ts
 import { resolve } from "path";
@@ -205129,7 +205181,7 @@ var prepare = async (configOrPath) => {
       })) {
         if (file4.includes("/node_modules/"))
           continue;
-        const rel = relative11(process.cwd(), file4).replace(/\\/g, "/");
+        const rel = relative10(process.cwd(), file4).replace(/\\/g, "/");
         warmCache2(`${SRC_URL_PREFIX2}${rel}`);
       }
     }
@@ -205139,7 +205191,7 @@ var prepare = async (configOrPath) => {
       if (key.endsWith("Index") && typeof result.manifest[key] === "string" && result.manifest[key].includes("/react/") && result.manifest[key].includes("/indexes/")) {
         const fileName = `${key.replace(/Index$/, "")}.tsx`;
         const srcPath = resolve23(devIndexDir, fileName);
-        const rel = relative11(process.cwd(), srcPath).replace(/\\/g, "/");
+        const rel = relative10(process.cwd(), srcPath).replace(/\\/g, "/");
         result.manifest[key] = `${SRC_URL_PREFIX2}${rel}`;
       }
     }
@@ -205309,5 +205361,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=A2C8E272613C93C164756E2164756E21
+//# debugId=78D70B808786BC8A64756E2164756E21
 //# sourceMappingURL=index.js.map