@nx/web 16.6.0 → 16.7.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "16.6.0",
+  "version": "16.7.0-beta.0",
   "private": false,
   "description": "The Nx Plugin for Web Components contains generators for managing Web Component applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -30,9 +30,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/web": "16.6.0",
-    "@nx/devkit": "16.6.0",
-    "@nx/js": "16.6.0",
+    "@nrwl/web": "16.7.0-beta.0",
+    "@nx/devkit": "16.7.0-beta.0",
+    "@nx/js": "16.7.0-beta.0",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
     "detect-port": "^1.5.1",
@@ -44,5 +44,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "d02a8dbf06c85de78c0c76f64a17f10ae8085739"
+  "gitHead": "bda51652665181d38894e7ed910151e60176a9be"
 }

package/src/generators/application/application.js

@@ -144,7 +144,7 @@ function applicationGenerator(host, schema) {
             host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/app/app.element.spec.ts`));
         }
         if (options.linter === 'eslint') {
-            const { lintProjectGenerator } = yield (0, devkit_1.ensurePackage)('@nx/linter', versions_2.nxVersion);
+            const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/linter', versions_2.nxVersion);
             const lintTask = yield lintProjectGenerator(host, {
                 linter: options.linter,
                 project: options.projectName,
@@ -159,12 +159,32 @@ function applicationGenerator(host, schema) {
             tasks.push(lintTask);
         }
         if (options.e2eTestRunner === 'cypress') {
-            const { cypressProjectGenerator } = yield (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
+            const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
             const cypressTask = yield cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { name: `${options.name}-e2e`, directory: options.directory, project: options.projectName, skipFormat: true }));
             tasks.push(cypressTask);
         }
+        else if (options.e2eTestRunner === 'playwright') {
+            const { configurationGenerator: playwrightConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
+            (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                projectType: 'application',
+                targets: {},
+                implicitDependencies: [options.projectName],
+            });
+            const playwrightTask = yield playwrightConfigGenerator(host, {
+                project: options.e2eProjectName,
+                skipFormat: true,
+                skipPackageJson: false,
+                directory: 'src',
+                js: false,
+                linter: options.linter,
+                setParserOptionsProject: options.setParserOptionsProject,
+            });
+            tasks.push(playwrightTask);
+        }
         if (options.unitTestRunner === 'jest') {
-            const { configurationGenerator } = yield (0, devkit_1.ensurePackage)('@nx/jest', versions_2.nxVersion);
+            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_2.nxVersion);
             const jestTask = yield configurationGenerator(host, {
                 project: options.projectName,
                 skipSerializers: true,

package/src/generators/application/schema.d.ts

@@ -11,7 +11,7 @@ export interface Schema {
   tags?: string;
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   inSourceTests?: boolean;
-  e2eTestRunner?: 'cypress' | 'none';
+  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   linter?: Linter;
   standaloneConfig?: boolean;
   setParserOptionsProject?: boolean;

package/src/generators/application/schema.json

@@ -82,7 +82,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"
     },

package/src/generators/init/init.js

@@ -24,19 +24,27 @@ function webInitGenerator(tree, schema) {
         });
         tasks.push(jsInitTask);
         if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
-            const { jestInitGenerator } = yield (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
+            const { jestInitGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
             const jestTask = yield jestInitGenerator(tree, {
                 skipPackageJson: schema.skipPackageJson,
             });
             tasks.push(jestTask);
         }
         if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
-            const { cypressInitGenerator } = yield (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
             const cypressTask = yield cypressInitGenerator(tree, {
                 skipPackageJson: schema.skipPackageJson,
             });
             tasks.push(cypressTask);
         }
+        else if (schema.e2eTestRunner === 'playwright') {
+            const { initGenerator: playwrightInitGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+            const playwrightConfigTask = yield playwrightInitGenerator(tree, {
+                skipFormat: true,
+                skipPackageJson: schema.skipPackageJson,
+            });
+            tasks.push(playwrightConfigTask);
+        }
         if (!schema.skipPackageJson) {
             const installTask = updateDependencies(tree, schema);
             tasks.push(installTask);

package/src/generators/init/schema.d.ts

@@ -1,7 +1,7 @@
 export interface Schema {
   bundler?: 'webpack' | 'none' | 'vite';
   unitTestRunner?: 'jest' | 'vitest' | 'none';
-  e2eTestRunner?: 'cypress' | 'none';
+  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;
   skipPackageJson?: boolean;
 }

package/src/generators/init/schema.json

@@ -21,7 +21,8 @@
     "e2eTestRunner": {
       "description": "Adds the specified e2e test runner",
       "type": "string",
-      "enum": ["cypress", "none"],
+      "enum": ["cypress", "playwright", "none"],
+      "x-prompt": "Which E2E test runner would you like to use?",
       "default": "cypress"
     },
     "skipFormat": {