Merge pull request #902 from asollberger/bug/skip-list

fix(skip-list): fixed the handling and passing of the skip list

Author: Aukevanoost

.gitignore

@@ -16,6 +16,7 @@ node_modules
 *.launch
 .settings/
 *.sublime-workspace
+.tool-versions
 
 # IDE - VSCode
 .vscode/*

libs/mf/rspack.ts

@@ -1,6 +1,6 @@
 export * from './src/rspack';
 export {
-  DEFAULT_SECONARIES_SKIP_LIST,
+  DEFAULT_SECONDARIES_SKIP_LIST,
   DEFAULT_SKIP_LIST,
   SharedMappings,
   findRootTsConfigJson,

libs/mf/src/schematics/init-webpack/schematic.ts

@@ -146,7 +146,7 @@ function nxBuildersAvailable(tree: Tree): boolean {
   return true;
 }
 
-function infereNxBuilderNames(tree: Tree): { dev: string; prod: string } {
+function inferNxBuilderNames(tree: Tree): { dev: string; prod: string } {
   const dep = getPackageJsonDependency(tree, '@nx/angular');
 
   const useDevServer =
@@ -334,7 +334,7 @@ export default function config(options: MfSchematicSchema): Rule {
       options.nxBuilders = nxBuildersAvailable(tree); // tree.exists('nx.json');
     }
 
-    const nxBuilderNames = infereNxBuilderNames(tree);
+    const nxBuilderNames = inferNxBuilderNames(tree);
 
     if (options.nxBuilders) {
       console.log('Using Nx builders!');
@@ -354,7 +354,7 @@ export default function config(options: MfSchematicSchema): Rule {
 
     if (!projectConfig?.architect?.build || !projectConfig?.architect?.serve) {
       throw new Error(
-        `The project doen't have a build or serve target in angular.json!`
+        `The project doesn't have a build or serve target in angular.json!`
       );
     }
 

libs/mf/src/utils/share-utils.ts

@@ -15,7 +15,7 @@ export const DEFAULT_SKIP_LIST = [
   'zone.js',
 ];
 
-export const DEFAULT_SECONARIES_SKIP_LIST = [
+export const DEFAULT_SECONDARIES_SKIP_LIST = [
   '@angular/router/upgrade',
   '@angular/common/upgrade',
 ];
@@ -135,7 +135,7 @@ function getSecondaries(
   packagePath: string,
   key: string,
   shareObject: SharedConfig,
-  exclude = [...DEFAULT_SECONARIES_SKIP_LIST]
+  exclude = [...DEFAULT_SECONDARIES_SKIP_LIST]
 ): Record<string, SharedConfig> {
   if (typeof includeSecondaries === 'object') {
     if (Array.isArray(includeSecondaries.skip)) {
@@ -217,7 +217,7 @@ function readConfiguredSecondaries(
 
 export function shareAll(
   config: CustomSharedConfig = {},
-  skip: string[] = [...DEFAULT_SKIP_LIST, ...DEFAULT_SECONARIES_SKIP_LIST],
+  skip: string[] = [...DEFAULT_SKIP_LIST, ...DEFAULT_SECONDARIES_SKIP_LIST],
   packageJsonPath = ''
 ): Config {
   if (!packageJsonPath) {
@@ -247,7 +247,7 @@ export function setInferVersion(infer: boolean): void {
 export function share(
   shareObjects: Config,
   packageJsonPath = '',
-  skip: string[] = DEFAULT_SECONARIES_SKIP_LIST
+  skip: string[] = DEFAULT_SECONDARIES_SKIP_LIST
 ): Config {
   if (!packageJsonPath) {
     packageJsonPath = cwd();

libs/mf/src/utils/with-mf-plugin.ts

@@ -1,5 +1,5 @@
 import {
-  DEFAULT_SECONARIES_SKIP_LIST,
+  DEFAULT_SECONDARIES_SKIP_LIST,
   DEFAULT_SKIP_LIST,
   findRootTsConfigJson,
   shareAll,
@@ -15,7 +15,7 @@ export function withModuleFederationPlugin(config: unknown) {
 
   const skip = [
     ...DEFAULT_SKIP_LIST,
-    ...DEFAULT_SECONARIES_SKIP_LIST,
+    ...DEFAULT_SECONDARIES_SKIP_LIST,
     ...(config['skip'] || []),
   ];
 

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

@@ -5,7 +5,6 @@ import { SharedConfig } from './federation-config';
 import {
   DEFAULT_SKIP_LIST,
   isInSkipList,
-  PREPARED_DEFAULT_SKIP_LIST,
   PreparedSkipList,
   prepareSkipList,
   SkipList,
@@ -17,7 +16,6 @@ import {
 } from '../utils/package-info';
 import { getConfigContext } from './configuration-context';
 import { logger } from '../utils/logger';
-import { resolveGlobSync } from '../utils/resolve-glob';
 
 import {
   KeyValuePair,
@@ -26,7 +24,7 @@ import {
 
 let inferVersion = false;
 
-export const DEFAULT_SECONARIES_SKIP_LIST = [
+export const DEFAULT_SECONDARIES_SKIP_LIST = [
   '@angular/router/upgrade',
   '@angular/common/upgrade',
 ];
@@ -110,7 +108,8 @@ function _findSecondaries(
   libPath: string,
   excludes: string[],
   shareObject: SharedConfig,
-  acc: Record<string, SharedConfig>
+  acc: Record<string, SharedConfig>,
+  preparedSkipList: PreparedSkipList
 ): void {
   const files = fs.readdirSync(libPath);
 
@@ -129,34 +128,36 @@ function _findSecondaries(
         continue;
       }
 
-      if (isInSkipList(secondaryLibName, PREPARED_DEFAULT_SKIP_LIST)) {
+      if (isInSkipList(secondaryLibName, preparedSkipList)) {
         continue;
       }
 
       acc[secondaryLibName] = { ...shareObject };
     }
 
-    _findSecondaries(s, excludes, shareObject, acc);
+    _findSecondaries(s, excludes, shareObject, acc, preparedSkipList);
   }
 }
 
 function findSecondaries(
   libPath: string,
   excludes: string[],
-  shareObject: SharedConfig
+  shareObject: SharedConfig,
+  preparedSkipList: PreparedSkipList
 ): Record<string, SharedConfig> {
   const acc = {} as Record<string, SharedConfig>;
-  _findSecondaries(libPath, excludes, shareObject, acc);
+  _findSecondaries(libPath, excludes, shareObject, acc, preparedSkipList);
   return acc;
 }
 
 function getSecondaries(
   includeSecondaries: IncludeSecondariesOptions,
   libPath: string,
   key: string,
-  shareObject: SharedConfig
+  shareObject: SharedConfig,
+  preparedSkipList: PreparedSkipList
 ): Record<string, SharedConfig> | null {
-  let exclude = [...DEFAULT_SECONARIES_SKIP_LIST];
+  let exclude = [...DEFAULT_SECONDARIES_SKIP_LIST];
 
   if (typeof includeSecondaries === 'object') {
     if (Array.isArray(includeSecondaries.skip)) {
@@ -176,22 +177,29 @@ function getSecondaries(
     key,
     libPath,
     exclude,
-    shareObject
+    shareObject,
+    preparedSkipList
   );
   if (configured) {
     return configured;
   }
 
   // Fallback: Search folders
-  const secondaries = findSecondaries(libPath, exclude, shareObject);
+  const secondaries = findSecondaries(
+    libPath,
+    exclude,
+    shareObject,
+    preparedSkipList
+  );
   return secondaries;
 }
 
 function readConfiguredSecondaries(
   parent: string,
   libPath: string,
   exclude: string[],
-  shareObject: SharedConfig
+  shareObject: SharedConfig,
+  preparedSkipList: PreparedSkipList
 ): Record<string, SharedConfig> | null {
   const libPackageJson = path.join(libPath, 'package.json');
 
@@ -232,7 +240,7 @@ function readConfiguredSecondaries(
       continue;
     }
 
-    if (isInSkipList(secondaryName, PREPARED_DEFAULT_SKIP_LIST)) {
+    if (isInSkipList(secondaryName, preparedSkipList)) {
       continue;
     }
 
@@ -350,10 +358,9 @@ export function shareAll(
 
   const versionMaps = getVersionMaps(projectPath, projectPath);
   const share: Record<string, unknown> = {};
+  const preparedSkipList = prepareSkipList(skip);
 
   for (const versions of versionMaps) {
-    const preparedSkipList = prepareSkipList(skip);
-
     for (const key in versions) {
       if (isInSkipList(key, preparedSkipList)) {
         continue;
@@ -561,7 +568,8 @@ export function share(
         includeSecondaries,
         libPath,
         key,
-        shareObject
+        shareObject,
+        preparedSkipList
       );
       if (secondaries) {
         addSecondaries(secondaries, result);

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

@@ -36,7 +36,7 @@ export async function buildForFederation(
   let artefactInfo: ArtefactInfo | undefined;
 
   if (!buildParams.skipMappingsAndExposed) {
-    let start = process.hrtime();
+    const start = process.hrtime();
     artefactInfo = await bundleExposedAndMappings(
       config,
       fedOptions,

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

@@ -76,8 +76,8 @@ export async function bundleExposedAndMappings(
       dev: !fedOptions.dev
         ? undefined
         : {
-          entryPoint: normalize(path.normalize(item.fileName)),
-        },
+            entryPoint: normalize(path.normalize(item.fileName)),
+          },
     });
   }
 
@@ -90,10 +90,10 @@ export async function bundleExposedAndMappings(
       dev: !fedOptions.dev
         ? undefined
         : {
-          entryPoint: normalize(
-            path.join(fedOptions.workspaceRoot, item.fileName)
-          ),
-        },
+            entryPoint: normalize(
+              path.join(fedOptions.workspaceRoot, item.fileName)
+            ),
+          },
     });
   }
 
@@ -117,8 +117,8 @@ export function describeExposed(
       dev: !options.dev
         ? undefined
         : {
-          entryPoint: localPath,
-        },
+            entryPoint: localPath,
+          },
     });
   }
 
@@ -142,8 +142,8 @@ export function describeSharedMappings(
       dev: !fedOptions.dev
         ? undefined
         : {
-          entryPoint: normalize(path.normalize(m.path)),
-        },
+            entryPoint: normalize(path.normalize(m.path)),
+          },
     });
   }
 

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

@@ -37,7 +37,7 @@ export async function bundleShared(
 
   fs.mkdirSync(cachePath, { recursive: true });
 
-  const inferedPackageInfos = Object.keys(sharedBundles)
+  const inferredPackageInfos = Object.keys(sharedBundles)
     .filter((packageName) => !sharedBundles[packageName].packageInfo)
     .map((packageName) => getPackageInfo(packageName, folder))
     .filter((pi) => !!pi) as PackageInfo[];
@@ -49,7 +49,7 @@ export async function bundleShared(
       ...sharedBundles[packageName].packageInfo,
     })) as PackageInfo[];
 
-  const packageInfos = [...inferedPackageInfos, ...configuredPackageInfos];
+  const packageInfos = [...inferredPackageInfos, ...configuredPackageInfos];
 
   const configState =
     'BUNDLER_CHUNKS' + // TODO: Replace this with lib version

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

@@ -28,8 +28,6 @@ export const DEFAULT_SKIP_LIST: SkipList = [
   // (pkg) => pkg.startsWith('@angular/common/locales'),
 ];
 
-export const PREPARED_DEFAULT_SKIP_LIST = prepareSkipList(DEFAULT_SKIP_LIST);
-
 export type PreparedSkipList = {
   strings: Set<string>;
   functions: SkipFn[];