Merge branch 'main' of https://github.com/angular-architects/module-f…

…ederation-plugin

libs/mf-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular-architects/module-federation-runtime",
   "license": "MIT",
-  "version": "18.0.3",
+  "version": "18.0.4",
   "peerDependencies": {
     "@angular/common": ">=18.0.0",
     "@angular/core": ">=18.0.0"

libs/mf-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation-tools",
-  "version": "18.0.3",
+  "version": "18.0.4",
   "license": "MIT",
   "peerDependencies": {},
   "dependencies": {

libs/mf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation",
-  "version": "18.0.3",
+  "version": "18.0.4",
   "license": "MIT",
   "repository": {
     "type": "GitHub",
@@ -17,7 +17,7 @@
   "schematics": "./collection.json",
   "builders": "./builders.json",
   "dependencies": {
-    "@angular-architects/module-federation-runtime": "18.0.3",
+    "@angular-architects/module-federation-runtime": "18.0.4",
     "word-wrap": "^1.2.3",
     "callsite": "^1.0.0",
     "node-fetch": "^2.6.7",

libs/mf/post-build.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 
-
 // const index = fs.readFileSync(path.join(__dirname, 'src/index.ts'), {
 //   encoding: 'utf-8',
 // });
@@ -21,14 +20,10 @@ const path = require('path');
 //   nguniversal
 // );
 
-
-const webpack2 = fs.readFileSync(
-  path.join(__dirname, 'webpack.ts'),
-  {
-    encoding: 'utf-8',
-  }
-);
+const webpack2 = fs.readFileSync(path.join(__dirname, 'webpack.ts'), {
+  encoding: 'utf-8',
+});
 fs.writeFileSync(
   path.join(__dirname, '../../dist/libs/mf/webpack.js'),
   'module.exports = require("./src/webpack.js");'
-);
+);

libs/mf/src/schematics/mf/schematic.ts

@@ -235,12 +235,18 @@ export default function config(options: MfSchematicSchema): Rule {
       buildConfig?.builder === '@angular-devkit/build-angular:application';
 
     if (isApplicationBuilder) {
-      console.warn(`\nWARNING: This package uses the tradtional webpack-based Module Federation implementation and not the fast new esbuild-based ApplicationBuilder.`)
-      console.warn(`\nFor new projects, consider Native Federation as an alternative: https://shorturl.at/0ZQ0j`)
-      console.warn(`\nHowever, if you want to add a new host or remote to an existing Module Federation-based system, this package is what you are looking for.`)
-      console.warn(`\nDo you want to proceeed: [y] Yes [n] No \n`)
+      console.warn(
+        `\nWARNING: This package uses the tradtional webpack-based Module Federation implementation and not the fast new esbuild-based ApplicationBuilder.`
+      );
+      console.warn(
+        `\nFor new projects, consider Native Federation as an alternative: https://shorturl.at/0ZQ0j`
+      );
+      console.warn(
+        `\nHowever, if you want to add a new host or remote to an existing Module Federation-based system, this package is what you are looking for.`
+      );
+      console.warn(`\nDo you want to proceeed: [y] Yes [n] No \n`);
 
-      for (; ;) {
+      for (;;) {
         const key = await readKey();
         if (key === 'Y' || key === 'y') {
           break;
@@ -249,7 +255,6 @@ export default function config(options: MfSchematicSchema): Rule {
           process.exit(0);
         }
       }
-
     }
 
     if (buildConfig?.options?.browser) {
@@ -436,7 +441,6 @@ async function readKey() {
       process.stdin.pause();
       r(key);
     });
-
   });
 }
 
@@ -546,7 +550,6 @@ export function generateSsrMappings(
 }
 
 function downgradeToWebpack(build: any) {
-
   if (!build.options) {
     return;
   }
@@ -565,4 +568,4 @@ function downgradeToWebpack(build: any) {
       asset.output = '.';
     }
   }
-}
+}

libs/mf/src/schematics/remove/schematic.ts

@@ -21,21 +21,32 @@ export default function remove(options: RemoveSchema): Rule {
   };
 }
 
-function updateBuildConfig(normalized: { projectConfig: any; projectName: string; }) {
+function updateBuildConfig(normalized: {
+  projectConfig: any;
+  projectName: string;
+}) {
   const build = normalized.projectConfig.architect.build;
   build.builder = '@angular-devkit/build-angular:browser';
   delete build.options.extraWebpackConfig;
+  delete build.options.customWebpackConfig;
+
   const buildProd = build.configurations.production;
   delete buildProd.extraWebpackConfig;
+  delete buildProd.customWebpackConfig;
 }
 
-function updateServeConfig(normalized: { projectConfig: any; projectName: string; }) {
+function updateServeConfig(normalized: {
+  projectConfig: any;
+  projectName: string;
+}) {
   const serve = normalized.projectConfig.architect.serve;
   serve.builder = '@angular-devkit/build-angular:dev-server';
   delete serve.options.extraWebpackConfig;
+  delete serve.options.customWebpackConfig;
 
   const serveProd = serve.configurations.production;
   delete serveProd.extraWebpackConfig;
+  delete serveProd.customWebpackConfig;
 
   const prodTarget = serveProd.browserTarget;
   if (prodTarget) {
@@ -50,11 +61,9 @@ function updateServeConfig(normalized: { projectConfig: any; projectName: string
     delete serveDev.browserTarget;
     serveDev.buildTarget = devTarget;
   }
-
 }
 
 function normalize(options: RemoveSchema, workspace: any) {
-
   if (!options.project) {
     options.project = workspace.defaultProject;
   }
@@ -95,4 +104,3 @@ function removeBootstrap(normalized, tree) {
   tree.overwrite(mainPath, content);
   tree.delete(bootstrapPath);
 }
-

libs/mf/tutorial/tutorial.md

@@ -237,9 +237,8 @@ So far, we just hardcoded the URLs pointing to our Micro Frontends. However, in
 
 2. Adjust the shell's `main.ts` (`projects/shell/src/main.ts`) as follows:
 
-   ```typescript
-   import { loadManifest } from '@angular-architects/module-federation';
-   ```
+```typescript
+import { loadManifest } from '@angular-architects/module-federation';
 
 loadManifest('assets/mf.manifest.json')
 .catch((err) => console.error('Error loading remote entries', err))

libs/native-federation-core/package.json

@@ -2,6 +2,7 @@
   "name": "@softarc/native-federation",
   "version": "2.0.9",
   "type": "commonjs",
+  "license": "MIT",
   "dependencies": {
     "json5": "^2.2.0",
     "npmlog": "^6.0.2",