@absolutejs/absolute 0.19.0-beta.731 → 0.19.0-beta.733

package/dist/index.js

@@ -44660,6 +44660,25 @@ var init_buildReactVendor = __esm(() => {
   ];
 });
 
+// src/build/detectDefaultExport.ts
+var hasDefaultExport = async (specifier) => {
+  try {
+    const resolved = Bun.resolveSync(specifier, process.cwd());
+    const content = await Bun.file(resolved).text();
+    if (/\bexport\s+default\b/.test(content))
+      return true;
+    if (/\bexport\s*\{\s*[^}]*\bdefault\b[^}]*\}/.test(content))
+      return true;
+    if (/\bmodule\.exports\s*=/.test(content))
+      return true;
+    if (/\bexports\.default\s*=/.test(content))
+      return true;
+    return false;
+  } catch {
+    return false;
+  }
+};
+
 // src/build/buildAngularVendor.ts
 var exports_buildAngularVendor = {};
 __export(exports_buildAngularVendor, {
@@ -44769,8 +44788,12 @@ var REQUIRED_ANGULAR_SPECIFIERS, SERVER_ONLY_ANGULAR_SPECIFIERS, SCAN_SKIP_DIRS,
   const entrypoints = await Promise.all(specifiers.map(async (specifier) => {
     const safeName = toSafeFileName2(specifier);
     const entryPath = join17(tmpDir, `${safeName}.ts`);
-    await Bun.write(entryPath, `export * from '${specifier}';
-`);
+    const includeDefault = await hasDefaultExport(specifier);
+    const source = includeDefault ? `export * from '${specifier}';
+export { default } from '${specifier}';
+` : `export * from '${specifier}';
+`;
+    await Bun.write(entryPath, source);
     return entryPath;
   }));
   const result = await bunBuild4({
@@ -44955,6 +44978,7 @@ var init_buildSvelteVendor = __esm(() => {
 // src/build/rewriteImports.ts
 var exports_rewriteImports = {};
 __export(exports_rewriteImports, {
+  rewriteVendorDirectories: () => rewriteVendorDirectories,
   rewriteImports: () => rewriteImports
 });
 var escapeRegex2 = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), jsRewriteImports = (content, replacements) => {
@@ -44982,6 +45006,19 @@ var escapeRegex2 = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), jsRewrit
       await Bun.write(filePath, content);
     }
   }));
+}, rewriteVendorDirectories = async (vendorDirs, vendorPaths) => {
+  if (Object.keys(vendorPaths).length === 0)
+    return;
+  const { readdirSync } = await import("fs");
+  const { join: join20 } = await import("path");
+  const allFiles = [];
+  for (const dir of vendorDirs) {
+    try {
+      const files = readdirSync(dir).filter((f) => f.endsWith(".js")).map((f) => join20(dir, f));
+      allFiles.push(...files);
+    } catch {}
+  }
+  await rewriteImports(allFiles, vendorPaths);
 };
 var init_rewriteImports = __esm(() => {
   init_nativeRewrite();
@@ -49428,24 +49465,12 @@ var toSafeFileName5 = (specifier) => specifier.replace(/\//g, "_").replace(/@/g,
     dep: Array.from(dep).filter(isResolvable4),
     framework: Array.from(framework).filter(isResolvable4)
   };
-}, generateEntrySource2 = (specifier) => `export * from '${specifier}';
-`, rewriteVendorFiles = async (vendorDir) => {
-  const { readdirSync: readdirSync2, readFileSync: readFileSync15, writeFileSync: writeFileSync8 } = await import("fs");
-  const { computeVendorPaths: computeVendorPaths2 } = await Promise.resolve().then(() => (init_buildReactVendor(), exports_buildReactVendor));
-  const reactPaths = Object.entries(computeVendorPaths2());
-  const rewriteContent = (content) => reactPaths.reduce((acc, [specifier, webPath]) => {
-    const escaped = specifier.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const re2 = new RegExp(`(from\\s*["'])${escaped}(["'])`, "g");
-    return acc.replace(re2, `$1${webPath}$2`);
-  }, content);
-  const files = readdirSync2(vendorDir).filter((f) => f.endsWith(".js"));
-  for (const file4 of files) {
-    const filePath = join22(vendorDir, file4);
-    const original = readFileSync15(filePath, "utf-8");
-    const rewritten = rewriteContent(original);
-    if (rewritten !== original)
-      writeFileSync8(filePath, rewritten);
-  }
+}, generateEntrySource2 = async (specifier) => {
+  const namedReexport = `export * from '${specifier}';
+`;
+  const includeDefault = await hasDefaultExport(specifier);
+  return includeDefault ? `${namedReexport}export { default } from '${specifier}';
+` : namedReexport;
 }, collectTransitiveImports = async (specs, alreadyVendored, alreadyScanned) => {
   const { readFileSync: readFileSync15 } = await import("fs");
   const transpiler4 = new Bun.Transpiler({ loader: "js" });
@@ -49534,8 +49559,6 @@ var toSafeFileName5 = (specifier) => specifier.replace(/\//g, "_").replace(/@/g,
     console.warn("\u26A0\uFE0F Dependency vendor build had errors:", result.logs);
   }
   await rm9(tmpDir, { force: true, recursive: true });
-  if (success)
-    await rewriteVendorFiles(vendorDir);
   const paths = {};
   for (const specifier of allSpecs) {
     paths[specifier] = `/vendor/${toSafeFileName5(specifier)}.js`;
@@ -49826,46 +49849,54 @@ var FRAMEWORK_DIR_KEYS, collectDepVendorSourceDirs = (config) => {
   cleanStaleAssets(state.assetStore, manifest, state.resolvedPaths.buildDir);
   recordStep("populate asset store", stepStartedAt);
   stepStartedAt = performance.now();
-  const buildReactVendorTask = config.reactDirectory ? buildReactVendor(state.resolvedPaths.buildDir).then(async () => {
-    const vendorDir = resolve34(state.resolvedPaths.buildDir, "react", "vendor");
-    await loadVendorFiles(state.assetStore, vendorDir, "react");
-    if (!globalThis.__reactModuleRef) {
-      globalThis.__reactModuleRef = await import("react");
-    }
-    return true;
-  }) : undefined;
-  const buildAngularVendorTask = config.angularDirectory ? buildAngularVendor(state.resolvedPaths.buildDir, sourceDirs).then(async (specs) => {
-    const vendorDir = resolve34(state.resolvedPaths.buildDir, "angular", "vendor");
-    await loadVendorFiles(state.assetStore, vendorDir, "angular");
-    globalThis.__angularVendorSpecifiers = specs;
-    return true;
-  }) : undefined;
-  const buildSvelteVendorTask = config.svelteDirectory ? buildSvelteVendor(state.resolvedPaths.buildDir).then(async () => {
-    const vendorDir = resolve34(state.resolvedPaths.buildDir, "svelte", "vendor");
-    await loadVendorFiles(state.assetStore, vendorDir, "svelte");
-    return true;
-  }) : undefined;
-  const buildVueVendorTask = config.vueDirectory ? buildVueVendor(state.resolvedPaths.buildDir).then(async () => {
-    const vendorDir = resolve34(state.resolvedPaths.buildDir, "vue", "vendor");
-    await loadVendorFiles(state.assetStore, vendorDir, "vue");
-    return true;
-  }) : undefined;
+  const reactVendorDir = resolve34(state.resolvedPaths.buildDir, "react", "vendor");
+  const angularVendorDir = resolve34(state.resolvedPaths.buildDir, "angular", "vendor");
+  const svelteVendorDir = resolve34(state.resolvedPaths.buildDir, "svelte", "vendor");
+  const vueVendorDir = resolve34(state.resolvedPaths.buildDir, "vue", "vendor");
+  const depVendorDir = resolve34(state.resolvedPaths.buildDir, "vendor");
   const { buildDepVendor: buildDepVendor2 } = await Promise.resolve().then(() => (init_buildDepVendor(), exports_buildDepVendor));
-  const buildDepVendorTask = buildDepVendor2(state.resolvedPaths.buildDir, sourceDirs).then(async (depPaths) => {
-    const vendorDir = resolve34(state.resolvedPaths.buildDir, "vendor");
-    await loadVendorFiles(state.assetStore, vendorDir, "vendor");
-    globalThis.__depVendorPaths = depPaths;
-    return true;
-  });
-  await Promise.all([
-    buildReactVendorTask,
-    buildAngularVendorTask,
-    buildSvelteVendorTask,
-    buildVueVendorTask,
-    buildDepVendorTask
+  const [, angularSpecs, , , depPaths] = await Promise.all([
+    config.reactDirectory ? buildReactVendor(state.resolvedPaths.buildDir) : Promise.resolve(undefined),
+    config.angularDirectory ? buildAngularVendor(state.resolvedPaths.buildDir, sourceDirs) : Promise.resolve(undefined),
+    config.svelteDirectory ? buildSvelteVendor(state.resolvedPaths.buildDir) : Promise.resolve(undefined),
+    config.vueDirectory ? buildVueVendor(state.resolvedPaths.buildDir) : Promise.resolve(undefined),
+    buildDepVendor2(state.resolvedPaths.buildDir, sourceDirs)
   ]);
+  if (angularSpecs)
+    globalThis.__angularVendorSpecifiers = angularSpecs;
+  globalThis.__depVendorPaths = depPaths;
   recordStep("build vendor bundles", stepStartedAt);
   stepStartedAt = performance.now();
+  const combinedVendorPaths = {
+    ...getDevVendorPaths() ?? {},
+    ...getAngularVendorPaths() ?? {},
+    ...getSvelteVendorPaths() ?? {},
+    ...getVueVendorPaths() ?? {},
+    ...depPaths
+  };
+  const activeVendorDirs = [
+    config.reactDirectory ? reactVendorDir : null,
+    config.angularDirectory ? angularVendorDir : null,
+    config.svelteDirectory ? svelteVendorDir : null,
+    config.vueDirectory ? vueVendorDir : null,
+    depVendorDir
+  ].filter((d) => d !== null);
+  const { rewriteVendorDirectories: rewriteVendorDirectories2 } = await Promise.resolve().then(() => (init_rewriteImports(), exports_rewriteImports));
+  await rewriteVendorDirectories2(activeVendorDirs, combinedVendorPaths);
+  recordStep("rewrite vendor cross-references", stepStartedAt);
+  stepStartedAt = performance.now();
+  await Promise.all([
+    config.reactDirectory ? loadVendorFiles(state.assetStore, reactVendorDir, "react") : Promise.resolve(),
+    config.angularDirectory ? loadVendorFiles(state.assetStore, angularVendorDir, "angular") : Promise.resolve(),
+    config.svelteDirectory ? loadVendorFiles(state.assetStore, svelteVendorDir, "svelte") : Promise.resolve(),
+    config.vueDirectory ? loadVendorFiles(state.assetStore, vueVendorDir, "vue") : Promise.resolve(),
+    loadVendorFiles(state.assetStore, depVendorDir, "vendor")
+  ]);
+  if (config.reactDirectory && !globalThis.__reactModuleRef) {
+    globalThis.__reactModuleRef = await import("react");
+  }
+  recordStep("load vendor files", stepStartedAt);
+  stepStartedAt = performance.now();
   const { warmCompilers: warmCompilers2 } = await Promise.resolve().then(() => (init_moduleServer(), exports_moduleServer));
   await warmCompilers2({
     svelte: Boolean(config.svelteDirectory),
@@ -58308,5 +58339,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=2E2BAC3D0031B92D64756E2164756E21
+//# debugId=3733D59ADD660B6264756E2164756E21
 //# sourceMappingURL=index.js.map