@nx/angular 16.6.0-beta.8 → 16.7.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.6.0-beta.8",
+  "version": "16.7.0-beta.1",
   "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-beta.8",
-    "@nx/cypress": "16.6.0-beta.8",
-    "@nx/devkit": "16.6.0-beta.8",
-    "@nx/jest": "16.6.0-beta.8",
-    "@nx/js": "16.6.0-beta.8",
-    "@nx/linter": "16.6.0-beta.8",
-    "@nx/webpack": "16.6.0-beta.8",
-    "@nx/workspace": "16.6.0-beta.8",
+    "@nrwl/angular": "16.7.0-beta.1",
+    "@nx/cypress": "16.7.0-beta.1",
+    "@nx/devkit": "16.7.0-beta.1",
+    "@nx/jest": "16.7.0-beta.1",
+    "@nx/js": "16.7.0-beta.1",
+    "@nx/linter": "16.7.0-beta.1",
+    "@nx/webpack": "16.7.0-beta.1",
+    "@nx/workspace": "16.7.0-beta.1",
     "@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": "d1d06349e703d903ac47fb7adc7d250ce140d77e"
+  "gitHead": "50a145bb64edcf76985184a9a83d1449dcd4f3d9"
 }

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -19,7 +19,7 @@ const log = require("ng-packagr/lib/utils/log");
 const path_1 = require("path");
 const postcssPresetEnv = require("postcss-preset-env");
 const postcssUrl = require("postcss-url");
-const url_1 = require("url");
+const node_url_1 = require("node:url");
 const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
 const tailwindcss_1 = require("../../../utilities/tailwindcss");
 const postcss = require('postcss');
@@ -187,7 +187,7 @@ class StylesheetProcessor {
                     }
                     return (yield Promise.resolve().then(() => require('sass')))
                         .compileString(css, {
-                        url: (0, url_1.pathToFileURL)(filePath),
+                        url: (0, node_url_1.pathToFileURL)(filePath),
                         syntax: '.sass' === ext ? 'indented' : 'scss',
                         loadPaths: this.styleIncludePaths,
                     })

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -19,7 +19,7 @@ const log = require("ng-packagr/lib/utils/log");
 const path_1 = require("path");
 const postcssPresetEnv = require("postcss-preset-env");
 const postcssUrl = require("postcss-url");
-const url_1 = require("url");
+const node_url_1 = require("node:url");
 const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
 const tailwindcss_1 = require("../../../utilities/tailwindcss");
 const postcss = require('postcss');
@@ -180,7 +180,7 @@ class StylesheetProcessor {
                     }
                     return (yield Promise.resolve().then(() => require('sass')))
                         .compileString(css, {
-                        url: (0, url_1.pathToFileURL)(filePath),
+                        url: (0, node_url_1.pathToFileURL)(filePath),
                         syntax: '.sass' === ext ? 'indented' : 'scss',
                         loadPaths: this.styleIncludePaths,
                     })

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/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/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/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 = {}));