module-federation-angular-adapter 0.2200.0 → 0.2200.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "module-federation-angular-adapter",
-  "version": "0.2200.0",
+  "version": "0.2200.1",
   "generators": "./collection.json",
   "builders": "./builders.json",
   "schematics": "./collection.json",

package/src/builders/build/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/builder.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAiB1C,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAGnB,MAAM,2BAA2B,CAAC;AAsBnC,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAwEtE,wBAAuB,UAAU,CAC/B,gBAAgB,EAAE,eAAe,GAAG,iBAAiB,EACrD,OAAO,EAAE,cAAc,GACtB,aAAa,CAAC,aAAa,CAAC,CAke9B;wBAkE2C,GAAG;AAA/C,wBAAgD"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/builder.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAiB1C,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAGnB,MAAM,2BAA2B,CAAC;AAoBnC,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AA0EtE,wBAAuB,UAAU,CAC/B,gBAAgB,EAAE,eAAe,GAAG,iBAAiB,EACrD,OAAO,EAAE,cAAc,GACtB,aAAa,CAAC,aAAa,CAAC,CAqe9B;wBAkE2C,GAAG;AAA/C,wBAAgD"}

package/src/builders/build/builder.js

@@ -5,11 +5,13 @@ import * as path from "path";
 import { buildApplication, } from "@angular/build";
 import { buildApplicationInternal, normalizeDevServerOptions, serveWithVite, SourceFileCache, } from "@angular/build/private";
 import { createBuilder, targetFromTargetString, } from "@angular-devkit/architect";
-import { createFederationCache, getExternals, normalizeFederationOptions, } from "@softarc/native-federation";
+import { createFederationCache, } from "@softarc/native-federation";
 import { AbortedError, createNfWatcher, getDefaultCachePath, logger, RebuildQueue, setLogLevel, syncNfFileWatcher, } from "@softarc/native-federation/internal";
 import { checkForInvalidImports } from "./../../utils/check-for-invalid-imports.js";
 import { federationBuildNotifier } from "./federation-build-notifier.js";
 import { createMfFederationBuilder, } from "../../tools/mf/build-for-federation.js";
+import { loadFederationConfig } from "../../tools/mf/load-federation-config.js";
+import { getHostExternals } from "./get-externals.js";
 import { getI18nConfig, translateFederationArtifacts } from "./i18n.js";
 import { updateScriptTags } from "./update-index-html.js";
 const originalWrite = process.stderr.write.bind(process.stderr);
@@ -126,30 +128,26 @@ export async function* runBuilder(nfBuilderOptions, context) {
     const devServerOutputPath = !differentDevServerOutputPath
         ? browserOutputPath
         : path.join(outputOptions.base, outputOptions.browser, localeFilter[0]);
-    const entryPoints = nfBuilderOptions.entryPoints && nfBuilderOptions.entryPoints.length > 0
-        ? nfBuilderOptions.entryPoints
-        : [path.join(path.dirname(federationTsConfig), "src/main.ts")];
     const cachePath = getDefaultCachePath(context.workspaceRoot);
-    const normalized = await normalizeFederationOptions({
-        projectName: nfBuilderOptions.projectName,
-        workspaceRoot: context.workspaceRoot,
+    const federationCache = createFederationCache(cachePath, new SourceFileCache(cachePath));
+    const config = await loadFederationConfig(context.workspaceRoot, inferConfigPath(federationTsConfig, context.workspaceRoot, nfBuilderOptions.federationConfigPath));
+    // `config.name` is the share scope / manifest id prefix (`<name>:@angular/core`);
+    // fall back to the project name so it's never empty.
+    if (!config.name) {
+        config.name = context.target.project;
+    }
+    checkForInvalidImports(Object.keys(config.shared ?? {}), "externals");
+    const fedOptions = {
         outputPath: browserOutputPath,
-        federationConfig: inferConfigPath(federationTsConfig, context.workspaceRoot, nfBuilderOptions.federationConfigPath),
         tsConfig: federationTsConfig,
-        verbose: ngBuilderOptions.verbose,
-        watch: ngBuilderOptions.watch,
         dev: !!nfBuilderOptions.dev,
-        entryPoints,
-        buildNotifications: nfBuilderOptions.buildNotifications,
-        cacheExternalArtifacts: nfBuilderOptions.cacheExternalArtifacts !== false,
-    }, createFederationCache(cachePath, new SourceFileCache(cachePath)));
-    checkForInvalidImports(Object.values(normalized.config.sharedMappings), "shared mappings");
-    checkForInvalidImports(Object.keys(normalized.config.shared), "externals");
+        watch,
+        federationCache,
+    };
     const start = process.hrtime();
     logger.measure(start, "To load the federation config.");
-    const externals = getExternals(normalized.config);
-    // MF side builder (M2.1) — replaces NF's adapter + buildForFederation/rebuildForFederation.
-    const mfBuilder = await createMfFederationBuilder(normalized.config, normalized.options, externals, {
+    const externals = getHostExternals(config.shared);
+    const mfBuilder = await createMfFederationBuilder(config, fedOptions, externals, {
         builderOptions: {
             ...ngBuilderOptions,
             plugins: nfBuilderOptions.plugins,
@@ -185,7 +183,7 @@ export async function* runBuilder(nfBuilderOptions, context) {
         (req, res, next) => {
             const rawUrl = removeBaseHref(req, ngBuilderOptions.baseHref);
             const url = new URL(rawUrl || "/", "http://localhost").pathname;
-            const fileName = path.join(normalized.options.workspaceRoot, devServerOutputPath, url);
+            const fileName = path.join(context.workspaceRoot, devServerOutputPath, url);
             const exists = fs.existsSync(fileName);
             if (url !== "/" && url !== "" && exists) {
                 const lookup = mrmime.lookup;
@@ -214,11 +212,11 @@ export async function* runBuilder(nfBuilderOptions, context) {
     if (nfWatcher) {
         nfWatcher.addPaths(path.dirname(path.resolve(context.workspaceRoot, federationTsConfig)));
     }
-    if (fs.existsSync(normalized.options.outputPath)) {
-        fs.rmSync(normalized.options.outputPath, { recursive: true });
+    if (fs.existsSync(browserOutputPath)) {
+        fs.rmSync(browserOutputPath, { recursive: true });
     }
-    if (!fs.existsSync(normalized.options.outputPath)) {
-        fs.mkdirSync(normalized.options.outputPath, { recursive: true });
+    if (!fs.existsSync(browserOutputPath)) {
+        fs.mkdirSync(browserOutputPath, { recursive: true });
     }
     let federationResult;
     try {
@@ -234,7 +232,7 @@ export async function* runBuilder(nfBuilderOptions, context) {
         await mfBuilder.dispose().catch(() => undefined);
     }
     if (nfWatcher) {
-        syncNfFileWatcher(nfWatcher, normalized.options.federationCache.bundlerCache);
+        syncNfFileWatcher(nfWatcher, federationCache.bundlerCache);
     }
     const hasLocales = i18n?.locales && Object.keys(i18n.locales).length > 0;
     if (hasLocales && localeFilter) {
@@ -305,7 +303,7 @@ export async function* runBuilder(nfBuilderOptions, context) {
                             nfWatcher.clear();
                         federationResult = await mfBuilder.rebuild(changedFiles);
                         if (nfWatcher) {
-                            syncNfFileWatcher(nfWatcher, normalized.options.federationCache.bundlerCache);
+                            syncNfFileWatcher(nfWatcher, federationCache.bundlerCache);
                         }
                         if (signal?.aborted) {
                             throw new AbortedError("[builder] After federation build.");
@@ -364,6 +362,12 @@ export async function* runBuilder(nfBuilderOptions, context) {
         if (isLocalDevelopment) {
             federationBuildNotifier.stopEventServer();
         }
+        // Angular's CLI leaves the esbuild service child alive after a non-watch
+        // build, so the process never exits. Unref'd: rides the leaked child to
+        // fire, then force-exits. ref: https://github.com/angular/angular-cli/issues/33201
+        if (!watch) {
+            setTimeout(() => process.exit(ngBuildStatus.success ? 0 : 1), 100).unref();
+        }
     }
     yield ngBuildStatus;
 }

package/src/builders/build/get-externals.d.ts

@@ -1,18 +1,7 @@
-import { type SharedConfig } from '../../index.js';
 /**
- * MF equivalent of NF's `getExternals` (host path, M1.5): the packages the
- * Angular app build must mark `external` so they resolve from the shared scope
- * (es-module-shims import map, finding #6) instead of being bundled. For a pure
- * host this is exactly the shared singleton set.
- *
- * Mirrors NF's trivial `[...Object.keys(shared), ...sharedMappings, ...externals]`,
- * MF-shaped: the keys of the MF `shared` map (+ any extra explicit externals).
- *
- * ⚠️ The builder call-site swap (replacing `getExternals(normalized.config)` at
- * `builder.ts:297`) is performed in **M2.1**, not here: that line and
- * `buildForFederation` (`builder.ts:425`) consume the *same* `normalized.config`,
- * so the externals source and the side-build's `shared` must switch to MF
- * together — otherwise the host externalizes deps nothing provides.
+ * Packages the Angular app build must mark `external` so they resolve from the
+ * shared scope instead of being bundled — the keys of the MF `shared` map plus
+ * any extra explicit externals. Replaces NF's `getExternals`.
  */
-export declare function getHostExternals(shared?: SharedConfig, extraExternals?: string[]): string[];
+export declare function getHostExternals(shared?: Record<string, unknown>, extraExternals?: string[]): string[];
 //# sourceMappingURL=get-externals.d.ts.map

package/src/builders/build/get-externals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-externals.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/get-externals.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE3E;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,GAAE,YAAqC,EAC7C,cAAc,GAAE,MAAM,EAAO,GAC5B,MAAM,EAAE,CAEV"}
+{"version":3,"file":"get-externals.d.ts","sourceRoot":"","sources":["../../../../src/builders/build/get-externals.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAA0B,EACxD,cAAc,GAAE,MAAM,EAAO,GAC5B,MAAM,EAAE,CAEV"}

package/src/builders/build/get-externals.js

@@ -1,18 +1,8 @@
 import { DEFAULT_ANGULAR_SHARED } from '../../index.js';
 /**
- * MF equivalent of NF's `getExternals` (host path, M1.5): the packages the
- * Angular app build must mark `external` so they resolve from the shared scope
- * (es-module-shims import map, finding #6) instead of being bundled. For a pure
- * host this is exactly the shared singleton set.
- *
- * Mirrors NF's trivial `[...Object.keys(shared), ...sharedMappings, ...externals]`,
- * MF-shaped: the keys of the MF `shared` map (+ any extra explicit externals).
- *
- * ⚠️ The builder call-site swap (replacing `getExternals(normalized.config)` at
- * `builder.ts:297`) is performed in **M2.1**, not here: that line and
- * `buildForFederation` (`builder.ts:425`) consume the *same* `normalized.config`,
- * so the externals source and the side-build's `shared` must switch to MF
- * together — otherwise the host externalizes deps nothing provides.
+ * Packages the Angular app build must mark `external` so they resolve from the
+ * shared scope instead of being bundled — the keys of the MF `shared` map plus
+ * any extra explicit externals. Replaces NF's `getExternals`.
  */
 export function getHostExternals(shared = DEFAULT_ANGULAR_SHARED, extraExternals = []) {
     return [...new Set([...Object.keys(shared), ...extraExternals])];

package/src/builders/remote/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../src/builders/remote/builder.ts"],"names":[],"mappings":"AAAA,OAAO,yCAAyC,CAAC;AAOjD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAiB,MAAM,2BAA2B,CAAC;AAmBnG,OAAO,KAAK,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAWlF;;;;;GAKG;AAEH,wBAAuB,gBAAgB,CACrC,gBAAgB,EAAE,qBAAqB,GAAG,uBAAuB,EACjE,OAAO,EAAE,cAAc,GACtB,aAAa,CAAC,aAAa,CAAC,CAmL9B;wBAGiD,GAAG;AAArD,wBAAsD"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../../src/builders/remote/builder.ts"],"names":[],"mappings":"AAAA,OAAO,yCAAyC,CAAC;AAOjD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAiB,MAAM,2BAA2B,CAAC;AAiBnG,OAAO,KAAK,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAWlF;;;;;GAKG;AAEH,wBAAuB,gBAAgB,CACrC,gBAAgB,EAAE,qBAAqB,GAAG,uBAAuB,EACjE,OAAO,EAAE,cAAc,GACtB,aAAa,CAAC,aAAa,CAAC,CAmL9B;wBAGiD,GAAG;AAArD,wBAAsD"}

package/src/builders/remote/builder.js

@@ -3,9 +3,11 @@ import * as path from 'path';
 import { existsSync, mkdirSync, rmSync } from 'fs';
 import { SourceFileCache } from '@angular/build/private';
 import { createBuilder } from '@angular-devkit/architect';
-import { getExternals, normalizeFederationOptions, createFederationCache, } from '@softarc/native-federation';
+import { createFederationCache } from '@softarc/native-federation';
 import { logger, setLogLevel, RebuildQueue, AbortedError, getDefaultCachePath, syncNfFileWatcher, } from '@softarc/native-federation/internal';
 import { createMfFederationBuilder } from '../../tools/mf/build-for-federation.js';
+import { loadFederationConfig } from '../../tools/mf/load-federation-config.js';
+import { getHostExternals } from '../build/get-externals.js';
 import { checkForInvalidImports } from '../../utils/check-for-invalid-imports.js';
 import { resolveNgBuilderOptions } from './resolve-ng-options.js';
 import { inferFederationConfigPath } from './infer-config-path.js';
@@ -24,33 +26,28 @@ export async function* runRemoteBuilder(nfBuilderOptions, context) {
     const absoluteBrowserOutput = path.resolve(context.workspaceRoot, browserOutputPath);
     const { ngBuilderOptions, projectRoot, projectSourceRoot } = await resolveNgBuilderOptions(nfBuilderOptions, context);
     setLogLevel(nfBuilderOptions.verbose ? 'verbose' : 'info');
-    // Unlike the regular build builder, remote never bundles a main.ts / polyfills.
-    // Entry points come from the schema override or, when omitted, from the
-    // `exposes` map in federation.config.{mjs,js} (resolved by normalizeFederationOptions).
-    const entryPoints = nfBuilderOptions.entryPoints?.length
-        ? nfBuilderOptions.entryPoints
-        : undefined;
     const cachePath = getDefaultCachePath(context.workspaceRoot);
-    const normalized = await normalizeFederationOptions({
-        projectName: nfBuilderOptions.projectName,
-        workspaceRoot: context.workspaceRoot,
+    const federationCache = createFederationCache(cachePath, new SourceFileCache(cachePath));
+    const config = await loadFederationConfig(context.workspaceRoot, inferFederationConfigPath(federationTsConfig, context.workspaceRoot));
+    // Share scope / manifest id prefix; fall back to the project name so it's never empty.
+    if (!config.name) {
+        config.name = context.target.project;
+    }
+    checkForInvalidImports(Object.keys(config.shared ?? {}), 'externals');
+    const fedOptions = {
         outputPath: browserOutputPath,
-        federationConfig: inferFederationConfigPath(federationTsConfig, context.workspaceRoot),
         tsConfig: federationTsConfig,
-        verbose: nfBuilderOptions.verbose,
-        watch: nfBuilderOptions.watch,
         dev: !!nfBuilderOptions.dev,
-        entryPoints,
-        cacheExternalArtifacts: nfBuilderOptions.cacheExternalArtifacts !== false,
-    }, createFederationCache(cachePath, new SourceFileCache(cachePath)));
-    checkForInvalidImports(Object.values(normalized.config.sharedMappings), 'shared mappings');
-    checkForInvalidImports(Object.keys(normalized.config.shared), 'externals');
+        watch: nfBuilderOptions.watch,
+        federationCache,
+    };
     const start = process.hrtime();
     logger.measure(start, 'To load the federation config.');
-    const externals = getExternals(normalized.config);
-    // MF side builder (M2.1) — replaces NF's adapter + buildForFederation/rebuildForFederation.
-    // Holds one esbuild context (Angular compiler + moduleFederationPlugin) for build + rebuilds.
-    const mfBuilder = await createMfFederationBuilder(normalized.config, normalized.options, externals, { builderOptions: ngBuilderOptions, context });
+    const externals = getHostExternals(config.shared);
+    const mfBuilder = await createMfFederationBuilder(config, fedOptions, externals, {
+        builderOptions: ngBuilderOptions,
+        context,
+    });
     const assetEntries = normalizeRemoteAssetEntries(nfBuilderOptions.assets, context.workspaceRoot, projectRoot, projectSourceRoot);
     const changeWatcher = nfBuilderOptions.watch
         ? createDebouncedChangeWatcher(nfBuilderOptions.rebuildDelay)
@@ -61,10 +58,10 @@ export async function* runRemoteBuilder(nfBuilderOptions, context) {
             changeWatcher.watcher.addPaths(assetDir);
         }
     }
-    if (existsSync(normalized.options.outputPath)) {
-        rmSync(normalized.options.outputPath, { recursive: true });
+    if (existsSync(browserOutputPath)) {
+        rmSync(browserOutputPath, { recursive: true });
     }
-    mkdirSync(normalized.options.outputPath, { recursive: true });
+    mkdirSync(browserOutputPath, { recursive: true });
     try {
         await mfBuilder.build();
     }
@@ -74,7 +71,7 @@ export async function* runRemoteBuilder(nfBuilderOptions, context) {
     }
     await copyAllAssets(assetEntries, absoluteBrowserOutput, context.workspaceRoot);
     if (changeWatcher) {
-        syncNfFileWatcher(changeWatcher.watcher, normalized.options.federationCache.bundlerCache);
+        syncNfFileWatcher(changeWatcher.watcher, federationCache.bundlerCache);
     }
     const rebuildQueue = new RebuildQueue();
     try {
@@ -114,7 +111,7 @@ export async function* runRemoteBuilder(nfBuilderOptions, context) {
                     // remain in pendingPaths and will drive the next iteration.
                     for (const p of changedFiles)
                         changeWatcher.pendingPaths.delete(p);
-                    syncNfFileWatcher(changeWatcher.watcher, normalized.options.federationCache.bundlerCache);
+                    syncNfFileWatcher(changeWatcher.watcher, federationCache.bundlerCache);
                     if (signal?.aborted) {
                         throw new AbortedError('[remote-builder] After federation build.');
                     }
@@ -147,6 +144,11 @@ export async function* runRemoteBuilder(nfBuilderOptions, context) {
         rebuildQueue.dispose();
         await mfBuilder.dispose();
         await changeWatcher?.watcher.close();
+        // Force-exit the leaked esbuild service on a non-watch build (see build
+        // builder). ref: https://github.com/angular/angular-cli/issues/33201
+        if (!nfBuilderOptions.watch) {
+            setTimeout(() => process.exit(0), 100).unref();
+        }
     }
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/schematics/init/steps/make-main-async.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"make-main-async.d.ts","sourceRoot":"","sources":["../../../../../src/schematics/init/steps/make-main-async.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAsBtD,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,EAC1B,SAAS,EAAE,OAAO,EAClB,eAAe,EAAE,MAAM,GACtB,IAAI,CA0BN"}
+{"version":3,"file":"make-main-async.d.ts","sourceRoot":"","sources":["../../../../../src/schematics/init/steps/make-main-async.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAsBtD,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,iBAAiB,EAC1B,SAAS,EAAE,OAAO,EAClB,eAAe,EAAE,MAAM,GACtB,IAAI,CAyBN"}

package/src/schematics/init/steps/make-main-async.js

@@ -26,10 +26,9 @@ export function makeMainAsync(main, options, remoteMap, manifestRelPath) {
         const federationArg = getFederationArg(options, remoteMap, manifestRelPath);
         tree.overwrite(main, `${FEDERATION_IMPORT}
 
-initFederation(${federationArg})
-  .catch(err => console.error(err))
-  .then(_ => import('./bootstrap'))
-  .catch(err => console.error(err));
+initFederation(${federationArg});
+
+import('./bootstrap').catch(err => console.error(err));
 `);
     };
 }

package/src/tools/esbuild/angular-bundler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-bundler.d.ts","sourceRoot":"","sources":["../../../../src/tools/esbuild/angular-bundler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAiBnC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAGzF,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,wBAAwB,EAOjC,KAAK,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GAC/D,OAAO,CAAC;IACT,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC,CAsJD"}
+{"version":3,"file":"angular-bundler.d.ts","sourceRoot":"","sources":["../../../../src/tools/esbuild/angular-bundler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAiBnC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAGzF,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,wBAAwB,EAOjC,KAAK,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GAC/D,OAAO,CAAC;IACT,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC,CAyJD"}

package/src/tools/esbuild/angular-bundler.js

@@ -103,8 +103,11 @@ extra = {}) {
         sourcemap: sourcemapOptions.scripts,
         minify: !dev,
         supported: {
-            'async-await': false,
+            // Never set `'async-await': false`: the MF v2 container and
+            // `virtual-share-module:*` wrappers emit top-level await, which esbuild
+            // cannot downlevel when async/await is marked unsupported.
             'object-rest-spread': false,
+            'top-level-await': true,
         },
         splitting: chunks,
         platform: platform ?? 'browser',

package/src/tools/mf/build-for-federation.d.ts

@@ -5,24 +5,15 @@ import type { FederationCache } from '@softarc/native-federation';
 import type { FederationSharedInput } from './to-plugin-config.js';
 import type { NfInternalOptions } from '../../builders/build/schema.js';
 /**
- * Minimal normalized-config shape this driver reads. NF's
- * `NormalizedFederationConfig` satisfies it structurally (transitional — Phase 3
- * replaces the config loader with `withModuleFederation`).
+ * The MF config shape emitted by `withModuleFederation`; `exposes` values are
+ * source-path strings. `NormalizedModuleFederationConfig` satisfies it structurally.
  */
 export interface NormalizedConfig {
     name: string;
     filename?: string;
-    exposes?: Record<string, {
-        file: string;
-    }>;
+    exposes?: Record<string, string>;
     shared?: Record<string, FederationSharedInput>;
-    sharedMappings?: Record<string, string>;
     remotes?: Record<string, string>;
-    chunks?: boolean;
-    /** NF puts `features` on the config; `optimizedMappings` reads `ignoreUnusedDeps`. */
-    features?: {
-        ignoreUnusedDeps?: boolean;
-    };
 }
 /** Federation options the builder already computed (subset NF's `fedOptions` provides). */
 export interface FederationOptions {

package/src/tools/mf/build-for-federation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-for-federation.d.ts","sourceRoot":"","sources":["../../../../src/tools/mf/build-for-federation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAQlE,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC/C,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,sFAAsF;IACtF,QAAQ,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3C;AAED,2FAA2F;AAC3F,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,+GAA+G;IAC/G,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;CACnD;AAED,wFAAwF;AACxF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AA4BD,2CAA2C;AAC3C,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,yBAAyB,GAAG,iBAAiB,CAAC;IAC9D,OAAO,EAAE,cAAc,CAAC;CACzB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,mBAAmB;IAClC,uEAAuE;IACvE,KAAK,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACnC,gFAAgF;IAChF,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7D,2EAA2E;IAC3E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,iBAAiB,EAC7B,SAAS,EAAE,MAAM,EAAE,EACnB,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,mBAAmB,CAAC,CAuD9B"}
+{"version":3,"file":"build-for-federation.d.ts","sourceRoot":"","sources":["../../../../src/tools/mf/build-for-federation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKlE,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,2FAA2F;AAC3F,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,+GAA+G;IAC/G,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,eAAe,EAAE,eAAe,CAAC,eAAe,CAAC,CAAC;CACnD;AAED,wFAAwF;AACxF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAaD,2CAA2C;AAC3C,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,yBAAyB,GAAG,iBAAiB,CAAC;IAC9D,OAAO,EAAE,cAAc,CAAC;CACzB;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,mBAAmB;IAClC,uEAAuE;IACvE,KAAK,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACnC,gFAAgF;IAChF,OAAO,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7D,2EAA2E;IAC3E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,iBAAiB,EAC7B,SAAS,EAAE,MAAM,EAAE,EACnB,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,mBAAmB,CAAC,CAmD9B"}

package/src/tools/mf/build-for-federation.js

@@ -1,33 +1,18 @@
 import { normalizeContextOptions } from '../../utils/normalize-context-options.js';
 import { createFederationEsbuildContext } from './federation-side-build.js';
-import { toExposedEntryPoints, } from './federation-entry-points.js';
-/** Shared-mappings → entry points (mirrors NF's `bundleExposedAndMappings`). */
-function toMappingEntryPoints(sharedMappings = {}) {
-    return Object.entries(sharedMappings).map(([entryPoint, mappedImport]) => ({
-        fileName: entryPoint,
-        outName: mappedImport.replace(/[^A-Za-z0-9]/g, '_') + '.js',
-        key: mappedImport,
-    }));
-}
-/** NF normalized config → the MF plugin's `FederationConfigInput` (exposes value → file path). */
+import { toExposedEntryPoints } from './federation-entry-points.js';
+/** MF config → the MF plugin's `FederationConfigInput` (exposes values are already source paths). */
 function toFederationConfigInput(config) {
-    const exposes = {};
-    for (const [key, expose] of Object.entries(config.exposes ?? {})) {
-        exposes[key] = expose.file;
-    }
     return {
         name: config.name,
         filename: config.filename,
-        exposes,
+        exposes: config.exposes,
         shared: config.shared,
         remotes: config.remotes,
     };
 }
 export async function createMfFederationBuilder(config, fedOptions, externals, ctx) {
-    const entryPoints = [
-        ...toMappingEntryPoints(config.sharedMappings),
-        ...toExposedEntryPoints(config.exposes),
-    ];
+    const entryPoints = toExposedEntryPoints(config.exposes);
     const options = normalizeContextOptions(ctx.builderOptions, ctx.context, {
         entryPoints,
         outdir: fedOptions.outputPath,
@@ -35,10 +20,9 @@ export async function createMfFederationBuilder(config, fedOptions, externals, c
         external: externals,
         dev: !!fedOptions.dev,
         watch: fedOptions.watch,
-        mappedPaths: config.sharedMappings ?? {},
-        chunks: config.chunks,
+        mappedPaths: {},
         hash: !fedOptions.dev,
-        optimizedMappings: !!config.features?.ignoreUnusedDeps,
+        optimizedMappings: false,
         isMappingOrExposed: true,
         cache: fedOptions.federationCache,
     });

package/src/tools/mf/federation-entry-points.d.ts

@@ -9,15 +9,9 @@ export interface FederationEntryPoint {
     outName: string;
     key?: string;
 }
-/** A config `exposes` entry — only the source `file` is needed to build it. */
-export interface ExposeInput {
-    file: string;
-}
 /**
- * Derive the side-build entry points from a federation config's `exposes`
- * (M2.1). Mirrors NF's `bundleExposedAndMappings`:
- * `{ fileName: expose.file, outName: key + '.js', key }`. Shared-mappings
- * entries (if still used) are concatenated by the caller.
+ * Derive the side-build entry points from a federation config's `exposes`, whose
+ * values are source-path strings: `{ fileName: sourcePath, outName: key + '.js', key }`.
  */
-export declare function toExposedEntryPoints(exposes?: Record<string, ExposeInput>): FederationEntryPoint[];
+export declare function toExposedEntryPoints(exposes?: Record<string, string>): FederationEntryPoint[];
 //# sourceMappingURL=federation-entry-points.d.ts.map

package/src/tools/mf/federation-entry-points.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"federation-entry-points.d.ts","sourceRoot":"","sources":["../../../../src/tools/mf/federation-entry-points.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,+EAA+E;AAC/E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAM,GACxC,oBAAoB,EAAE,CAMxB"}
+{"version":3,"file":"federation-entry-points.d.ts","sourceRoot":"","sources":["../../../../src/tools/mf/federation-entry-points.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACnC,oBAAoB,EAAE,CAMxB"}

package/src/tools/mf/federation-entry-points.js

@@ -1,12 +1,10 @@
 /**
- * Derive the side-build entry points from a federation config's `exposes`
- * (M2.1). Mirrors NF's `bundleExposedAndMappings`:
- * `{ fileName: expose.file, outName: key + '.js', key }`. Shared-mappings
- * entries (if still used) are concatenated by the caller.
+ * Derive the side-build entry points from a federation config's `exposes`, whose
+ * values are source-path strings: `{ fileName: sourcePath, outName: key + '.js', key }`.
  */
 export function toExposedEntryPoints(exposes = {}) {
-    return Object.entries(exposes).map(([key, expose]) => ({
-        fileName: expose.file,
+    return Object.entries(exposes).map(([key, sourcePath]) => ({
+        fileName: sourcePath,
         outName: key + '.js',
         key,
     }));

package/src/tools/mf/load-federation-config.d.ts

@@ -0,0 +1,9 @@
+import type { NormalizedModuleFederationConfig } from '../../config/with-module-federation.js';
+/**
+ * Load the MF-shaped federation config (the default export of
+ * `federation.config.{mjs,js}`). Replaces NF's `normalizeFederationOptions`,
+ * which assumed the NF shape (`features`, `sharedMappings`, object `exposes`)
+ * and crashed on the MF config.
+ */
+export declare function loadFederationConfig(workspaceRoot: string, federationConfig: string): Promise<NormalizedModuleFederationConfig>;
+//# sourceMappingURL=load-federation-config.d.ts.map

package/src/tools/mf/load-federation-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"load-federation-config.d.ts","sourceRoot":"","sources":["../../../../src/tools/mf/load-federation-config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAE/F;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,gCAAgC,CAAC,CAkB3C"}

package/src/tools/mf/load-federation-config.js

@@ -0,0 +1,20 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { pathToFileURL } from 'url';
+/**
+ * Load the MF-shaped federation config (the default export of
+ * `federation.config.{mjs,js}`). Replaces NF's `normalizeFederationOptions`,
+ * which assumed the NF shape (`features`, `sharedMappings`, object `exposes`)
+ * and crashed on the MF config.
+ */
+export async function loadFederationConfig(workspaceRoot, federationConfig) {
+    const fullConfigPath = path.join(workspaceRoot, federationConfig);
+    if (!fs.existsSync(fullConfigPath)) {
+        throw new Error('Expected ' + fullConfigPath);
+    }
+    const loaded = (await import(pathToFileURL(fullConfigPath).href));
+    if (!loaded?.default) {
+        throw new Error(`Federation config at ${fullConfigPath} must have a default export (the result of withModuleFederation).`);
+    }
+    return loaded.default;
+}

package/src/tools/mf/to-plugin-config.d.ts

@@ -25,7 +25,9 @@ export interface FederationSharedInput {
     requiredVersion?: string;
     version?: string;
     eager?: boolean;
-    includeSecondaries?: boolean;
+    includeSecondaries?: boolean | {
+        skip?: string | string[];
+    };
 }
 /**
  * Map a normalized federation config → `moduleFederationPlugin` options (the

package/src/tools/mf/to-plugin-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"to-plugin-config.d.ts","sourceRoot":"","sources":["../../../../src/tools/mf/to-plugin-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAEhF;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;AAG1E;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8EAA8E;IAC9E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAqBD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,qBAAqB,EAC1B,QAAQ,SAAmB,GAC1B,cAAc,CAQhB"}
+{"version":3,"file":"to-plugin-config.d.ts","sourceRoot":"","sources":["../../../../src/tools/mf/to-plugin-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAEhF;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;AAG1E;;;;;GAKG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8EAA8E;IAC9E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CAC7D;AAqBD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,qBAAqB,EAC1B,QAAQ,SAAmB,GAC1B,cAAc,CAQhB"}

package/src/tools/mf/to-plugin-config.js

@@ -9,8 +9,8 @@ function mapShared(shared) {
             requiredVersion: cfg.requiredVersion ?? '*',
             version: cfg.version,
             eager: cfg.eager,
-            // ✅ Spike-confirmed (finding #4): the esbuild plugin DOES support
-            // `includeSecondaries` — so it maps 1:1, contra M3.1's table.
+            // Plugin types narrow to `boolean`, but `getSecondaries` accepts the
+            // `{ skip }` object form too — pass through as-is.
             includeSecondaries: cfg.includeSecondaries,
         };
     }