@absolutejs/absolute 0.19.0-beta.222 → 0.19.0-beta.224

package/dist/index.js

@@ -161,14 +161,14 @@ var normalizeSlug = (str) => str.trim().replace(/\s+/g, "-").replace(/[^A-Za-z0-
 
 // src/utils/resolveConvention.ts
 import { basename } from "path";
-var conventionsMap, setConventions = (map) => {
-  conventionsMap = map;
+var CONVENTIONS_KEY = "__absoluteConventions", getMap = () => globalThis[CONVENTIONS_KEY] ?? {}, setConventions = (map) => {
+  globalThis[CONVENTIONS_KEY] = map;
 }, resolveErrorConventionPath = (framework, pageName) => {
-  const fw = conventionsMap[framework];
+  const fw = getMap()[framework];
   if (!fw)
     return;
   return fw.pages?.[pageName]?.error ?? fw.defaults?.error;
-}, resolveNotFoundConventionPath = (framework) => conventionsMap[framework]?.defaults?.notFound, derivePageName = (pagePath) => {
+}, resolveNotFoundConventionPath = (framework) => getMap()[framework]?.defaults?.notFound, derivePageName = (pagePath) => {
   const base = basename(pagePath);
   const dotIndex = base.indexOf(".");
   const name = dotIndex > 0 ? base.slice(0, dotIndex) : base;
@@ -300,7 +300,7 @@ var conventionsMap, setConventions = (map) => {
   return null;
 }, NOT_FOUND_PRIORITY, renderFirstNotFound = async () => {
   for (const framework of NOT_FOUND_PRIORITY) {
-    if (!conventionsMap[framework]?.defaults?.notFound)
+    if (!getMap()[framework]?.defaults?.notFound)
       continue;
     const response = await renderConventionNotFound(framework);
     if (response)
@@ -309,7 +309,6 @@ var conventionsMap, setConventions = (map) => {
   return null;
 };
 var init_resolveConvention = __esm(() => {
-  conventionsMap = {};
   NOT_FOUND_PRIORITY = [
     "react",
     "svelte",
@@ -172370,15 +172369,15 @@ ${content.slice(firstUseIdx)}`;
   const allSvelteEntries = svelteConventionResult.pageFiles;
   const allVueEntries = vueConventionResult.pageFiles;
   const allAngularEntries = angularConventionResult.pageFiles;
-  const conventionsMap2 = {};
+  const conventionsMap = {};
   if (reactConventionResult.conventions)
-    conventionsMap2.react = reactConventionResult.conventions;
+    conventionsMap.react = reactConventionResult.conventions;
   if (svelteConventionResult.conventions)
-    conventionsMap2.svelte = svelteConventionResult.conventions;
+    conventionsMap.svelte = svelteConventionResult.conventions;
   if (vueConventionResult.conventions)
-    conventionsMap2.vue = vueConventionResult.conventions;
+    conventionsMap.vue = vueConventionResult.conventions;
   if (angularConventionResult.conventions)
-    conventionsMap2.angular = angularConventionResult.conventions;
+    conventionsMap.angular = angularConventionResult.conventions;
   const shouldIncludeHtmlAssets = !isIncremental || normalizedIncrementalFiles?.some((f) => f.includes("/html/") && (f.endsWith(".html") || f.endsWith(".css")));
   const reactEntries = isIncremental && reactIndexesPath && reactPagesPath ? filterToIncrementalEntries(allReactEntries, (entry) => {
     if (entry.startsWith(resolve13(reactIndexesPath))) {
@@ -172418,25 +172417,33 @@ ${content.slice(firstUseIdx)}`;
       serverPaths: [...emptyStringArray]
     }
   ]);
-  const svelteConventionSources = collectConventionSourceFiles(conventionsMap2.svelte);
-  const vueConventionSources = collectConventionSourceFiles(conventionsMap2.vue);
+  const svelteConventionSources = collectConventionSourceFiles(conventionsMap.svelte);
+  const vueConventionSources = collectConventionSourceFiles(conventionsMap.vue);
   if (svelteConventionSources.length > 0 || vueConventionSources.length > 0) {
     const [svelteConvResult, vueConvResult] = await Promise.all([
       svelteConventionSources.length > 0 && svelteDir ? Promise.resolve().then(() => (init_compileSvelte(), exports_compileSvelte)).then((mod) => mod.compileSvelte(svelteConventionSources, svelteDir, new Map, false)) : { svelteServerPaths: [] },
       vueConventionSources.length > 0 && vueDir ? Promise.resolve().then(() => (init_compileVue(), exports_compileVue)).then((mod) => mod.compileVue(vueConventionSources, vueDir, false)) : { vueServerPaths: [] }
     ]);
-    updateConventionCompiledPaths(conventionsMap2.svelte, svelteConventionSources, svelteConvResult.svelteServerPaths);
-    updateConventionCompiledPaths(conventionsMap2.vue, vueConventionSources, vueConvResult.vueServerPaths);
+    const copyConventionFiles = (framework, sources, compiledPaths) => {
+      const destDir = join15(buildPath, "conventions", framework);
+      mkdirSync9(destDir, { recursive: true });
+      const destPaths = [];
+      for (const compiledPath of compiledPaths) {
+        const dest = join15(destDir, basename7(compiledPath));
+        copyFileSync(compiledPath, dest);
+        destPaths.push(dest);
+      }
+      return destPaths;
+    };
+    const svelteDests = copyConventionFiles("svelte", svelteConventionSources, svelteConvResult.svelteServerPaths);
+    const vueDests = copyConventionFiles("vue", vueConventionSources, vueConvResult.vueServerPaths);
+    updateConventionCompiledPaths(conventionsMap.svelte, svelteConventionSources, svelteDests);
+    updateConventionCompiledPaths(conventionsMap.vue, vueConventionSources, vueDests);
   }
-  const conventionServerPaths = [
-    ...collectConventionSourceFiles(conventionsMap2.svelte),
-    ...collectConventionSourceFiles(conventionsMap2.vue)
-  ];
   const serverEntryPoints = [
     ...svelteServerPaths,
     ...vueServerPaths,
-    ...angularServerPaths,
-    ...conventionServerPaths
+    ...angularServerPaths
   ];
   const reactClientEntryPoints = [...reactEntries];
   const allFrameworkDirs = [
@@ -172677,44 +172684,22 @@ ${content.slice(firstUseIdx)}`;
     ...cssLogs
   ];
   outputLogs(allLogs);
-  const conventionBaseNames = new Set(conventionServerPaths.map((p) => basename7(p).replace(/\.[^.]+$/, "")));
-  const pageServerOutputs = serverOutputs.filter((artifact) => {
-    const fileWithHash = basename7(artifact.path);
-    const [baseName] = fileWithHash.split(`.${artifact.hash}.`);
-    return !baseName || !conventionBaseNames.has(baseName);
-  });
   const manifest = {
     ...options?.baseManifest || {},
     ...generateManifest([
-      ...pageServerOutputs,
+      ...serverOutputs,
       ...reactClientOutputs,
       ...nonReactClientOutputs,
       ...cssOutputs
     ], buildPath)
   };
-  const conventionCompiledToBundled = new Map;
   for (const artifact of serverOutputs) {
     const fileWithHash = basename7(artifact.path);
     const [baseName] = fileWithHash.split(`.${artifact.hash}.`);
     if (!baseName)
       continue;
-    if (conventionBaseNames.has(baseName)) {
-      for (const compiledPath of conventionServerPaths) {
-        const compiledBase = basename7(compiledPath).replace(/\.[^.]+$/, "");
-        if (compiledBase === baseName) {
-          conventionCompiledToBundled.set(compiledPath, artifact.path);
-        }
-      }
-      continue;
-    }
     manifest[toPascal(baseName)] = artifact.path;
   }
-  if (conventionCompiledToBundled.size > 0) {
-    const compiledPaths = [...conventionCompiledToBundled.keys()];
-    const bundledPaths = compiledPaths.map((p) => conventionCompiledToBundled.get(p) ?? p);
-    updateConventionCompiledPaths(conventionsMap2.svelte, compiledPaths, bundledPaths);
-    updateConventionCompiledPaths(conventionsMap2.vue, compiledPaths, bundledPaths);
-  }
   const htmlOrHtmlCssChanged = !isIncremental || normalizedIncrementalFiles?.some((f) => f.includes("/html/") && (f.endsWith(".html") || f.endsWith(".css")));
   const htmxOrHtmxCssChanged = !isIncremental || normalizedIncrementalFiles?.some((f) => f.includes("/htmx/") && (f.endsWith(".html") || f.endsWith(".css")));
   const shouldCopyHtml = htmlOrHtmlCssChanged;
@@ -172821,11 +172806,11 @@ ${content.slice(firstUseIdx)}`;
   });
   if (!isIncremental) {
     writeFileSync4(join15(buildPath, "manifest.json"), JSON.stringify(manifest, null, "\t"));
-    if (Object.keys(conventionsMap2).length > 0) {
-      writeFileSync4(join15(buildPath, "conventions.json"), JSON.stringify(conventionsMap2, null, "\t"));
+    if (Object.keys(conventionsMap).length > 0) {
+      writeFileSync4(join15(buildPath, "conventions.json"), JSON.stringify(conventionsMap, null, "\t"));
     }
   }
-  return { manifest, conventions: conventionsMap2 };
+  return { manifest, conventions: conventionsMap };
 };
 var init_build = __esm(() => {
   init_constants();
@@ -178342,5 +178327,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=F79A191A33B743E564756E2164756E21
+//# debugId=2DBD112ED081E22264756E2164756E21
 //# sourceMappingURL=index.js.map