fix(nf): rebuild federation artifacts

manfredsteyer · manfredsteyer · commit 9a4711a76218 · 2024-02-08T01:19:48.000+01:00
diff --git a/libs/mf-runtime/package.json b/libs/mf-runtime/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular-architects/module-federation-runtime",
   "license": "MIT",
-  "version": "17.0.0",
+  "version": "17.0.4",
   "peerDependencies": {
     "@angular/common": ">=17.0.0",
     "@angular/core": ">=17.0.0"
diff --git a/libs/mf-tools/package.json b/libs/mf-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation-tools",
-  "version": "17.0.0",
+  "version": "17.0.4",
   "license": "MIT",
   "peerDependencies": {},
   "dependencies": {
diff --git a/libs/mf/package.json b/libs/mf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation",
-  "version": "17.0.0",
+  "version": "17.0.4",
   "license": "MIT",
   "repository": {
     "type": "GitHub",
@@ -13,11 +13,11 @@
   },
   "module": "src/index.js",
   "ES2015": "./src/index.js",
-  "sideEffects": "false",
+  "sideEffects": false,
   "schematics": "./collection.json",
   "builders": "./builders.json",
   "dependencies": {
-    "@angular-architects/module-federation-runtime": "17.0.0",
+    "@angular-architects/module-federation-runtime": "17.0.4",
     "word-wrap": "^1.2.3",
     "callsite": "^1.0.0",
     "node-fetch": "^2.6.7",
diff --git a/libs/mf/src/schematics/mf/schematic.ts b/libs/mf/src/schematics/mf/schematic.ts
@@ -147,8 +147,14 @@ function nxBuildersAvailable(tree: Tree): boolean {
 }
 
 function infereNxBuilderNames(tree: Tree): { dev: string; prod: string } {
+  
+  const dep = getPackageJsonDependency(tree, '@nx/angular');
+
+  const useDevServer = semver.satisfies(dep.version, '>=18.0.0');
+
+  
   const defaultResult = {
-    dev: '@nx/angular:webpack-dev-server',
+    dev: useDevServer ? '@nx/angular:dev-server' : '@nx/angular:webpack-dev-server',
     prod: '@nx/angular:webpack-browser',
   };
 
diff --git a/libs/native-federation-core/package.json b/libs/native-federation-core/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@softarc/native-federation",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "type": "commonjs",
   "dependencies": {
     "json5": "^2.2.0",
     "npmlog": "^6.0.2",
-    "@softarc/native-federation-runtime": "2.0.7"
+    "@softarc/native-federation-runtime": "2.0.8"
   }
 }
diff --git a/libs/native-federation-core/src/lib/config/share-utils.ts b/libs/native-federation-core/src/lib/config/share-utils.ts
@@ -11,7 +11,6 @@ import {
 } from '../core/default-skip-list';
 import {
   findDepPackageJson,
-  findPackageJsonFiles,
   getVersionMaps,
   VersionMap,
 } from '../utils/package-info';
diff --git a/libs/native-federation-esbuild/package.json b/libs/native-federation-esbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-esbuild",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "type": "commonjs",
   "dependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",
diff --git a/libs/native-federation-runtime/package.json b/libs/native-federation-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@softarc/native-federation-runtime",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "peerDependencies": {},
   "dependencies": {
     "tslib": "^2.3.0"
diff --git a/libs/native-federation/README.md b/libs/native-federation/README.md
@@ -25,14 +25,12 @@ We will at least provide a new version of this package per Angular major. If nec
 - Use version 17.x for Angular 17.x
 - Use version 17.1.x for Angular 17.1+
 
-
 ## Angular Integration
 
-Since 17.1, Native Federation for Angular uses the Angular CLI's ``esbuild``-based **Application Builder** and the CLI's **Dev Server** to keep track with all the innovations and performance-improvements in that space. 
+Since 17.1, Native Federation for Angular uses the Angular CLI's `esbuild`-based **Application Builder** and the CLI's **Dev Server** to keep track with all the innovations and performance-improvements in that space.
 
 Please find some [information for upgrading to 17.1. here](https://github.com/angular-architects/module-federation-plugin/blob/main/libs/native-federation/migrate-appbuilder.md).
 
-
 ## Credits
 
 Big thanks to:
diff --git a/libs/native-federation/package.json b/libs/native-federation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/native-federation",
-  "version": "17.1.1",
+  "version": "17.1.6",
   "main": "src/index.js",
   "generators": "./collection.json",
   "builders": "./builders.json",
@@ -17,8 +17,8 @@
   },
   "dependencies": {
     "@babel/core": "^7.19.0",
-    "@softarc/native-federation": "2.0.7",
-    "@softarc/native-federation-runtime": "2.0.7",
+    "@softarc/native-federation": "2.0.8",
+    "@softarc/native-federation-runtime": "2.0.8",
     "@types/browser-sync": "^2.26.3",
     "browser-sync": "^2.29.3",
     "esbuild": "^0.19.5",
diff --git a/libs/native-federation/src/builders/build/builder.ts b/libs/native-federation/src/builders/build/builder.ts
@@ -204,7 +204,7 @@ export async function* runBuilder(
         normOuterOptions,
         appBuilderName,
         context,
-        {
+        nfOptions.skipHtmlTransform ? {} : {
           indexHtml: transformIndexHtml,
         },
         {
@@ -236,7 +236,7 @@ export async function* runBuilder(
       );
     }
 
-    if (write && !nfOptions.dev) {
+    if (write && !nfOptions.dev && !nfOptions.skipHtmlTransform) {
       updateIndexHtml(fedOptions);
     }
 
@@ -252,7 +252,7 @@ export async function* runBuilder(
       yield output;
     }
 
-    if (!first && watch) {
+    if (!first && nfOptions.dev) {
       setTimeout(async () => {
         // logger.info('Rebuilding federation artefacts ...');
         // await Promise.all([rebuildEvents.rebuild.emit()]);
diff --git a/libs/native-federation/src/builders/build/schema.d.ts b/libs/native-federation/src/builders/build/schema.d.ts
@@ -8,4 +8,5 @@ export interface NfBuilderSchema extends JsonObject {
   rebuildDelay: number;
   shell: string;
   watch: boolean;
+  skipHtmlTransform: boolean;
 } // eslint-disable-line
diff --git a/libs/native-federation/src/builders/build/schema.json b/libs/native-federation/src/builders/build/schema.json
@@ -38,6 +38,10 @@
       "type": "string",
       "description": "Experimental",
       "default": ""
+    },
+    "skipHtmlTransform": {
+      "type": "boolean",
+      "default": false
     }
   }
 }
diff --git a/libs/native-federation/src/schematics/init/schematic.ts b/libs/native-federation/src/schematics/init/schematic.ts
@@ -138,6 +138,10 @@ function updateWorkspaceConfig(
     defaultConfiguration: 'production',
   };
 
+  const serve = projectConfig.architect.serve;
+  serve.options ??= {};
+  serve.options.port = port;
+
   const serveProd = projectConfig.architect.serve.configurations?.production;
   if (serveProd) {
     serveProd.buildTarget = `${projectName}:esbuild:production`;
@@ -274,7 +278,9 @@ function generateRemoteMap(workspace: any, projectName: string) {
       project?.architect?.serve &&
       project?.architect?.build
     ) {
-      const pPort = project.architect.serve.options?.port ?? 4200;
+      const pPort = project.architect['serve-original']?.options?.port ?? 
+        project.architect.serve?.options?.port ??
+        4200;
       result[
         strings.camelize(p)
       ] = `http://localhost:${pPort}/remoteEntry.json`;
diff --git a/libs/native-federation/src/utils/angular-esbuild-adapter.ts b/libs/native-federation/src/utils/angular-esbuild-adapter.ts
@@ -268,7 +268,7 @@ async function runEsbuild(
       'async-await': false,
       'object-rest-spread': false,
     },
-    splitting: (kind === 'mapping-or-exposed'),
+    splitting: kind === 'mapping-or-exposed',
     platform: 'browser',
     format: 'esm',
     target: ['esnext'],
diff --git a/update-local-mf.bat b/update-local-mf.bat
@@ -2,9 +2,9 @@
 @REM call npm unpublish @softarc/native-federation-runtime@2.0.3 --registry http://localhost:4873
 @REM call npm unpublish @softarc/native-federation-esbuild@2.0.3 --registry http://localhost:4873
 @REM call npm unpublish @angular-architects/native-federation@16.3.3 --registry http://localhost:4873
-call npm unpublish @angular-architects/module-federation-tools@17.0.0 --registry http://localhost:4873
-call npm unpublish @angular-architects/module-federation-runtime@17.0.0 --registry http://localhost:4873
-call npm unpublish @angular-architects/module-federation@17.0.0 --registry http://localhost:4873
+call npm unpublish @angular-architects/module-federation-tools@17.0.3 --registry http://localhost:4873
+call npm unpublish @angular-architects/module-federation-runtime@17.0.3 --registry http://localhost:4873
+call npm unpublish @angular-architects/module-federation@17.0.3 --registry http://localhost:4873
 
 call npx nx build mf
 call npx nx build mf-runtime
diff --git a/update-local.bat b/update-local.bat
@@ -1,7 +1,7 @@
-call npm unpublish @softarc/native-federation@2.0.7 --registry http://localhost:4873
-call npm unpublish @softarc/native-federation-runtime@2.0.7 --registry http://localhost:4873
-call npm unpublish @softarc/native-federation-esbuild@2.0.7 --registry http://localhost:4873
-call npm unpublish @angular-architects/native-federation@17.1.0-beta.1 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation@2.0.8 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation-runtime@2.0.8 --registry http://localhost:4873
+call npm unpublish @softarc/native-federation-esbuild@2.0.8 --registry http://localhost:4873
+call npm unpublish @angular-architects/native-federation@17.1.5 --registry http://localhost:4873
 
 call npx nx build native-federation
 call npx nx build native-federation-core

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@angular-architects/module-federation-runtime",`
`3`	`3`	`"license": "MIT",`
`4`		`- "version": "17.0.0",`
	`4`	`+ "version": "17.0.4",`
`5`	`5`	`"peerDependencies": {`
`6`	`6`	`"@angular/common": ">=17.0.0",`
`7`	`7`	`"@angular/core": ">=17.0.0"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@angular-architects/module-federation-tools",`
`3`		`- "version": "17.0.0",`
	`3`	`+ "version": "17.0.4",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"peerDependencies": {},`
`6`	`6`	`"dependencies": {`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation",`
`3`		`- "version": "2.0.7",`
	`3`	`+ "version": "2.0.8",`
`4`	`4`	`"type": "commonjs",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"json5": "^2.2.0",`
`7`	`7`	`"npmlog": "^6.0.2",`
`8`		`- "@softarc/native-federation-runtime": "2.0.7"`
	`8`	`+ "@softarc/native-federation-runtime": "2.0.8"`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation-esbuild",`
`3`		`- "version": "2.0.7",`
	`3`	`+ "version": "2.0.8",`
`4`	`4`	`"type": "commonjs",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@rollup/plugin-commonjs": "^22.0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@softarc/native-federation-runtime",`
`3`		`- "version": "2.0.7",`
	`3`	`+ "version": "2.0.8",`
`4`	`4`	`"peerDependencies": {},`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"tslib": "^2.3.0"`