@absolutejs/absolute 0.19.0-beta.134 → 0.19.0-beta.136

package/dist/index.js

@@ -171258,7 +171258,7 @@ import {
   statSync,
   writeFileSync as writeFileSync3
 } from "fs";
-import { basename as basename5, dirname as dirname6, join as join13, relative as relative7, resolve as resolve11 } from "path";
+import { basename as basename5, join as join13, relative as relative7, 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) => {
@@ -171538,13 +171538,23 @@ var isDev, extractBuildError = (logs, pass, label, frameworkNames, isIncremental
     ...angularServerPaths
   ];
   const reactClientEntryPoints = [...reactEntries];
+  const allFrameworkDirs = [
+    reactDir,
+    svelteDir,
+    vueDir,
+    angularDir,
+    htmlDir,
+    htmxDir
+  ].filter((d) => Boolean(d));
+  const urlReferencedFiles = await scanWorkerReferences(allFrameworkDirs);
   const nonReactClientEntryPoints = [
     ...svelteIndexPaths,
     ...svelteClientPaths,
     ...htmlEntries,
     ...vueIndexPaths,
     ...vueClientPaths,
-    ...angularClientPaths
+    ...angularClientPaths,
+    ...urlReferencedFiles
   ];
   if (serverEntryPoints.length === 0 && reactClientEntryPoints.length === 0 && nonReactClientEntryPoints.length === 0 && htmxDir === undefined && htmlDir === undefined) {
     logWarn("No entry points found, manifest will be empty");
@@ -171719,15 +171729,6 @@ var isDev, extractBuildError = (logs, pass, label, frameworkNames, isIncremental
   if (hmr && reactClientOutputPaths.length > 0) {
     await patchRefreshGlobals(reactClientOutputPaths);
   }
-  const frameworkDirs = [
-    reactDir,
-    svelteDir,
-    vueDir,
-    angularDir,
-    htmlDir,
-    htmxDir
-  ].filter((d) => Boolean(d));
-  const workerEntryPoints = await scanWorkerReferences(frameworkDirs);
   const nonReactClientLogs = nonReactClientResult?.logs ?? [];
   const nonReactClientOutputs = nonReactClientResult?.outputs ?? [];
   if (nonReactClientResult && !nonReactClientResult.success && nonReactClientLogs.length > 0) {
@@ -171758,32 +171759,39 @@ var isDev, extractBuildError = (logs, pass, label, frameworkNames, isIncremental
   if (vueCssResult && !vueCssResult.success && vueCssResult.logs.length > 0) {
     extractBuildError(vueCssResult.logs, "vue-css", "Vue CSS", frameworkNames, isIncremental, throwOnError);
   }
-  if (hmr && workerEntryPoints.length > 0) {
+  if (urlReferencedFiles.length > 0) {
     const urlPattern = /new\s+URL\(\s*["'](\.\.?\/[^"']+)["']\s*,\s*import\.meta\.url\s*\)/g;
     const allClientOutputPaths = [
       ...reactClientOutputPaths,
       ...nonReactClientOutputs.map((a) => a.path)
     ];
-    const detectFramework = (outputPath) => {
-      const relOut = relative7(buildPath, outputPath).replace(/\\/g, "/");
-      for (const dir of frameworkDirs) {
-        const dirName = basename5(dir);
-        if (relOut.startsWith(dirName + "/"))
-          return dir;
-      }
-      return frameworkDirs[0];
-    };
+    const urlFileMap = new Map;
+    if (hmr) {
+      for (const srcPath of urlReferencedFiles) {
+        const rel = relative7(projectRoot, srcPath).replace(/\\/g, "/");
+        const name = basename5(srcPath);
+        const url = `/@src/${rel}`;
+        urlFileMap.set(name, url);
+        urlFileMap.set(name.replace(/\.tsx?$/, ".js"), url);
+      }
+    } else {
+      for (const srcPath of urlReferencedFiles) {
+        const srcBase = basename5(srcPath).replace(/\.[^.]+$/, "");
+        const output = nonReactClientOutputs.find((a) => basename5(a.path).startsWith(srcBase + "."));
+        if (output) {
+          urlFileMap.set(basename5(srcPath), "/" + relative7(buildPath, output.path).replace(/\\/g, "/"));
+        }
+      }
+    }
     for (const outputPath of allClientOutputPaths) {
       let content = readFileSync5(outputPath, "utf-8");
       let changed = false;
-      const frameworkDir = detectFramework(outputPath);
       content = content.replace(urlPattern, (_match, relPath) => {
         const targetName = basename5(relPath);
-        const workerSrc = workerEntryPoints.find((wp) => basename5(wp) === targetName && frameworkDir && wp.startsWith(frameworkDir)) ?? workerEntryPoints.find((wp) => basename5(wp) === targetName);
-        if (workerSrc) {
-          const rel = relative7(projectRoot, workerSrc);
+        const resolvedPath = urlFileMap.get(targetName);
+        if (resolvedPath) {
           changed = true;
-          return `new URL('/@src/${rel.replace(/\\/g, "/")}', import.meta.url)`;
+          return `new URL('${resolvedPath}', import.meta.url)`;
         }
         return _match;
       });
@@ -171791,59 +171799,6 @@ var isDev, extractBuildError = (logs, pass, label, frameworkNames, isIncremental
         writeFileSync3(outputPath, content);
     }
   }
-  let workerOutputs = [];
-  if (workerEntryPoints.length > 0) {
-    const workerResult = await bunBuild6({
-      entrypoints: workerEntryPoints,
-      format: "esm",
-      minify: !isDev,
-      naming: "[dir]/[name].[hash].[ext]",
-      outdir: buildPath,
-      root: commonAncestor(workerEntryPoints.map((p) => dirname6(p))),
-      target: "browser",
-      throw: false
-    });
-    if (workerResult.success) {
-      workerOutputs = workerResult.outputs;
-      const workerUrlMap = new Map;
-      for (const artifact of workerOutputs) {
-        for (const ep of workerEntryPoints) {
-          const epBase = basename5(ep).replace(/\.[^.]+$/, "");
-          if (basename5(artifact.path).startsWith(epBase)) {
-            workerUrlMap.set(ep, "/" + relative7(buildPath, artifact.path));
-          }
-        }
-      }
-      const allClientOutputPaths = [
-        ...reactClientOutputPaths,
-        ...nonReactClientOutputs.map((a) => a.path)
-      ];
-      for (const outputPath of allClientOutputPaths) {
-        let content = readFileSync5(outputPath, "utf-8");
-        let changed = false;
-        for (const [srcPath, hashedPath] of workerUrlMap) {
-          const srcRelPatterns = [
-            "./" + relative7(buildPath, srcPath),
-            "../" + relative7(buildPath, srcPath),
-            relative7(buildPath, srcPath)
-          ];
-          for (const pattern of srcRelPatterns) {
-            if (content.includes(pattern)) {
-              content = content.replaceAll(pattern, hashedPath);
-              changed = true;
-            }
-          }
-        }
-        if (changed)
-          writeFileSync3(outputPath, content);
-      }
-    } else {
-      const workerLogs = workerResult.logs;
-      if (workerLogs.length > 0) {
-        extractBuildError(workerLogs, "worker", "Worker", frameworkNames, isIncremental, throwOnError);
-      }
-    }
-  }
   const allLogs = [
     ...serverLogs,
     ...reactClientLogs,
@@ -171857,8 +171812,7 @@ var isDev, extractBuildError = (logs, pass, label, frameworkNames, isIncremental
       ...serverOutputs,
       ...reactClientOutputs,
       ...nonReactClientOutputs,
-      ...cssOutputs,
-      ...workerOutputs
+      ...cssOutputs
     ], buildPath)
   };
   for (const artifact of serverOutputs) {
@@ -205745,5 +205699,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=0752DF2B88DFF98D64756E2164756E21
+//# debugId=7DC4A54EB02475EB64756E2164756E21
 //# sourceMappingURL=index.js.map