@absolutejs/absolute 0.19.0-beta.843 → 0.19.0-beta.845

package/dist/index.js

@@ -12283,16 +12283,17 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
       ].join(", ")}`);
     }
     const original = await traceAngularPhase("wrapper/read-server-output", () => fs.readFile(rawServerFile, "utf-8"), { entry: resolvedEntry });
-    const detectExportedComponentClass = (source, fallback) => {
+    const detectExportedComponentClass = (source) => {
       const defaultMatch = source.match(/export\s+default\s+([A-Za-z_$][\w$]*)\s*;/);
       if (defaultMatch)
         return defaultMatch[1];
       const exportClassMatch = source.match(/export\s+(?:default\s+)?class\s+([A-Za-z_$][\w$]*)/);
       if (exportClassMatch)
         return exportClassMatch[1];
-      return fallback;
+      return null;
     };
-    const componentClassName = await traceAngularPhase("wrapper/detect-component-class", () => detectExportedComponentClass(original, `${toPascal(fileBase)}Component`), { entry: resolvedEntry });
+    const detectedClassName = await traceAngularPhase("wrapper/detect-component-class", () => detectExportedComponentClass(original), { entry: resolvedEntry });
+    const componentClassName = detectedClassName ?? `${toPascal(fileBase)}Component`;
     const usesLegacyAnimations = await traceAngularPhase("wrapper/detect-legacy-animations", () => usesLegacyAngularAnimations(resolvedEntry), { entry: resolvedEntry });
     const serverContentHash = Bun.hash(original).toString(BASE_36_RADIX);
     const cachedWrapper = wrapperOutputCache.get(resolvedEntry);
@@ -12312,7 +12313,7 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
 ${rewritten}`;
     }
     rewritten = rewritten.replace(new RegExp(`templateUrl:\\s*['"]\\.\\/${fileBase}\\.html['"]`), `templateUrl: '../../pages/${fileBase}.html'`);
-    if (!rewritten.includes("export default")) {
+    if (detectedClassName && !rewritten.includes("export default")) {
       rewritten += `
 export default ${componentClassName};
 `;
@@ -18954,18 +18955,51 @@ var toSafeFileName6 = (specifier) => {
   }));
   const isPrefixOrEqual = (candidate, current) => current === candidate || current.startsWith(`${candidate}/`);
   const otherSpecsFor = (current) => specifiers.filter((spec) => !isPrefixOrEqual(spec, current));
-  const results = await Promise.all(entries.map(({ entryPath, specifier }) => bunBuild9({
-    entrypoints: [entryPath],
-    external: [...FRAMEWORK_EXTERNALS, ...otherSpecsFor(specifier)],
-    format: "esm",
-    minify: false,
-    naming: "[name].[ext]",
-    outdir: vendorDir,
-    plugins: [createStripPureAnnotationsPlugin()],
-    splitting: false,
-    target: "browser",
-    throw: false
-  })));
+  const REQUIRE_CALL_RE = /__require\(\s*["']([^"']+)["']\s*\)/g;
+  const MAX_INLINE_PASSES = 4;
+  const buildEntryWithCjsRequireResolution = async (entryPath, specifier) => {
+    const baseExternals = [
+      ...FRAMEWORK_EXTERNALS,
+      ...otherSpecsFor(specifier)
+    ];
+    const externalsSet = new Set(baseExternals);
+    let lastResult = null;
+    for (let pass = 0;pass < MAX_INLINE_PASSES; pass++) {
+      lastResult = await bunBuild9({
+        entrypoints: [entryPath],
+        external: [...externalsSet],
+        format: "esm",
+        minify: false,
+        naming: "[name].[ext]",
+        outdir: vendorDir,
+        plugins: [createStripPureAnnotationsPlugin()],
+        splitting: false,
+        target: "browser",
+        throw: false
+      });
+      if (!lastResult.success)
+        return lastResult;
+      const output = lastResult.outputs[0];
+      if (!output)
+        return lastResult;
+      const text = await output.text();
+      REQUIRE_CALL_RE.lastIndex = 0;
+      const requiredSpecs = new Set;
+      let match;
+      while ((match = REQUIRE_CALL_RE.exec(text)) !== null) {
+        const requiredSpec = match[1];
+        if (requiredSpec && externalsSet.has(requiredSpec)) {
+          requiredSpecs.add(requiredSpec);
+        }
+      }
+      if (requiredSpecs.size === 0)
+        return lastResult;
+      for (const spec of requiredSpecs)
+        externalsSet.delete(spec);
+    }
+    return lastResult;
+  };
+  const results = await Promise.all(entries.map(({ entryPath, specifier }) => buildEntryWithCjsRequireResolution(entryPath, specifier)));
   const aggregated = {
     success: results.every((result) => result.success),
     logs: results.flatMap((result) => result.logs),
@@ -27947,5 +27981,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=C86F0B52E78282DE64756E2164756E21
+//# debugId=04E6614BD238791664756E2164756E21
 //# sourceMappingURL=index.js.map