fix: consistent package names

Author: Aukevanoost

libs/native-federation-core/src/lib/core/build-for-federation.ts

@@ -15,7 +15,7 @@ import { writeFederationInfo } from './write-federation-info';
 import { writeImportMap } from './write-import-map';
 import { logger } from '../utils/logger';
 import { getCachePath } from './bundle-caching';
-import { normalizeFilename } from '../utils/normalize';
+import { normalizePackageName } from '../utils/normalize';
 import { AbortedError } from '../utils/errors';
 
 export interface BuildParams {
@@ -35,7 +35,7 @@ export async function buildForFederation(
   config: NormalizedFederationConfig,
   fedOptions: FederationOptions,
   externals: string[],
-  buildParams = defaultBuildParams,
+  buildParams = defaultBuildParams
 ): Promise<FederationInfo> {
   const signal = buildParams.signal;
 
@@ -47,33 +47,33 @@ export async function buildForFederation(
       config,
       fedOptions,
       externals,
-      signal,
+      signal
     );
     logger.measure(
       start,
-      '[build artifacts] - To bundle all mappings and exposed.',
+      '[build artifacts] - To bundle all mappings and exposed.'
     );
 
     if (signal?.aborted)
       throw new AbortedError(
-        '[buildForFederation] After exposed-and-mappings bundle',
+        '[buildForFederation] After exposed-and-mappings bundle'
       );
   }
 
   const exposedInfo = !artefactInfo
     ? describeExposed(config, fedOptions)
     : artefactInfo.exposes;
 
-  const cacheProjectFolder = normalizeFilename(config.name);
+  const cacheProjectFolder = normalizePackageName(config.name);
   if (cacheProjectFolder.length < 1) {
     logger.warn(
-      "Project name in 'federation.config.js' is empty, defaulting to root cache folder.",
+      "Project name in 'federation.config.js' is empty, defaulting to root cache folder."
     );
   }
 
   const pathToCache = getCachePath(
     fedOptions.workspaceRoot,
-    normalizeFilename(config.name),
+    normalizePackageName(config.name)
   );
 
   if (!buildParams.skipShared && sharedPackageInfoCache.length > 0) {
@@ -92,19 +92,19 @@ export async function buildForFederation(
         fedOptions,
         externals,
         'browser',
-        { pathToCache, bundleName: 'browser-shared' },
+        { pathToCache, bundleName: 'browser-shared' }
       );
 
       logger.measure(
         start,
-        '[build artifacts] - To bundle all shared browser externals',
+        '[build artifacts] - To bundle all shared browser externals'
       );
 
       sharedPackageInfoCache.push(...sharedPackageInfoBrowser);
 
       if (signal?.aborted)
         throw new AbortedError(
-          '[buildForFederation] After shared-browser bundle',
+          '[buildForFederation] After shared-browser bundle'
         );
     }
 
@@ -116,11 +116,11 @@ export async function buildForFederation(
         fedOptions,
         externals,
         'node',
-        { pathToCache, bundleName: 'node-shared' },
+        { pathToCache, bundleName: 'node-shared' }
       );
       logger.measure(
         start,
-        '[build artifacts] - To bundle all shared node externals',
+        '[build artifacts] - To bundle all shared node externals'
       );
       sharedPackageInfoCache.push(...sharedPackageInfoServer);
 
@@ -136,17 +136,17 @@ export async function buildForFederation(
         config,
         fedOptions,
         'browser',
-        pathToCache,
+        pathToCache
       );
       logger.measure(
         start,
-        '[build artifacts] - To bundle all separate browser externals',
+        '[build artifacts] - To bundle all separate browser externals'
       );
       sharedPackageInfoCache.push(...separatePackageInfoBrowser);
 
       if (signal?.aborted)
         throw new AbortedError(
-          '[buildForFederation] After separate-browser bundle',
+          '[buildForFederation] After separate-browser bundle'
         );
     }
 
@@ -158,11 +158,11 @@ export async function buildForFederation(
         config,
         fedOptions,
         'node',
-        pathToCache,
+        pathToCache
       );
       logger.measure(
         start,
-        '[build artifacts] - To bundle all separate node externals',
+        '[build artifacts] - To bundle all separate node externals'
       );
       sharedPackageInfoCache.push(...separatePackageInfoServer);
     }
@@ -214,13 +214,13 @@ async function bundleSeparate(
   config: NormalizedFederationConfig,
   fedOptions: FederationOptions,
   platform: 'node' | 'browser',
-  pathToCache: string,
+  pathToCache: string
 ) {
   const bundlePromises = Object.entries(separateBrowser).map(
     async ([key, shared]) => {
       const packageName = inferPackageFromSecondary(key);
       const filteredExternals = externals.filter(
-        (e) => !e.startsWith(packageName),
+        (e) => !e.startsWith(packageName)
       );
       return bundleShared(
         { [key]: shared },
@@ -230,18 +230,18 @@ async function bundleSeparate(
         platform,
         {
           pathToCache,
-          bundleName: `${platform}-${normalizeFilename(key)}`,
-        },
+          bundleName: `${platform}-${normalizePackageName(key)}`,
+        }
       );
-    },
+    }
   );
 
   const buildResults = await Promise.all(bundlePromises);
   return buildResults.flat();
 }
 
 function splitShared(
-  shared: Record<string, NormalizedSharedConfig>,
+  shared: Record<string, NormalizedSharedConfig>
 ): SplitSharedResult {
   const sharedServer: Record<string, NormalizedSharedConfig> = {};
   const sharedBrowser: Record<string, NormalizedSharedConfig> = {};

libs/native-federation-core/src/lib/core/remove-unused-deps.ts

@@ -6,6 +6,7 @@ import { NormalizedFederationConfig } from '../config/federation-config';
 import { getPackageInfo, PackageInfo } from '../utils/package-info';
 import { getExternalImports as extractExternalImports } from '../utils/get-external-imports';
 import { MappedPath } from '../utils/mapped-paths';
+import { normalizePackageName } from '../utils/normalize';
 
 export function removeUnusedDeps(
   config: NormalizedFederationConfig,
@@ -116,7 +117,7 @@ function addTransientDeps(packages: Set<string>, workspaceRoot: string) {
 }
 
 function getExternalImports(pInfo: PackageInfo, workspaceRoot: string) {
-  const encodedPackageName = pInfo.packageName.replace(/[^A-Za-z0-9]/g, '_');
+  const encodedPackageName = normalizePackageName(pInfo.packageName);
   const cacheFileName = `${encodedPackageName}-${pInfo.version}.deps.json`;
   const cachePath = path.join(
     workspaceRoot,

libs/native-federation-core/src/lib/utils/normalize.ts

@@ -16,7 +16,7 @@ export function normalize(path: string, trailingSlash?: boolean): string {
   return cand;
 }
 
-export function normalizeFilename(path: string) {
-  const sanitized = path.replace(/[^A-Za-z0-9]/g, '_');
+export function normalizePackageName(fileName: string) {
+  const sanitized = fileName.replace(/[^A-Za-z0-9]/g, '_');
   return sanitized.startsWith('_') ? sanitized.slice(1) : sanitized;
 }