@softarc/native-federation 4.1.0 → 4.1.1

package/package.json

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

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

@@ -15,7 +15,7 @@ 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,
         },

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 = [];
@@ -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 '';
 }