feat(nf-core): don't create tsconfig.federation.ts when ignoreUnusedDeps is activated

Author: manfredsteyer

libs/native-federation-core/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@softarc/native-federation",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "type": "commonjs",
   "license": "MIT",
   "dependencies": {
     "json5": "^2.2.0",
     "chalk": "^4.1.2",
-    "@softarc/native-federation-runtime": "3.1.1"
+    "@softarc/native-federation-runtime": "3.2.0",
+    "fast-glob": "^3.3.3"
   },
   "peerDependencies": {
     "@softarc/sheriff-core": "^0.18.0"

libs/native-federation-core/src/lib/config/share-utils.ts

@@ -19,6 +19,11 @@ import { getConfigContext } from './configuration-context';
 import { logger } from '../utils/logger';
 import { resolveGlobSync } from '../utils/resolve-glob';
 
+import {
+  KeyValuePair,
+  resolveWildcardKeys,
+} from '../utils/resolve-wildcard-keys';
+
 let inferVersion = false;
 
 export const DEFAULT_SECONARIES_SKIP_LIST = [
@@ -195,6 +200,10 @@ function readConfiguredSecondaries(
   }
 
   const packageJson = JSON.parse(fs.readFileSync(libPackageJson, 'utf-8'));
+
+  const version = packageJson['version'] as string;
+  const esm = packageJson['type'] === 'module';
+
   const exports = packageJson['exports'] as Record<
     string,
     Record<string, string>
@@ -242,12 +251,29 @@ function readConfiguredSecondaries(
       continue;
     }
 
-    const items = resolveSecondaries(key, libPath, parent, secondaryName);
+    const items = resolveSecondaries(
+      key,
+      libPath,
+      parent,
+      secondaryName,
+      entry
+    );
 
     for (const item of items) {
-      result[item] = {
-        ...shareObject,
-      };
+      if (typeof item === 'object') {
+        result[item.key] = {
+          ...shareObject,
+          packageInfo: {
+            entryPoint: item.value,
+            version: shareObject.version ?? version,
+            esm
+          },
+        };
+      } else {
+        result[item] = {
+          ...shareObject,
+        };
+      }
     }
   }
 
@@ -258,13 +284,16 @@ function resolveSecondaries(
   key: string,
   libPath: string,
   parent: string,
-  secondaryName: string
-) {
-  let items = [];
+  secondaryName: string,
+  entry: string
+): Array<string | KeyValuePair> {
+  let items: Array<string | KeyValuePair> = [];
   if (key.includes('*')) {
-    items = resolveGlobSync(key, libPath).map((e) =>
-      path.join(parent, e.substring(libPath.length))
-    );
+    const expanded = resolveWildcardKeys(key, entry, libPath);
+    items = expanded.map((e) => ({
+      key: path.join(parent, e.key),
+      value: path.join(libPath, e.value),
+    }));
   } else {
     items = [secondaryName];
   }

libs/native-federation-core/src/lib/config/with-native-federation.ts

@@ -18,7 +18,7 @@ export function withNativeFederation(
 ): NormalizedFederationConfig {
   const skip = prepareSkipList(config.skip ?? []);
 
-  return {
+  const normalized = {
     name: config.name ?? '',
     exposes: config.exposes ?? {},
     shared: normalizeShared(config, skip),
@@ -30,6 +30,31 @@ export function withNativeFederation(
       ignoreUnusedDeps: config.features?.ignoreUnusedDeps ?? false,
     },
   };
+
+  // This is for being backwards compatible
+  if (!normalized.features.ignoreUnusedDeps) {
+    normalized.shared = filterShared(normalized.shared);
+  }
+
+  return normalized;
+}
+
+function filterShared(
+  shared: Record<string, NormalizedSharedConfig>
+): Record<string, NormalizedSharedConfig> {
+  const keys = Object.keys(shared).filter(
+    (k) => !k.startsWith('@angular/common/locales')
+  );
+
+  const filtered = keys.reduce(
+    (acc, curr) => ({
+      ...acc,
+      [curr]: shared[curr],
+    }),
+    {}
+  );
+
+  return filtered;
 }
 
 function normalizeShared(

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

@@ -31,6 +31,7 @@ export interface BuildAdapterOptions {
   kind: BuildKind;
   hash: boolean;
   platform?: 'browser' | 'node';
+  optimizedMappings?: boolean
 }
 
 export interface BuildResult {

libs/native-federation-core/src/lib/core/bundle-exposed-and-mappings.ts

@@ -50,6 +50,7 @@ export async function bundleExposedAndMappings(
     mappedPaths: config.sharedMappings,
     kind: 'mapping-or-exposed',
     hash,
+    optimizedMappings: config.features.ignoreUnusedDeps
   });
 
   const resultMap = createBuildResultMap(result, hash);

libs/native-federation-core/src/lib/core/bundle-shared.ts

@@ -99,6 +99,7 @@ export async function bundleShared(
       kind: 'shared-package',
       hash: false,
       platform,
+      optimizedMappings: config.features.ignoreUnusedDeps
     });
 
     const cachedFiles = bundleResult.map((br) => path.basename(br.fileName));

libs/native-federation-core/src/lib/core/default-skip-list.ts

@@ -16,20 +16,22 @@ export const DEFAULT_SKIP_LIST: SkipList = [
   '@angular/localize',
   '@angular/localize/init',
   '@angular/localize/tools',
-  (pkg) => pkg.startsWith('@angular/common/locales'),
   (pkg) => pkg.startsWith('rxjs/internal'),
   // '@angular/platform-server',
   // '@angular/platform-server/init',
   // '@angular/ssr',
-  'express',
   /\/schematics(\/|$)/,
   /^@nx\/angular/,
   (pkg) => pkg.startsWith('@angular/') && !!pkg.match(/\/testing(\/|$)/),
   (pkg) => pkg.startsWith('@types/'),
+  'express',
+  // (pkg) => pkg.startsWith('@angular/common/locales'),
+
 ];
 
 export const PREPARED_DEFAULT_SKIP_LIST = prepareSkipList(DEFAULT_SKIP_LIST);
 
+
 export type PreparedSkipList = {
   strings: Set<string>;
   functions: SkipFn[];

libs/native-federation-core/src/lib/utils/resolve-wildcard-keys.ts

@@ -0,0 +1,74 @@
+import fg from 'fast-glob';
+
+export type KeyValuePair = {
+  key: string;
+  value: string;
+};
+
+function escapeRegex(str: string) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function compilePattern(pattern: string) {
+  const tokens = pattern.split(/(\*\*|\*)/);
+  const regexParts = [];
+
+  for (const token of tokens) {
+    if (token === '*') {
+      regexParts.push('([^/]+)');
+    } else if (token === '**') {
+      regexParts.push('(.*)');
+    } else {
+      regexParts.push(escapeRegex(token));
+    }
+  }
+
+  return new RegExp(`^${regexParts.join('')}$`);
+}
+
+function applyWildcards(template: string, wildcardValues: string[]) {
+  const tokens = template.split(/(\*\*|\*)/);
+  let result = '';
+  let i = 0;
+  for (const token of tokens) {
+    if (token === '*' || token === '**') {
+      result += wildcardValues[i++];
+    } else {
+      result += token;
+    }
+  }
+  return result;
+}
+
+export function resolveWildcardKeys(
+  keyPattern: string,
+  valuePattern: string,
+  cwd: string
+): KeyValuePair[] {
+  const normalizedPattern = valuePattern.replace(/^\.?\/+/, '');
+  const regex = compilePattern(normalizedPattern);
+
+  const files = fg.sync(valuePattern, {
+    cwd,
+    onlyFiles: true,
+  });
+
+  const keys: KeyValuePair[] = [];
+
+  for (const file of files) {
+    const relPath = file.replace(/\\/g, '/').replace(/^\.\//, '');
+
+    const match = relPath.match(regex);
+    if (!match) {
+      continue;
+    }
+
+    const wildcards = match.slice(1);
+    const key = applyWildcards(keyPattern, wildcards);
+
+    // Change this:
+    keys.push({ key, value: relPath });
+  }
+
+  return keys;
+}

libs/native-federation-esbuild/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-esbuild",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "type": "commonjs",
   "dependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",

libs/native-federation-node/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@softarc/native-federation-node",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "license": "MIT"
 }