@nx/playwright 19.7.0-canary.20240820-0853690 → 19.7.0-canary.20240822-d6a0cfb

package/package.json

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

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())}`);
         }
     }