chore(version): update to version 16

.eslintrc.json

@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -19,17 +19,20 @@
             ]
           }
         ],
-        "@angular-eslint/no-host-metadata-property": ["error", { "allowStatic": true }]
+        "@angular-eslint/no-host-metadata-property": [
+          "error",
+          { "allowStatic": true }
+        ]
       }
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {

apps/anchor-scrolling/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/anchor-scrolling/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/anchor-scrolling/jest.config.ts",

apps/anchor-scrolling/src/app/app.config.ts

@@ -0,0 +1,6 @@
+import { ApplicationConfig } from '@angular/core';
+import { provideRouter } from '@angular/router';
+import { appRoutes } from './app.routes';
+export const appConfig: ApplicationConfig = {
+  providers: [provideRouter(appRoutes)],
+};

apps/anchor-scrolling/src/main.ts

@@ -1,8 +1,8 @@
+import { appConfig } from './app/app.config';
 import { bootstrapApplication } from '@angular/platform-browser';
-import { provideRouter } from '@angular/router';
-import { AppComponent } from './app/app.component';
-import { appRoutes } from './app/app.routes';
 
-bootstrapApplication(AppComponent, {
+import { AppComponent } from './app/app.component';
-  providers: [provideRouter(appRoutes)],
+
-}).catch((err) => console.error(err));
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
+  console.error(err)
+);

apps/anchor-scrolling/tailwind.config.js

@@ -1,4 +1,4 @@
-const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind');
 const { join } = require('path');
 
 /** @type {import('tailwindcss').Config} */

apps/context-outlet-type/.eslintrc.json

@@ -5,13 +5,13 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/context-outlet-type/project.json

@@ -7,9 +7,7 @@
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
-      "outputs": [
+      "outputs": ["{options.outputPath}"],
-        "{options.outputPath}"
-      ],
       "options": {
         "outputPath": "dist/apps/context-outlet-type",
         "index": "apps/context-outlet-type/src/index.html",
@@ -21,9 +19,7 @@
           "apps/context-outlet-type/src/favicon.ico",
           "apps/context-outlet-type/src/assets"
         ],
-        "styles": [
+        "styles": ["apps/context-outlet-type/src/styles.scss"],
-          "apps/context-outlet-type/src/styles.scss"
-        ],
         "scripts": []
       },
       "configurations": {
@@ -78,7 +74,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/context-outlet-type/**/*.ts",

apps/crud/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/crud/project.json

@@ -75,13 +75,13 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/crud/**/*.ts", "apps/crud/**/*.html"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/crud/jest.config.ts",

apps/crud/src/app/app.config.ts

@@ -0,0 +1,6 @@
+import { ApplicationConfig } from '@angular/core';
+import { enableProdMode, importProvidersFrom } from '@angular/core';
+import { HttpClientModule } from '@angular/common/http';
+export const appConfig: ApplicationConfig = {
+  providers: [importProvidersFrom(HttpClientModule)],
+};

apps/crud/src/main.ts

@@ -1,5 +1,5 @@
-import { HttpClientModule } from '@angular/common/http';
+import { appConfig } from './app/app.config';
-import { enableProdMode, importProvidersFrom } from '@angular/core';
+
 import { bootstrapApplication } from '@angular/platform-browser';
 import { AppComponent } from './app/app.component';
 import { environment } from './environments/environment';
@@ -8,6 +8,6 @@ if (environment.production) {
   enableProdMode();
 }
 
-bootstrapApplication(AppComponent, {
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
-  providers: [importProvidersFrom(HttpClientModule)],
+  console.error(err)
-}).catch((err) => console.error(err));
+);

apps/declarative-to-reactive/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/declarative-to-reactive/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/declarative-to-reactive/jest.config.ts",

apps/declarative-to-reactive/src/app/nx-welcome.component.ts

@@ -730,10 +730,10 @@ import { CommonModule } from '@angular/common';
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nrwl/angular:lib ui
+nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nrwl/angular:component button --project ui</pre>
+nx g @nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>

apps/di/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/di/project.json

@@ -70,7 +70,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/di/**/*.ts", "apps/di/**/*.html"]

apps/ngfor-enhancement/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/ngfor-enhancement/project.json

@@ -7,9 +7,7 @@
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
-      "outputs": [
+      "outputs": ["{options.outputPath}"],
-        "{options.outputPath}"
-      ],
       "options": {
         "outputPath": "dist/apps/ngfor-enhancement",
         "index": "apps/ngfor-enhancement/src/index.html",
@@ -21,9 +19,7 @@
           "apps/ngfor-enhancement/src/favicon.ico",
           "apps/ngfor-enhancement/src/assets"
         ],
-        "styles": [
+        "styles": ["apps/ngfor-enhancement/src/styles.scss"],
-          "apps/ngfor-enhancement/src/styles.scss"
-        ],
         "scripts": []
       },
       "configurations": {
@@ -78,7 +74,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/ngfor-enhancement/**/*.ts",

apps/ngrx-1/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/ngrx-1/project.json

@@ -7,9 +7,7 @@
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
-      "outputs": [
+      "outputs": ["{options.outputPath}"],
-        "{options.outputPath}"
-      ],
       "options": {
         "outputPath": "dist/apps/ngrx-1",
         "index": "apps/ngrx-1/src/index.html",
@@ -17,17 +15,10 @@
         "polyfills": "apps/ngrx-1/src/polyfills.ts",
         "tsConfig": "apps/ngrx-1/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
-        "assets": [
+        "assets": ["apps/ngrx-1/src/favicon.ico", "apps/ngrx-1/src/assets"],
-          "apps/ngrx-1/src/favicon.ico",
+        "styles": ["apps/ngrx-1/src/styles.scss"],
-          "apps/ngrx-1/src/assets"
-        ],
-        "styles": [
-          "apps/ngrx-1/src/styles.scss"
-        ],
         "scripts": [],
-        "allowedCommonJsDependencies": [
+        "allowedCommonJsDependencies": ["seedrandom"]
-          "seedrandom"
-        ]
       },
       "configurations": {
         "production": {
@@ -81,19 +72,14 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
-        "lintFilePatterns": [
+        "lintFilePatterns": ["apps/ngrx-1/**/*.ts", "apps/ngrx-1/**/*.html"]
-          "apps/ngrx-1/**/*.ts",
-          "apps/ngrx-1/**/*.html"
-        ]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
-      "outputs": [
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-        "{workspaceRoot}/coverage/{projectRoot}"
-      ],
       "options": {
         "jestConfig": "apps/ngrx-1/jest.config.ts",
         "passWithNoTests": true

apps/ngrx-1/src/app/app.config.ts

@@ -0,0 +1,12 @@
+import { ApplicationConfig } from '@angular/core';
+import { provideStore } from '@ngrx/store';
+import { provideEffects } from '@ngrx/effects';
+import { ActivityEffects } from './store/activity/activity.effects';
+import { UserEffects } from './store/user/user.effects';
+import { StatusEffects } from './store/status/status.effects';
+export const appConfig: ApplicationConfig = {
+  providers: [
+    provideStore(reducers),
+    provideEffects([ActivityEffects, UserEffects, StatusEffects]),
+  ],
+};

apps/ngrx-1/src/main.ts

@@ -1,19 +1,19 @@
+import { appConfig } from './app/app.config';
 import { enableProdMode } from '@angular/core';
 import { bootstrapApplication } from '@angular/platform-browser';
-import { provideEffects } from '@ngrx/effects';
+
-import { provideStore } from '@ngrx/store';
 import { AppComponent } from './app/app.component';
-import { ActivityEffects } from './app/store/activity/activity.effects';
+
 import {
   activityFeatureKey,
   activityReducer,
 } from './app/store/activity/activity.reducer';
-import { StatusEffects } from './app/store/status/status.effects';
+
 import {
   statusFeatureKey,
   statusReducer,
 } from './app/store/status/status.reducer';
-import { UserEffects } from './app/store/user/user.effects';
+
 import { userFeatureKey, userReducer } from './app/store/user/user.reducer';
 import { environment } from './environments/environment';
 
@@ -27,9 +27,4 @@ const reducers = {
   [userFeatureKey]: userReducer,
 };
 
-bootstrapApplication(AppComponent, {
+bootstrapApplication(AppComponent, appConfig);
-  providers: [
-    provideStore(reducers),
-    provideEffects([ActivityEffects, UserEffects, StatusEffects]),
-  ],
-});

apps/ngrx-notification/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/ngrx-notification/project.json

@@ -75,7 +75,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/ngrx-notification/**/*.ts",

apps/ngrx-notification/src/app/app.config.ts

@@ -0,0 +1,33 @@
+import { ApplicationConfig } from '@angular/core';
+import { provideStore } from '@ngrx/store';
+import { provideEffects } from '@ngrx/effects';
+import { TeacherEffects } from './teacher/store/teacher.effects';
+import { StudentEffects } from './student/store/student.effects';
+import { provideRouter } from '@angular/router';
+import { ROUTES } from './routes';
+import { APP_INITIALIZER, enableProdMode, inject } from '@angular/core';
+import { FakeBackendService } from '@angular-challenges/ngrx-notification/backend';
+import { NotificationService } from './data-access/notification.service';
+export const appConfig: ApplicationConfig = {
+  providers: [
+    provideStore(REDUCERS),
+    provideEffects([TeacherEffects, StudentEffects]),
+    provideRouter(ROUTES),
+    {
+      provide: APP_INITIALIZER,
+      multi: true,
+      useFactory: () => {
+        const service = inject(FakeBackendService);
+        return () => service.start();
+      },
+    },
+    {
+      provide: APP_INITIALIZER,
+      multi: true,
+      useFactory: () => {
+        const service = inject(NotificationService);
+        return () => service.init();
+      },
+    },
+  ],
+};

apps/ngrx-notification/src/main.ts

@@ -1,18 +1,14 @@
-import { FakeBackendService } from '@angular-challenges/ngrx-notification/backend';
+import { appConfig } from './app/app.config';
-import { APP_INITIALIZER, enableProdMode, inject } from '@angular/core';
+
 import { bootstrapApplication } from '@angular/platform-browser';
-import { provideRouter } from '@angular/router';
+
-import { provideEffects } from '@ngrx/effects';
-import { provideStore } from '@ngrx/store';
 import { AppComponent } from './app/app.component';
-import { NotificationService } from './app/data-access/notification.service';
+
-import { ROUTES } from './app/routes';
-import { StudentEffects } from './app/student/store/student.effects';
 import {
   studentReducer,
   studentsFeatureKey,
 } from './app/student/store/student.reducer';
-import { TeacherEffects } from './app/teacher/store/teacher.effects';
+
 import {
   teacherReducer,
   teachersFeatureKey,
@@ -28,26 +24,6 @@ const REDUCERS = {
   [studentsFeatureKey]: studentReducer,
 };
 
-bootstrapApplication(AppComponent, {
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
-  providers: [
+  console.error(err)
-    provideStore(REDUCERS),
+);
-    provideEffects([TeacherEffects, StudentEffects]),
-    provideRouter(ROUTES),
-    {
-      provide: APP_INITIALIZER,
-      multi: true,
-      useFactory: () => {
-        const service = inject(FakeBackendService);
-        return () => service.start();
-      },
-    },
-    {
-      provide: APP_INITIALIZER,
-      multi: true,
-      useFactory: () => {
-        const service = inject(NotificationService);
-        return () => service.init();
-      },
-    },
-  ],
-}).catch((err) => console.error(err));

apps/overload/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/overload/project.json

@@ -65,7 +65,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/overload/**/*.ts", "apps/overload/**/*.html"]

apps/permissions/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/permissions/project.json

@@ -74,7 +74,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/permissions/**/*.ts",

apps/permissions/src/app/app.config.ts

@@ -0,0 +1,6 @@
+import { ApplicationConfig } from '@angular/core';
+import { provideRouter } from '@angular/router';
+import { APP_ROUTES } from './routes';
+export const appConfig: ApplicationConfig = {
+  providers: [provideRouter(APP_ROUTES)],
+};

apps/permissions/src/main.ts

@@ -1,14 +1,15 @@
+import { appConfig } from './app/app.config';
 import { enableProdMode } from '@angular/core';
 import { bootstrapApplication } from '@angular/platform-browser';
-import { provideRouter } from '@angular/router';
+
 import { AppComponent } from './app/app.component';
-import { APP_ROUTES } from './app/routes';
+
 import { environment } from './environments/environment';
 
 if (environment.production) {
   enableProdMode();
 }
 
-bootstrapApplication(AppComponent, {
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
-  providers: [provideRouter(APP_ROUTES)],
+  console.error(err)
-}).catch((err) => console.error(err));
+);

apps/permissions/tailwind.config.js

@@ -1,4 +1,4 @@
-const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind');
 const { join } = require('path');
 
 /** @type {import('tailwindcss').Config} */

apps/pipe-easy/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/pipe-easy/project.json

@@ -74,7 +74,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/pipe-easy/**/*.ts",

apps/pipe-hard/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/pipe-hard/project.json

@@ -74,7 +74,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/pipe-hard/**/*.ts",

apps/pipe-intermediate/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/pipe-intermediate/project.json

@@ -74,7 +74,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/pipe-intermediate/**/*.ts",

apps/projection/.eslintrc.json

@@ -1,29 +1,19 @@
 {
-  "extends": [
+  "extends": ["../../.eslintrc.json"],
-    "../../.eslintrc.json"
+  "ignorePatterns": ["!**/*"],
-  ],
-  "ignorePatterns": [
-    "!**/*"
-  ],
   "overrides": [
     {
-      "files": [
+      "files": ["*.ts"],
-        "*.ts"
-      ],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {}
     },
     {
-      "files": [
+      "files": ["*.html"],
-        "*.html"
+      "extends": ["plugin:@nx/angular-template"],
-      ],
-      "extends": [
-        "plugin:@nrwl/nx/angular-template"
-      ],
       "rules": {}
     }
   ]
-}
+}

apps/projection/project.json

@@ -7,9 +7,7 @@
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
-      "outputs": [
+      "outputs": ["{options.outputPath}"],
-        "{options.outputPath}"
-      ],
       "options": {
         "outputPath": "dist/apps/projection",
         "index": "apps/projection/src/index.html",
@@ -21,13 +19,9 @@
           "apps/projection/src/favicon.ico",
           "apps/projection/src/assets"
         ],
-        "styles": [
+        "styles": ["apps/projection/src/styles.scss"],
-          "apps/projection/src/styles.scss"
-        ],
         "scripts": [],
-        "allowedCommonJsDependencies": [
+        "allowedCommonJsDependencies": ["seedrandom"]
-          "seedrandom"
-        ]
       },
       "configurations": {
         "production": {
@@ -81,7 +75,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/projection/**/*.ts",
@@ -90,10 +84,8 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
-      "outputs": [
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
-        "{workspaceRoot}/coverage/{projectRoot}"
-      ],
       "options": {
         "jestConfig": "apps/projection/jest.config.ts",
         "passWithNoTests": true

apps/projection/tailwind.config.js

@@ -1,4 +1,4 @@
-const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind');
 const { join } = require('path');
 
 /** @type {import('tailwindcss').Config} */

apps/rxjs-pipe-bug/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/rxjs-pipe-bug/project.json

@@ -69,7 +69,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/rxjs-pipe-bug/**/*.ts",

apps/rxjs-race-condition/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/rxjs-race-condition/cypress.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/angular/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename),

apps/rxjs-race-condition/cypress/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["cypress", "node"]
+    "types": ["cypress", "node"],
+    "sourceMap": false
   },
   "include": [
     "support/**/*.ts",

apps/rxjs-race-condition/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/rxjs-race-condition/jest.config.ts",
@@ -86,7 +86,7 @@
       }
     },
     "component-test": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/rxjs-race-condition/cypress.config.ts",
         "testingType": "component",

apps/rxjs-race-condition/src/app/app.config.ts

@@ -0,0 +1,6 @@
+import { ApplicationConfig } from '@angular/core';
+import { importProvidersFrom } from '@angular/core';
+import { MatDialogModule } from '@angular/material/dialog';
+export const appConfig: ApplicationConfig = {
+  providers: [importProvidersFrom(MatDialogModule)],
+};

apps/rxjs-race-condition/src/main.ts

@@ -1,8 +1,8 @@
-import { importProvidersFrom } from '@angular/core';
+import { appConfig } from './app/app.config';
-import { MatDialogModule } from '@angular/material/dialog';
+
 import { bootstrapApplication } from '@angular/platform-browser';
 import { AppComponent } from './app/app.component';
 
-bootstrapApplication(AppComponent, {
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
-  providers: [importProvidersFrom(MatDialogModule)],
+  console.error(err)
-}).catch((err) => console.error(err));
+);

apps/rxjs-race-condition/tsconfig.json

@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.cy.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../tsconfig.base.json",

apps/scroll-cd/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/scroll-cd/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/scroll-cd/jest.config.ts",

apps/styling/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/styling/project.json

@@ -65,7 +65,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/styling/**/*.ts", "apps/styling/**/*.html"]

apps/testing-forms/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/testing-forms/cypress.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/angular/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename),

apps/testing-forms/cypress/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["cypress", "node"]
+    "types": ["cypress", "node"],
+    "sourceMap": false
   },
   "include": [
     "support/**/*.ts",

apps/testing-forms/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/testing-forms/jest.config.ts",
@@ -92,7 +92,7 @@
       }
     },
     "component-test": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/testing-forms/cypress.config.ts",
         "testingType": "component",

apps/testing-forms/src/app/nx-welcome.component.ts

@@ -730,10 +730,10 @@ import { CommonModule } from '@angular/common';
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nrwl/angular:lib ui
+nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nrwl/angular:component button --project ui</pre>
+nx g @nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>

apps/testing-forms/tailwind.config.js

@@ -1,4 +1,4 @@
-const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind');
 const { join } = require('path');
 
 /** @type {import('tailwindcss').Config} */

apps/testing-forms/tsconfig.json

@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.cy.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../tsconfig.base.json",

apps/testing-input-output/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/testing-input-output/cypress.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/angular/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename),

apps/testing-input-output/cypress/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["cypress", "node"]
+    "types": ["cypress", "node"],
+    "sourceMap": false
   },
   "include": [
     "support/**/*.ts",

apps/testing-input-output/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/testing-input-output/jest.config.ts",
@@ -92,7 +92,7 @@
       }
     },
     "component-test": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/testing-input-output/cypress.config.ts",
         "testingType": "component",

apps/testing-input-output/src/app/counter.component.ts

@@ -6,13 +6,13 @@ import {
   Input,
   Output,
 } from '@angular/core';
-import { LetModule } from '@ngrx/component';
+import { LetDirective } from '@ngrx/component';
 import { ComponentStore } from '@ngrx/component-store';
 
 @Component({
   selector: 'app-counter',
   standalone: true,
-  imports: [AsyncPipe, LetModule],
+  imports: [AsyncPipe, LetDirective],
   template: `
     <ng-container *ngrxLet="counter$ as counter">
       <p data-testid="counter">Counter: {{ counter }}</p>

apps/testing-input-output/tsconfig.json

@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.cy.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../tsconfig.base.json",

apps/testing-modal/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/testing-modal/cypress.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/angular/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename),

apps/testing-modal/cypress/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
-    "types": ["cypress", "node"]
+    "types": ["cypress", "node"],
+    "sourceMap": false
   },
   "include": [
     "support/**/*.ts",

apps/testing-modal/project.json

@@ -71,7 +71,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -81,7 +81,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/testing-modal/jest.config.ts",
@@ -95,7 +95,7 @@
       }
     },
     "component-test": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/testing-modal/cypress.config.ts",
         "testingType": "component",

apps/testing-modal/src/app/app.config.ts

@@ -0,0 +1,5 @@
+import { ApplicationConfig } from '@angular/core';
+import { provideAnimations } from '@angular/platform-browser/animations';
+export const appConfig: ApplicationConfig = {
+  providers: [provideAnimations()],
+};

apps/testing-modal/src/main.ts

@@ -1,7 +1,8 @@
+import { appConfig } from './app/app.config';
 import { bootstrapApplication } from '@angular/platform-browser';
-import { provideAnimations } from '@angular/platform-browser/animations';
+
 import { AppComponent } from './app/app.component';
 
-bootstrapApplication(AppComponent, {
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
-  providers: [provideAnimations()],
+  console.error(err)
-}).catch((err) => console.error(err));
+);

apps/testing-modal/tailwind.config.js

@@ -1,4 +1,4 @@
-const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind');
 const { join } = require('path');
 
 /** @type {import('tailwindcss').Config} */

apps/testing-modal/tsconfig.json

@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.cy.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../tsconfig.base.json",

apps/testing-nested/.eslintrc.json

@@ -6,13 +6,13 @@
       "files": ["*.ts"],
       "rules": {},
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/testing-nested/cypress.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/angular/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename),

apps/testing-nested/cypress/tsconfig.cy.json

@@ -1,17 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["cypress", "node"]
-  },
-  "include": [
-    "support/**/*.ts",
-    "../cypress.config.ts",
-    "../**/*.cy.ts",
-    "../**/*.cy.tsx",
-    "../**/*.cy.js",
-    "../**/*.cy.jsx",
-    "../**/*.d.ts"
-  ]
-}

apps/testing-nested/cypress/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["cypress", "node"],
+    "sourceMap": false
+  },
+  "include": [
+    "support/**/*.ts",
+    "../cypress.config.ts",
+    "../**/*.cy.ts",
+    "../**/*.cy.tsx",
+    "../**/*.cy.js",
+    "../**/*.cy.jsx",
+    "../**/*.d.ts"
+  ]
+}

apps/testing-nested/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/testing-nested/jest.config.ts",
@@ -92,7 +92,7 @@
       }
     },
     "component-test": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/testing-nested/cypress.config.ts",
         "testingType": "component",

apps/testing-nested/tsconfig.json

@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.cy.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../tsconfig.base.json",

apps/testing-router-outlet/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/testing-router-outlet/cypress.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/angular/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename),

apps/testing-router-outlet/cypress/tsconfig.cy.json

@@ -1,17 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["cypress", "node"]
-  },
-  "include": [
-    "support/**/*.ts",
-    "../cypress.config.ts",
-    "../**/*.cy.ts",
-    "../**/*.cy.tsx",
-    "../**/*.cy.js",
-    "../**/*.cy.jsx",
-    "../**/*.d.ts"
-  ]
-}

apps/testing-router-outlet/cypress/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["cypress", "node"],
+    "sourceMap": false
+  },
+  "include": [
+    "support/**/*.ts",
+    "../cypress.config.ts",
+    "../**/*.cy.ts",
+    "../**/*.cy.tsx",
+    "../**/*.cy.js",
+    "../**/*.cy.jsx",
+    "../**/*.d.ts"
+  ]
+}

apps/testing-router-outlet/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/testing-router-outlet/jest.config.ts",
@@ -86,7 +86,7 @@
       }
     },
     "component-test": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/testing-router-outlet/cypress.config.ts",
         "testingType": "component",

apps/testing-router-outlet/src/app/app.config.ts

@@ -0,0 +1,6 @@
+import { ApplicationConfig } from '@angular/core';
+import { provideRouter } from '@angular/router';
+import { appRoutes } from './app.routes';
+export const appConfig: ApplicationConfig = {
+  providers: [provideRouter(appRoutes)],
+};

apps/testing-router-outlet/src/main.ts

@@ -1,8 +1,8 @@
+import { appConfig } from './app/app.config';
 import { bootstrapApplication } from '@angular/platform-browser';
-import { provideRouter } from '@angular/router';
-import { AppComponent } from './app/app.component';
-import { appRoutes } from './app/app.routes';
 
-bootstrapApplication(AppComponent, {
+import { AppComponent } from './app/app.component';
-  providers: [provideRouter(appRoutes)],
+
-}).catch((err) => console.error(err));
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
+  console.error(err)
+);

apps/testing-router-outlet/tsconfig.json

@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.cy.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../tsconfig.base.json",

apps/testing-table/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

apps/testing-table/cypress.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nrwl/angular/plugins/component-testing';
+import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
 
 export default defineConfig({
   component: nxComponentTestingPreset(__filename),

apps/testing-table/cypress/tsconfig.cy.json

@@ -1,17 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["cypress", "node"]
-  },
-  "include": [
-    "support/**/*.ts",
-    "../cypress.config.ts",
-    "../**/*.cy.ts",
-    "../**/*.cy.tsx",
-    "../**/*.cy.js",
-    "../**/*.cy.jsx",
-    "../**/*.d.ts"
-  ]
-}

apps/testing-table/cypress/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["cypress", "node"],
+    "sourceMap": false
+  },
+  "include": [
+    "support/**/*.ts",
+    "../cypress.config.ts",
+    "../**/*.cy.ts",
+    "../**/*.cy.tsx",
+    "../**/*.cy.js",
+    "../**/*.cy.jsx",
+    "../**/*.d.ts"
+  ]
+}

apps/testing-table/project.json

@@ -68,7 +68,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": [
@@ -78,7 +78,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/testing-table/jest.config.ts",
@@ -92,7 +92,7 @@
       }
     },
     "component-test": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/testing-table/cypress.config.ts",
         "testingType": "component",

apps/testing-table/src/app/nx-welcome.component.ts

@@ -730,10 +730,10 @@ import { CommonModule } from '@angular/common';
               Add UI library
             </summary>
             <pre><span># Generate UI lib</span>
-nx g @nrwl/angular:lib ui
+nx g @nx/angular:lib ui
 
 <span># Add a component</span>
-nx g @nrwl/angular:component button --project ui</pre>
+nx g @nx/angular:component button --project ui</pre>
           </details>
           <details>
             <summary>

apps/testing-table/tailwind.config.js

@@ -1,4 +1,4 @@
-const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind');
 const { join } = require('path');
 
 /** @type {import('tailwindcss').Config} */

apps/testing-table/tsconfig.json

@@ -22,7 +22,7 @@
       "path": "./tsconfig.editor.json"
     },
     {
-      "path": "./cypress/tsconfig.cy.json"
+      "path": "./cypress/tsconfig.json"
     }
   ],
   "extends": "../../tsconfig.base.json",

apps/testing-todos-list/.eslintrc.json

@@ -23,13 +23,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]