@nx/playwright 19.6.0-canary.20240803-bd7a2c9 → 19.6.0-canary.20240808-333ab77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "19.6.0-canary.20240803-bd7a2c9",
+  "version": "19.6.0-canary.20240808-333ab77",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "19.6.0-canary.20240803-bd7a2c9",
-    "@nx/eslint": "19.6.0-canary.20240803-bd7a2c9",
-    "@nx/js": "19.6.0-canary.20240803-bd7a2c9",
+    "@nx/devkit": "19.6.0-canary.20240808-333ab77",
+    "@nx/eslint": "19.6.0-canary.20240808-333ab77",
+    "@nx/js": "19.6.0-canary.20240808-333ab77",
     "tslib": "^2.3.0",
     "minimatch": "9.0.3"
   },

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

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function addE2eCiTargetDefaults(tree: Tree): Promise<void>;

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

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = addE2eCiTargetDefaults;
+const devkit_1 = require("@nx/devkit");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
+const internal_api_1 = require("nx/src/project-graph/plugins/internal-api");
+const devkit_internals_1 = require("nx/src/devkit-internals");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+async function addE2eCiTargetDefaults(tree) {
+    const pluginName = '@nx/playwright/plugin';
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const matchingPluginRegistrations = nxJson.plugins?.filter((p) => typeof p === 'string' ? p === pluginName : p.plugin === pluginName);
+    if (!matchingPluginRegistrations) {
+        return;
+    }
+    const { createNodesV2, } = await Promise.resolve(`${pluginName}`).then(s => require(s));
+    for (const plugin of matchingPluginRegistrations) {
+        let projectConfigs;
+        try {
+            const loadedPlugin = new internal_api_1.LoadedNxPlugin({ createNodesV2, name: pluginName }, plugin);
+            projectConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([loadedPlugin], tree.root, nxJson);
+        }
+        catch (e) {
+            if (e instanceof devkit_internals_1.ProjectConfigurationsError) {
+                projectConfigs = e.partialProjectConfigurationsResult;
+            }
+            else {
+                throw e;
+            }
+        }
+        for (const configFile of projectConfigs.matchingProjectFiles) {
+            const configFileContents = tree.read(configFile, 'utf-8');
+            const ast = tsquery_1.tsquery.ast(configFileContents);
+            const CI_WEBSERVER_COMMAND_SELECTOR = 'PropertyAssignment:has(Identifier[name=webServer]) PropertyAssignment:has(Identifier[name=command]) > StringLiteral';
+            const nodes = (0, tsquery_1.tsquery)(ast, CI_WEBSERVER_COMMAND_SELECTOR, {
+                visitAllChildren: true,
+            });
+            if (!nodes.length) {
+                continue;
+            }
+            const ciWebServerCommand = nodes[0].getText();
+            let serveStaticProject;
+            let serveStaticTarget;
+            let serveStaticConfiguration;
+            if (ciWebServerCommand.includes('nx run')) {
+                const NX_TARGET_REGEX = "(?<=nx run )[^']+";
+                const matches = ciWebServerCommand.match(NX_TARGET_REGEX);
+                if (!matches) {
+                    continue;
+                }
+                const targetString = matches[0];
+                const { project, target, configuration } = (0, devkit_1.parseTargetString)(targetString, graph);
+                serveStaticProject = project;
+                serveStaticTarget = target;
+                serveStaticConfiguration = configuration;
+            }
+            else {
+                const NX_PROJECT_REGEX = 'nx\\s+([^ ]+)\\s+([^ ]+)';
+                const matches = ciWebServerCommand.match(NX_PROJECT_REGEX);
+                if (!matches) {
+                    return;
+                }
+                serveStaticTarget = matches[1];
+                serveStaticProject = matches[2];
+            }
+            const resolvedServeStaticTarget = graph.nodes[serveStaticProject].data.targets[serveStaticTarget];
+            let resolvedBuildTarget;
+            if (resolvedServeStaticTarget.dependsOn) {
+                resolvedBuildTarget = resolvedServeStaticTarget.dependsOn.join(',');
+            }
+            else {
+                resolvedBuildTarget =
+                    (serveStaticConfiguration
+                        ? resolvedServeStaticTarget.configurations[serveStaticConfiguration]
+                            .buildTarget
+                        : resolvedServeStaticTarget.options.buildTarget) ?? 'build';
+            }
+            const buildTarget = `^${resolvedBuildTarget}`;
+            await (0, target_defaults_utils_1.addE2eCiTargetDefaults)(tree, pluginName, buildTarget, configFile);
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
+const add_e2e_ci_target_defaults_1 = require("./add-e2e-ci-target-defaults");
 async function default_1(tree) {
     const graph = await (0, devkit_1.createProjectGraphAsync)();
     (0, devkit_1.visitNotIgnoredFiles)(tree, '', (path) => {
@@ -80,5 +81,6 @@ async function default_1(tree) {
             tree.write(path, `${playwrightConfigFileContents.slice(0, webServerUrlNode.getStart())}${newWebServerUrl}${playwrightConfigFileContents.slice(webServerUrlNode.getEnd())}`);
         }
     });
+    await (0, add_e2e_ci_target_defaults_1.default)(tree);
     await (0, devkit_1.formatFiles)(tree);
 }