@nx/angular 16.6.0 → 16.7.0-beta.3

package/migrations.json

@@ -269,6 +269,15 @@
       "version": "16.6.0-beta.0",
       "description": "Explicitly set 'updateBuildableProjectDepsInPackageJson' to 'true' in targets that rely on that value as the default.",
       "factory": "./src/migrations/update-16-6-0/explicitly-set-projects-to-update-buildable-deps"
+    },
+    "update-angular-cli-version-16-2-0-rc-1": {
+      "cli": "nx",
+      "version": "16.7.0-beta.2",
+      "requires": {
+        "@angular/core": ">=16.2.0-rc.0"
+      },
+      "description": "Update the @angular/cli package version to ~16.2.0-rc.1.",
+      "factory": "./src/migrations/update-16-7-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1235,6 +1244,67 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "16.7.0": {
+      "version": "16.7.0-beta.2",
+      "packages": {
+        "@angular-devkit/architect": {
+          "version": "~0.1602.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-angular": {
+          "version": "~16.2.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1602.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~16.2.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~16.2.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/builders": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/common": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@nguniversal/express-engine": {
+          "version": "~16.2.0-rc.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~16.2.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~16.2.0-next.1",
+          "alwaysAddToPackageJson": false
+        }
+      },
+      "x-prompt": "Do you want to update the Angular version to v16.2?",
+      "requires": {
+        "@angular/core": ">=16.1.0 <16.2.0-next.1"
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.6.0",
+  "version": "16.7.0-beta.3",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -66,21 +66,21 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.6.0",
-    "@nx/cypress": "16.6.0",
-    "@nx/devkit": "16.6.0",
-    "@nx/jest": "16.6.0",
-    "@nx/js": "16.6.0",
-    "@nx/linter": "16.6.0",
-    "@nx/webpack": "16.6.0",
-    "@nx/workspace": "16.6.0",
+    "@nrwl/angular": "16.7.0-beta.3",
+    "@nx/cypress": "16.7.0-beta.3",
+    "@nx/devkit": "16.7.0-beta.3",
+    "@nx/jest": "16.7.0-beta.3",
+    "@nx/js": "16.7.0-beta.3",
+    "@nx/linter": "16.7.0-beta.3",
+    "@nx/webpack": "16.7.0-beta.3",
+    "@nx/workspace": "16.7.0-beta.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
     "enquirer": "^2.3.6",
     "find-cache-dir": "^3.3.2",
     "ignore": "^5.0.4",
-    "magic-string": "~0.26.2",
+    "magic-string": "~0.30.2",
     "minimatch": "3.0.5",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
@@ -107,5 +107,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "d02a8dbf06c85de78c0c76f64a17f10ae8085739"
+  "gitHead": "118faf4e432667fd041954d96aa6c9c99fea5ebd"
 }

package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts

@@ -1,4 +1,5 @@
 import type { Schema } from './schema';
-export declare function executeModuleFederationDevServerBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular").DevServerBuilderOutput>;
+import { executeWebpackDevServerBuilder } from '../webpack-dev-server/webpack-dev-server.impl';
+export declare function executeModuleFederationDevServerBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): ReturnType<typeof executeWebpackDevServerBuilder>;
 declare const _default: any;
 export default _default;

package/src/generators/application/lib/add-e2e.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = void 0;
 const tslib_1 = require("tslib");
-const cypress_1 = require("@nx/cypress");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 const remove_scaffolded_e2e_1 = require("./remove-scaffolded-e2e");
+const cypress_1 = require("@nx/cypress");
 function addE2e(tree, options) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         (0, remove_scaffolded_e2e_1.removeScaffoldedE2e)(tree, options, options.ngCliSchematicE2ERoot);
         if (options.e2eTestRunner === 'cypress') {
@@ -22,6 +23,26 @@ function addE2e(tree, options) {
                 skipFormat: true,
             });
         }
+        else if (options.e2eTestRunner === 'playwright') {
+            const { configurationGenerator: playwrightConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                implicitDependencies: [options.name],
+            });
+            yield playwrightConfigurationGenerator(tree, {
+                project: options.e2eProjectName,
+                skipFormat: true,
+                skipPackageJson: options.skipPackageJson,
+                directory: 'src',
+                js: false,
+                linter: options.linter,
+                setParserOptionsProject: options.setParserOptionsProject,
+                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
+                webServerAddress: `http://localhost:${(_a = options.port) !== null && _a !== void 0 ? _a : 4200}`,
+            });
+        }
     });
 }
 exports.addE2e = addE2e;

package/src/generators/application/schema.json

@@ -105,8 +105,9 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
       "description": "Test runner to use for end to end (E2E) tests.",
+      "x-prompt": "Which E2E test runner would you like to use?",
       "default": "cypress"
     },
     "tags": {

package/src/generators/host/schema.json

@@ -112,8 +112,9 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
       "description": "Test runner to use for end to end (E2E) tests.",
+      "x-prompt": "Which E2E test runner would you like to use?",
       "default": "cypress"
     },
     "tags": {

package/src/generators/init/init.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = void 0;
 const tslib_1 = require("tslib");
-const cypress_1 = require("@nx/cypress");
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
 const linter_1 = require("@nx/linter");
 const js_1 = require("@nx/js");
 const test_runners_1 = require("../../utils/test-runners");
 const version_utils_1 = require("../utils/version-utils");
+const versions_1 = require("../../utils/versions");
 function angularInitGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
@@ -123,7 +123,14 @@ function addE2ETestRunner(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         switch (options.e2eTestRunner) {
             case test_runners_1.E2eTestRunner.Cypress:
-                return (0, cypress_1.cypressInitGenerator)(tree, {
+                const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+                return cypressInitGenerator(tree, {
+                    skipPackageJson: options.skipPackageJson,
+                });
+            case test_runners_1.E2eTestRunner.Playwright:
+                const { initGenerator: playwrightInitGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+                return playwrightInitGenerator(tree, {
+                    skipFormat: true,
                     skipPackageJson: options.skipPackageJson,
                 });
             default:

package/src/generators/init/schema.json

@@ -21,7 +21,8 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
+      "x-prompt": "Which E2E test runner would you like to use?",
       "description": "Test runner to use for end to end (e2e) tests.",
       "default": "cypress",
       "x-priority": "important"

package/src/generators/ng-add/utilities/workspace.js

@@ -57,7 +57,9 @@ function createNxJson(tree, options, defaultProject) {
                         '!{projectRoot}/karma.conf.js',
                     ]
                     : []),
-                targets.lint ? '!{projectRoot}/.eslintrc.json' : undefined,
+                ...(targets.lint
+                    ? ['!{projectRoot}/.eslintrc.json', '!{projectRoot}/eslint.config.js']
+                    : []),
             ].filter(Boolean),
         },
         targetDefaults: {
@@ -72,7 +74,11 @@ function createNxJson(tree, options, defaultProject) {
                 : undefined,
             lint: targets.lint
                 ? {
-                    inputs: ['default', '{workspaceRoot}/.eslintrc.json'],
+                    inputs: [
+                        'default',
+                        '{workspaceRoot}/.eslintrc.json',
+                        '{workspaceRoot}/eslint.config.js',
+                    ],
                 }
                 : undefined,
             e2e: targets.e2e

package/src/generators/remote/schema.json

@@ -106,8 +106,9 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
       "description": "Test runner to use for end to end (E2E) tests.",
+      "x-prompt": "Which E2E test runner would you like to use?",
       "default": "cypress"
     },
     "tags": {

package/src/generators/setup-mf/lib/fix-bootstrap.js

@@ -25,11 +25,9 @@ function fixBootstrap(tree, appRoot, options) {
         : bootstrapImportCode);
 }
 exports.fixBootstrap = fixBootstrap;
-const standaloneBootstrapCode = (includeEnvironments = false) => `import {importProvidersFrom} from "@angular/core";
-import {bootstrapApplication} from "@angular/platform-browser";
-import {RouterModule} from "@angular/router";
-import {RemoteEntryComponent} from "./app/remote-entry/entry.component";
-import {appRoutes} from "./app/app.routes";
+const standaloneBootstrapCode = (includeEnvironments = false) => `import {bootstrapApplication} from "@angular/platform-browser";
+import {appConfig} from './app/app.config';
+import {RemoteEntryComponent} from './app/remote-entry/entry.component';
 ${includeEnvironments
     ? `import {enableProdMode} from '@angular/core';
 import {environment} from './environments/environment';
@@ -38,10 +36,6 @@ if(environment.production) {
 }
 `
     : ``}
-bootstrapApplication(RemoteEntryComponent, {
-  providers: [
-    importProvidersFrom(
-      RouterModule.forRoot(appRoutes, {initialNavigation: 'enabledBlocking'})
-    )
-  ]
-});`;
+bootstrapApplication(RemoteEntryComponent, appConfig).catch((err) =>
+  console.error(err)
+);`;

package/src/generators/utils/storybook-ast/component-info.js

@@ -10,7 +10,8 @@ const tree_utilities_1 = require("./tree-utilities");
 let tsModule;
 let tsquery;
 function getComponentsInfo(tree, entryPoint, moduleFilePaths, projectName) {
-    return moduleFilePaths.flatMap((moduleFilePath) => {
+    return moduleFilePaths
+        .flatMap((moduleFilePath) => {
         const file = (0, ast_utils_1.getTsSourceFile)(tree, moduleFilePath);
         const declaredComponents = (0, module_info_1.getModuleDeclaredComponents)(file, moduleFilePath, projectName);
         if (declaredComponents.length === 0) {
@@ -22,7 +23,8 @@ function getComponentsInfo(tree, entryPoint, moduleFilePaths, projectName) {
         const imports = file.statements.filter((statement) => statement.kind === tsModule.SyntaxKind.ImportDeclaration);
         const componentsInfo = declaredComponents.map((componentName) => getComponentInfo(tree, entryPoint, file, imports, moduleFilePath, componentName));
         return componentsInfo;
-    });
+    })
+        .filter((f) => f !== undefined);
 }
 exports.getComponentsInfo = getComponentsInfo;
 function getStandaloneComponentsInfo(tree, entryPoint) {

package/src/migrations/update-16-7-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~16.2.0-rc.1";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-7-0/update-angular-cli.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~16.2.0-rc.1';
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let shouldFormat = false;
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            var _a, _b;
+            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
+                json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+                shouldFormat = true;
+            }
+            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
+                json.dependencies['@angular/cli'] = exports.angularCliVersion;
+                shouldFormat = true;
+            }
+            return json;
+        });
+        if (shouldFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;

package/src/utils/test-runners.d.ts

@@ -4,5 +4,6 @@ export declare enum UnitTestRunner {
 }
 export declare enum E2eTestRunner {
     Cypress = "cypress",
+    Playwright = "playwright",
     None = "none"
 }

package/src/utils/test-runners.js

@@ -9,5 +9,6 @@ var UnitTestRunner;
 var E2eTestRunner;
 (function (E2eTestRunner) {
     E2eTestRunner["Cypress"] = "cypress";
+    E2eTestRunner["Playwright"] = "playwright";
     E2eTestRunner["None"] = "none";
 })(E2eTestRunner || (exports.E2eTestRunner = E2eTestRunner = {}));

package/src/utils/versions.d.ts

@@ -1,13 +1,13 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~16.1.0";
-export declare const angularDevkitVersion = "~16.1.0";
-export declare const ngPackagrVersion = "~16.1.0";
+export declare const angularVersion = "~16.2.0-rc.0";
+export declare const angularDevkitVersion = "~16.2.0-rc.1";
+export declare const ngPackagrVersion = "~16.2.0-next.1";
 export declare const ngrxVersion = "~16.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.13.0";
 export declare const angularJsVersion = "1.7.9";
 export declare const tsLibVersion = "^2.3.0";
-export declare const ngUniversalVersion = "~16.1.0";
+export declare const ngUniversalVersion = "~16.2.0-rc.0";
 export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.5";
 export declare const expressVersion = "~4.18.2";

package/src/utils/versions.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.ngUniversalVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~16.1.0';
-exports.angularDevkitVersion = '~16.1.0';
-exports.ngPackagrVersion = '~16.1.0';
+exports.angularVersion = '~16.2.0-rc.0';
+exports.angularDevkitVersion = '~16.2.0-rc.1';
+exports.ngPackagrVersion = '~16.2.0-next.1';
 exports.ngrxVersion = '~16.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.13.0';
 exports.angularJsVersion = '1.7.9';
 exports.tsLibVersion = '^2.3.0';
-exports.ngUniversalVersion = '~16.1.0';
+exports.ngUniversalVersion = '~16.2.0-rc.0';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';