@nx/playwright 19.6.0 → 19.7.0-beta.0

package/README.md

@@ -22,7 +22,7 @@
 
 # Nx: Smart Monorepos · Fast CI
 
-Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
+Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
 
 ## Getting Started
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "19.6.0",
+  "version": "19.7.0-beta.0",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -35,11 +35,11 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "19.6.0",
-    "@nx/eslint": "19.6.0",
-    "@nx/webpack": "19.6.0",
-    "@nx/vite": "19.6.0",
-    "@nx/js": "19.6.0",
+    "@nx/devkit": "19.7.0-beta.0",
+    "@nx/eslint": "19.7.0-beta.0",
+    "@nx/webpack": "19.7.0-beta.0",
+    "@nx/vite": "19.7.0-beta.0",
+    "@nx/js": "19.7.0-beta.0",
     "tslib": "^2.3.0",
     "minimatch": "9.0.3"
   },

package/src/executors/playwright/schema.json

@@ -105,18 +105,7 @@
     },
     "reporter": {
       "type": "string",
-      "enum": [
-        "list",
-        "line",
-        "dot",
-        "json",
-        "junit",
-        "null",
-        "github",
-        "html",
-        "blob"
-      ],
-      "description": "Reporter to use, comma-separated, can be 'list', 'line', 'dot', 'json', 'junit', 'null', 'github', 'html', 'blob'. To configure reporter options, use the playwright configuration."
+      "description": "Common Reporter values to use, comma-separated, 'list', 'line', 'dot', 'json', 'junit', 'null', 'github', 'html', 'blob'. To configure reporter options, use the playwright configuration."
     },
     "retries": {
       "type": "number",

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

@@ -1,4 +1,4 @@
-import type { Linter } from '@nx/eslint';
+import type { Linter, LinterType } from '@nx/eslint';
 
 export interface ConfigurationGeneratorSchema {
   project: string;
@@ -10,7 +10,7 @@ export interface ConfigurationGeneratorSchema {
   skipFormat: boolean;
   skipPackageJson: boolean;
   skipInstall?: boolean;
-  linter: Linter;
+  linter: Linter | LinterType;
   setParserOptionsProject: boolean; // default is false
   /**
    * command to give playwright to run the web server

package/src/migrations/update-19-6-0/add-e2e-ci-target-defaults.js

@@ -40,7 +40,7 @@ async function addE2eCiTargetDefaults(tree) {
             if (!nodes.length) {
                 continue;
             }
-            const ciWebServerCommand = nodes[0].getText();
+            const ciWebServerCommand = nodes[0].getText().replace(/['"]/g, '');
             let serveStaticProject;
             let serveStaticTarget;
             let serveStaticConfiguration;
@@ -65,7 +65,7 @@ async function addE2eCiTargetDefaults(tree) {
                 serveStaticTarget = matches[1];
                 serveStaticProject = matches[2];
             }
-            const resolvedServeStaticTarget = graph.nodes[serveStaticProject].data.targets[serveStaticTarget];
+            const resolvedServeStaticTarget = graph.nodes[serveStaticProject]?.data?.targets?.[serveStaticTarget];
             if (!resolvedServeStaticTarget) {
                 continue;
             }

package/src/migrations/update-19-6-0/use-serve-static-preview-for-command.js

@@ -28,27 +28,33 @@ async function default_1(tree) {
         const commandValueNode = nodes[0];
         const command = commandValueNode.getText();
         let project;
+        let portFlagValue;
         if (command.includes('nx run')) {
-            const NX_RUN_TARGET_REGEX = "(?<=nx run )[^']+";
+            const NX_RUN_TARGET_REGEX = /(?<=nx run )([^' ]+)(?: [^']*--port[= ](\d+))?/;
             const matches = command.match(NX_RUN_TARGET_REGEX);
             if (!matches) {
                 return;
             }
-            const targetString = matches[0];
+            const targetString = matches[1];
             const parsedTargetString = (0, devkit_1.parseTargetString)(targetString, graph);
             if (parsedTargetString.target === 'serve-static' ||
                 parsedTargetString.target === 'preview') {
                 return;
             }
             project = parsedTargetString.project;
+            portFlagValue = matches[2];
         }
         else {
-            const NX_PROJECT_REGEX = "(?<=nx [^ ]+ )[^']+";
+            const NX_PROJECT_REGEX = /(?<=nx [^ ]+ )([^' ]+)(?: [^']*--port[= ](\d+))?/;
             const matches = command.match(NX_PROJECT_REGEX);
             if (!matches) {
                 return;
             }
-            project = matches[0];
+            project = matches[1];
+            portFlagValue = matches[2];
+        }
+        if (!project || !graph.nodes[project]) {
+            return;
         }
         const pathToViteConfig = [
             (0, devkit_1.joinPathFragments)(graph.nodes[project].data.root, 'vite.config.ts'),
@@ -67,6 +73,7 @@ async function default_1(tree) {
                 configFileType: pathToWebpackConfig ? 'webpack' : 'vite',
                 playwrightConfigFile: path,
                 commandValueNode,
+                portFlagValue,
             });
         }
     });
@@ -88,7 +95,9 @@ async function default_1(tree) {
             continue;
         }
         const oldCommand = projectToMigrate.commandValueNode.getText();
-        const newCommand = oldCommand.replace(/nx.*[^"']/, `nx run ${projectToMigrate.projectName}:${targetName}`);
+        const newCommand = oldCommand.replace(/nx.*[^"']/, `nx run ${projectToMigrate.projectName}:${targetName}${projectToMigrate.portFlagValue
+            ? ` --port=${projectToMigrate.portFlagValue}`
+            : ''}`);
         if (projectToMigrate.configFileType === 'webpack') {
             tree.write(projectToMigrate.playwrightConfigFile, `${playwrightConfigFileContents.slice(0, projectToMigrate.commandValueNode.getStart())}${newCommand}${playwrightConfigFileContents.slice(projectToMigrate.commandValueNode.getEnd())}`);
         }
@@ -103,8 +112,9 @@ async function default_1(tree) {
             if (!baseUrlNodes.length) {
                 return;
             }
+            const serverUrl = `http://localhost:${projectToMigrate.portFlagValue ?? '4300'}`;
             const baseUrlNode = baseUrlNodes[0];
-            const newBaseUrlVariableDeclaration = "baseURL = process.env['BASE_URL'] || 'http://localhost:4300';";
+            const newBaseUrlVariableDeclaration = `baseURL = process.env['BASE_URL'] || '${serverUrl}';`;
             tree.write(projectToMigrate.playwrightConfigFile, `${playwrightConfigFileContents.slice(0, baseUrlNode.getStart())}${newBaseUrlVariableDeclaration}${playwrightConfigFileContents.slice(baseUrlNode.getEnd())}`);
             playwrightConfigFileContents = tree.read(projectToMigrate.playwrightConfigFile, 'utf-8');
             ast = tsquery_1.tsquery.ast(playwrightConfigFileContents);
@@ -116,7 +126,7 @@ async function default_1(tree) {
                 return;
             }
             const webServerUrlNode = webServerUrlNodes[0];
-            const newWebServerUrl = "'http://localhost:4300'";
+            const newWebServerUrl = `'${serverUrl}'`;
             tree.write(projectToMigrate.playwrightConfigFile, `${playwrightConfigFileContents.slice(0, webServerUrlNode.getStart())}${newWebServerUrl}${playwrightConfigFileContents.slice(webServerUrlNode.getEnd())}`);
         }
     }

package/src/utils/add-linter.d.ts

@@ -1,8 +1,8 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
-import { Linter } from '@nx/eslint';
+import { Linter, LinterType } from '@nx/eslint';
 export interface PlaywrightLinterOptions {
     project: string;
-    linter: Linter;
+    linter: Linter | LinterType;
     setParserOptionsProject: boolean;
     skipPackageJson: boolean;
     rootProject: boolean;