migration to ng 17

manfredsteyer · manfredsteyer · commit cd107b7bff13 · 2023-11-12T11:27:48.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,5 @@ testem.log
 Thumbs.db
 
 .angular
+
+.nx/cache
diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,5 @@
 
 /dist
 /coverage
+
+/.nx/cache
diff --git a/apps/mfe1-e2e/project.json b/apps/mfe1-e2e/project.json
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/mfe1-e2e/**/*.{js,ts}"]
diff --git a/apps/mfe1/project.json b/apps/mfe1/project.json
@@ -55,22 +55,22 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "mfe1:build:production"
+          "buildTarget": "mfe1:build:production"
         },
         "development": {
-          "browserTarget": "mfe1:build:development"
+          "buildTarget": "mfe1:build:development"
         }
       },
       "defaultConfiguration": "development"
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "mfe1:build"
+        "buildTarget": "mfe1:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["apps/mfe1/**/*.ts", "apps/mfe1/**/*.html"]
       }
@@ -79,8 +79,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/mfe1"],
       "options": {
-        "jestConfig": "apps/mfe1/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/mfe1/jest.config.ts"
       }
     }
   },
diff --git a/apps/mfe1/src/app/nx-welcome.component.ts b/apps/mfe1/src/app/nx-welcome.component.ts
@@ -769,10 +769,10 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core';
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nx/angular:lib ui
+nx g &#64;nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nx/angular:component button --project ui</pre>
+nx g &#64;nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>
diff --git a/apps/mfe2-e2e/project.json b/apps/mfe2-e2e/project.json
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/mfe2-e2e/**/*.{js,ts}"]
diff --git a/apps/mfe2/project.json b/apps/mfe2/project.json
@@ -55,10 +55,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "mfe2:build:production"
+          "buildTarget": "mfe2:build:production"
         },
         "development": {
-          "browserTarget": "mfe2:build:development"
+          "buildTarget": "mfe2:build:development"
         }
       },
       "defaultConfiguration": "development",
@@ -67,11 +67,11 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "mfe2:build"
+        "buildTarget": "mfe2:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["apps/mfe2/**/*.ts", "apps/mfe2/**/*.html"]
       }
@@ -80,8 +80,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/mfe2"],
       "options": {
-        "jestConfig": "apps/mfe2/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/mfe2/jest.config.ts"
       }
     }
   },
diff --git a/apps/mfe2/src/app/nx-welcome.component.ts b/apps/mfe2/src/app/nx-welcome.component.ts
@@ -769,10 +769,10 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core';
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nx/angular:lib ui
+nx g &#64;nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nx/angular:component button --project ui</pre>
+nx g &#64;nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>
diff --git a/apps/native-federation-e2e/project.json b/apps/native-federation-e2e/project.json
@@ -8,7 +8,8 @@
       "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "apps/native-federation-e2e/jest.config.ts",
-        "runInBand": true
+        "runInBand": true,
+        "passWithNoTests": false
       },
       "dependsOn": ["native-federation:build"]
     }
diff --git a/apps/playground-e2e/project.json b/apps/playground-e2e/project.json
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["apps/playground-e2e/**/*.{js,ts}"]
       },
diff --git a/apps/playground/project.json b/apps/playground/project.json
@@ -62,22 +62,22 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "playground:build:production"
+          "buildTarget": "playground:build:production"
         },
         "development": {
-          "browserTarget": "playground:build:development"
+          "buildTarget": "playground:build:development"
         }
       },
       "defaultConfiguration": "development"
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "playground:build"
+        "buildTarget": "playground:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "apps/playground/src/**/*.ts",
@@ -90,8 +90,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/playground"],
       "options": {
-        "jestConfig": "apps/playground/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/playground/jest.config.ts"
       }
     }
   },
diff --git a/libs/mf-runtime/package.json b/libs/mf-runtime/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@angular-architects/module-federation-runtime",
   "license": "MIT",
-  "version": "16.0.4",
+  "version": "17.0.0",
   "peerDependencies": {
-    "@angular/common": ">=16.0.0",
-    "@angular/core": ">=16.0.0"
+    "@angular/common": ">=17.0.0",
+    "@angular/core": ">=17.0.0"
   },
   "dependencies": {
     "tslib": "^2.0.0"
diff --git a/libs/mf-runtime/project.json b/libs/mf-runtime/project.json
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "libs/mf-runtime/src/**/*.ts",
@@ -31,8 +31,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/mf-runtime"],
       "options": {
-        "jestConfig": "libs/mf-runtime/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/mf-runtime/jest.config.ts"
       }
     }
   },
diff --git a/libs/mf-tools/package.json b/libs/mf-tools/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@angular-architects/module-federation-tools",
-  "version": "16.0.4",
+  "version": "17.0.0",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/common": ">=16.0.0",
-    "@angular/core": ">=16.0.0",
-    "@angular/router": ">=16.0.0",
-    "@angular-architects/module-federation": "^16.0.0",
-    "@angular/platform-browser": ">=16.0.0",
+    "@angular/common": ">=17.0.0",
+    "@angular/core": ">=17.0.0",
+    "@angular/router": ">=17.0.0",
+    "@angular-architects/module-federation": "^17.0.0",
+    "@angular/platform-browser": ">=17.0.0",
     "rxjs": ">= 6.0.0"
   },
   "dependencies": {
diff --git a/libs/mf-tools/project.json b/libs/mf-tools/project.json
@@ -18,7 +18,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "libs/mf-tools/src/**/*.ts",
@@ -31,8 +31,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/mf-tools"],
       "options": {
-        "jestConfig": "libs/mf-tools/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/mf-tools/jest.config.ts"
       }
     }
   },
diff --git a/libs/mf-tools/src/lib/web-components/web-component-wrapper.ts b/libs/mf-tools/src/lib/web-components/web-component-wrapper.ts
@@ -10,7 +10,7 @@ import { ActivatedRoute } from '@angular/router';
 import {
   LoadRemoteModuleOptions,
   loadRemoteModule,
-} from '@angular-architects/module-federation';
+} from '@angular-architects/module-federation-runtime';
 
 export type WebComponentWrapperOptions = LoadRemoteModuleOptions & {
   elementName: string;
diff --git a/libs/mf/package.json b/libs/mf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular-architects/module-federation",
-  "version": "16.0.4",
+  "version": "17.0.0",
   "license": "MIT",
   "repository": {
     "type": "GitHub",
@@ -17,7 +17,7 @@
   "schematics": "./collection.json",
   "builders": "./builders.json",
   "dependencies": {
-    "@angular-architects/module-federation-runtime": "16.0.4",
+    "@angular-architects/module-federation-runtime": "17.0.0",
     "word-wrap": "^1.2.3",
     "callsite": "^1.0.0",
     "node-fetch": "^2.6.7",
diff --git a/libs/mf/project.json b/libs/mf/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["libs/mf/**/*.ts"]
       },
@@ -15,8 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/mf"],
       "options": {
-        "jestConfig": "libs/mf/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/mf/jest.config.ts"
       }
     },
     "build": {
diff --git a/libs/mf/src/schematics/mf/schematic.ts b/libs/mf/src/schematics/mf/schematic.ts
@@ -26,7 +26,6 @@ import {
   getPackageJsonDependency,
   NodeDependencyType,
 } from '@schematics/angular/utility/dependencies';
-import { serve } from 'esbuild';
 
 export function add(options: MfSchematicSchema): Rule {
   return config(options);
@@ -351,11 +350,11 @@ export default function config(options: MfSchematicSchema): Rule {
 
     const dep = getPackageJsonDependency(tree, 'ngx-build-plus');
 
-    if (!dep || !semver.satisfies(dep.version, '>=16.0.0')) {
+    if (!dep || !semver.satisfies(dep.version, '>=17.0.0')) {
       addPackageJsonDependency(tree, {
         name: 'ngx-build-plus',
         type: NodeDependencyType.Dev,
-        version: '^16.0.0',
+        version: '^17.0.0',
         overwrite: true,
       });
 
diff --git a/libs/mf/src/server/colors.ts b/libs/mf/src/server/colors.ts
@@ -1,5 +1,5 @@
 import crypt = require('crypto');
-import chalk = require('chalk');
+import chalk from 'chalk';
 import wordWrap = require('word-wrap');
 
 function correctColor(color: string): string {
diff --git a/libs/native-federation-core/project.json b/libs/native-federation-core/project.json
@@ -26,7 +26,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/native-federation-core/**/*.ts"]
@@ -36,8 +36,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/native-federation-core"],
       "options": {
-        "jestConfig": "libs/native-federation-core/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/native-federation-core/jest.config.ts"
       }
     }
   },
diff --git a/libs/native-federation-esbuild/project.json b/libs/native-federation-esbuild/project.json
@@ -26,7 +26,7 @@
       ]
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/native-federation-esbuild/**/*.ts"]
@@ -36,8 +36,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/native-federation-esbuild"],
       "options": {
-        "jestConfig": "libs/native-federation-esbuild/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/native-federation-esbuild/jest.config.ts"
       }
     }
   },
diff --git a/libs/native-federation-runtime/project.json b/libs/native-federation-runtime/project.json
@@ -25,12 +25,11 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/native-federation-runtime"],
       "options": {
-        "jestConfig": "libs/native-federation-runtime/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/native-federation-runtime/jest.config.ts"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": [
           "libs/native-federation-runtime/**/*.ts",
diff --git a/libs/native-federation/project.json b/libs/native-federation/project.json
diff --git a/libs/native-federation/src/utils/rollup.ts.bak.bak b/libs/native-federation/src/utils/rollup.ts.bak.bak
diff --git a/libs/playground-lib/project.json b/libs/playground-lib/project.json
diff --git a/migrations.json b/migrations.json
diff --git a/nx.json b/nx.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/post-build.js b/post-build.js
diff --git a/update-local-mf.bat b/update-local-mf.bat

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`}`
`19`	`19`	`},`
`20`	`20`	`"lint": {`
`21`		`- "executor": "@nx/linter:eslint",`
	`21`	`+ "executor": "@nx/eslint:lint",`
`22`	`22`	`"outputs": ["{options.outputFile}"],`
`23`	`23`	`"options": {`
`24`	`24`	`"lintFilePatterns": ["apps/mfe1-e2e/*/.{js,ts}"]`