@softarc/native-federation 4.1.0 → 4.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "type": "module",
   "license": "MIT",
   "dependencies": {

package/src/config.d.ts

@@ -1,4 +1,4 @@
 export * from './lib/domain/config/index.js';
 export { withNativeFederation } from './lib/config/with-native-federation.js';
-export { findRootTsConfigJson, share, shareAll } from './lib/config/share-utils.js';
+export { findRootTsConfigJson, share, shareAll, setInferVersion, } from './lib/config/share-utils.js';
 export { DEFAULT_SKIP_LIST } from './lib/config/default-skip-list.js';

package/src/config.js

@@ -1,4 +1,4 @@
 export * from './lib/domain/config/index.js';
 export { withNativeFederation } from './lib/config/with-native-federation.js';
-export { findRootTsConfigJson, share, shareAll } from './lib/config/share-utils.js';
+export { findRootTsConfigJson, share, shareAll, setInferVersion, } from './lib/config/share-utils.js';
 export { DEFAULT_SKIP_LIST } from './lib/config/default-skip-list.js';

package/src/lib/config/share-utils.js

@@ -264,7 +264,8 @@ export function share(configuredShareObjects, projectPath = '', skipList = DEFAU
         includeSecondaries = false;
         const shareObject = shareObjects[key];
         if (shareObject.requiredVersion === 'auto' ||
-            (inferVersion && typeof shareObject.requiredVersion === 'undefined')) {
+            (inferVersion && typeof shareObject.requiredVersion === 'undefined') ||
+            shareObject.requiredVersion.length < 1) {
             const version = lookupVersion(key, projectPath);
             shareObject.requiredVersion = version;
             shareObject.version = version.replace(/^\D*/, '');

package/src/lib/config/with-native-federation.js

@@ -15,9 +15,10 @@ export function withNativeFederation(config) {
         skip,
         externals: config.externals ?? [],
         features: {
-            mappingVersion: config.features?.mappingVersion ?? false,
+            mappingVersion: config.features?.mappingVersion ?? true,
             ignoreUnusedDeps: config.features?.ignoreUnusedDeps ?? true,
             denseChunking: config.features?.denseChunking ?? false,
+            integrityHashes: config.features?.integrityHashes ?? false,
         },
         ...(config.shareScope && { shareScope: config.shareScope }),
     };

package/src/lib/core/build-for-federation.js

@@ -87,7 +87,7 @@ export async function buildForFederation(config, fedOptions, externals, signal)
     if (artifactInfo?.chunks) {
         federationInfo.chunks = { ...(federationInfo.chunks ?? {}), ...artifactInfo?.chunks };
     }
-    if (fedOptions.integrity) {
+    if (config.features.integrityHashes) {
         federationInfo.integrity = {
             ...(fedOptions.federationCache.integrity ?? {}),
             ...(artifactInfo?.integrity ?? {}),

package/src/lib/core/bundle-exposed-and-mappings.d.ts

@@ -4,3 +4,4 @@ import { type NormalizedFederationOptions } from '../domain/core/federation-opti
 export declare function bundleExposedAndMappings(config: NormalizedFederationConfig, fedOptions: NormalizedFederationOptions, externals: string[], modifiedFiles?: string[], signal?: AbortSignal): Promise<ArtifactInfo>;
 export declare function describeExposed(config: NormalizedFederationConfig, options: NormalizedFederationOptions): Array<ExposesInfo>;
 export declare function describeSharedMappings(config: NormalizedFederationConfig, fedOptions: NormalizedFederationOptions): Array<SharedInfo>;
+export declare function getMappingVersion(fileName: string, workspaceRoot: string): string;

package/src/lib/core/bundle-exposed-and-mappings.js

@@ -65,19 +65,7 @@ export async function bundleExposedAndMappings(config, fedOptions, externals, mo
     // Pick shared-mappings
     for (const item of shared) {
         const distEntryFile = popFromResultMap(resultMap, item.outName);
-        sharedResult.push({
-            packageName: item.key,
-            outFileName: path.basename(distEntryFile),
-            requiredVersion: '',
-            singleton: true,
-            strictVersion: false,
-            version: config.features.mappingVersion ? getMappingVersion(item.fileName) : '',
-            dev: !fedOptions.dev
-                ? undefined
-                : {
-                    entryPoint: normalize(path.normalize(item.fileName)),
-                },
-        });
+        sharedResult.push(toSharedMappingInfo(item.fileName, item.key, path.basename(distEntryFile), config, fedOptions));
         entryFiles.push(distEntryFile);
     }
     const exposedResult = [];
@@ -112,7 +100,7 @@ export async function bundleExposedAndMappings(config, fedOptions, externals, mo
     }
     // Must run after rewriteChunkImports so SRI matches the final on-disk bytes.
     let integrity;
-    if (fedOptions.integrity) {
+    if (config.features.integrityHashes) {
         integrity = {};
         for (const filePath of [...entryFiles, ...chunkPaths]) {
             if (!fs.existsSync(filePath))
@@ -141,30 +129,46 @@ export function describeExposed(config, options) {
 export function describeSharedMappings(config, fedOptions) {
     const result = [];
     for (const [mappedPath, mappedImport] of Object.entries(config.sharedMappings)) {
-        result.push({
-            packageName: mappedImport,
-            outFileName: '',
-            requiredVersion: '',
-            singleton: true,
-            strictVersion: false,
-            version: config.features.mappingVersion ? getMappingVersion(mappedPath) : '',
-            dev: !fedOptions.dev
-                ? undefined
-                : {
-                    entryPoint: normalize(path.normalize(mappedPath)),
-                },
-        });
+        result.push(toSharedMappingInfo(mappedPath, mappedImport, '', config, fedOptions));
     }
     return result;
 }
-function getMappingVersion(fileName) {
-    const entryFileDir = path.dirname(fileName);
-    const cand1 = path.join(entryFileDir, 'package.json');
-    const cand2 = path.join(path.dirname(entryFileDir), 'package.json');
-    const packageJsonPath = [cand1, cand2].find(cand => fs.existsSync(cand));
-    if (packageJsonPath) {
-        const json = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
-        return json.version ?? '';
+function toSharedMappingInfo(mappedPath, mappedImport, outFileName, config, fedOptions) {
+    const mappingVersion = config.features.mappingVersion
+        ? getMappingVersion(mappedPath, fedOptions.workspaceRoot)
+        : '';
+    return {
+        packageName: mappedImport,
+        outFileName,
+        requiredVersion: mappingVersion.length > 0 ? '~' + mappingVersion : '',
+        singleton: true,
+        strictVersion: config.features.mappingVersion,
+        version: mappingVersion,
+        dev: !fedOptions.dev
+            ? undefined
+            : {
+                entryPoint: normalize(path.normalize(mappedPath)),
+            },
+    };
+}
+export function getMappingVersion(fileName, workspaceRoot) {
+    const resolvedRoot = path.resolve(workspaceRoot);
+    let dir = path.dirname(path.resolve(fileName));
+    while (true) {
+        const candidate = path.join(dir, 'package.json');
+        try {
+            const json = JSON.parse(fs.readFileSync(candidate, 'utf-8'));
+            if (typeof json.version === 'string' && json.version)
+                return json.version;
+        }
+        catch (err) {
+            if (err.code !== 'ENOENT') {
+                logger.warn(`[getMappingVersion] Failed to parse ${candidate}: ${err.message}`);
+            }
+        }
+        const parent = path.dirname(dir);
+        if (dir === resolvedRoot || parent === dir)
+            return '';
+        dir = parent;
     }
-    return '';
 }

package/src/lib/core/bundle-shared.js

@@ -22,7 +22,7 @@ export async function bundleShared(sharedBundles, config, fedOptions, externals,
             logger.debug(`Checksum of ${buildOptions.bundleName} matched, Skipped artifact bundling`);
             bundleCache.copyFiles(path.join(fedOptions.workspaceRoot, fedOptions.outputPath));
             let integrity = cacheMetadata.integrity;
-            if (fedOptions.integrity && !integrity) {
+            if (config.features.integrityHashes && !integrity) {
                 integrity = computeIntegrityForFiles(cacheMetadata.files, fedOptions.federationCache.cachePath);
             }
             return {
@@ -122,7 +122,7 @@ export async function bundleShared(sharedBundles, config, fedOptions, externals,
     }
     const persistedFiles = bundleResult.map(r => r.fileName.split(path.sep).pop() ?? r.fileName);
     // Must run after rewriteImports so SRI matches the bytes copied to dist.
-    const integrity = fedOptions.integrity
+    const integrity = config.features.integrityHashes
         ? computeIntegrityForFiles(persistedFiles, fedOptions.federationCache.cachePath)
         : undefined;
     bundleCache.persist({

package/src/lib/core/rebuild-for-federation.js

@@ -31,7 +31,7 @@ export async function rebuildForFederation(config, fedOptions, externals, modifi
     if (artifactInfo?.chunks) {
         federationInfo.chunks = { ...(federationInfo.chunks ?? {}), ...artifactInfo?.chunks };
     }
-    if (fedOptions.integrity) {
+    if (config.features.integrityHashes) {
         federationInfo.integrity = {
             ...(federationCache.integrity ?? {}),
             ...(artifactInfo?.integrity ?? {}),

package/src/lib/domain/config/federation-config.contract.d.ts

@@ -15,6 +15,7 @@ export interface FederationConfig {
         mappingVersion?: boolean;
         ignoreUnusedDeps?: boolean;
         denseChunking?: boolean;
+        integrityHashes?: boolean;
     };
 }
 export interface NormalizedFederationConfig {
@@ -31,5 +32,6 @@ export interface NormalizedFederationConfig {
         mappingVersion: boolean;
         ignoreUnusedDeps: boolean;
         denseChunking: boolean;
+        integrityHashes: boolean;
     };
 }

package/src/lib/domain/core/federation-options.contract.d.ts

@@ -13,7 +13,6 @@ export interface FederationOptions {
     packageJson?: string;
     entryPoints?: string[];
     buildNotifications?: BuildNotificationOptions;
-    integrity?: boolean;
 }
 export interface NormalizedFederationOptions<TBundlerCache = unknown> extends FederationOptions {
     federationCache: FederationCache<TBundlerCache>;