@nx/playwright 18.3.0-beta.0 → 18.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "18.3.0-beta.0",
+  "version": "18.3.0-beta.2",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -33,9 +33,9 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "18.3.0-beta.0",
-    "@nx/eslint": "18.3.0-beta.0",
-    "@nx/js": "18.3.0-beta.0",
+    "@nx/devkit": "18.3.0-beta.2",
+    "@nx/eslint": "18.3.0-beta.2",
+    "@nx/js": "18.3.0-beta.2",
     "tslib": "^2.3.0",
     "minimatch": "9.0.3"
   },

package/src/generators/init/init.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGeneratorInternal = exports.initGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function initGenerator(tree, options) {
@@ -22,10 +22,7 @@ async function initGeneratorInternal(tree, options) {
         }, undefined, options.keepExistingVersions));
     }
     if (options.addPlugin) {
-        addPlugin(tree);
-    }
-    if (options.updatePackageScripts) {
-        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/playwright/plugin', plugin_1.createNodes, { targetName: ['e2e', 'playwright:e2e', 'playwright-e2e'] }, options.updatePackageScripts);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -33,19 +30,4 @@ async function initGeneratorInternal(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.initGeneratorInternal = initGeneratorInternal;
-function addPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.plugins ??= [];
-    if (!nxJson.plugins.some((p) => typeof p === 'string'
-        ? p === '@nx/playwright/plugin'
-        : p.plugin === '@nx/playwright/plugin')) {
-        nxJson.plugins.push({
-            plugin: '@nx/playwright/plugin',
-            options: {
-                targetName: 'e2e',
-            },
-        });
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-    }
-}
 exports.default = initGenerator;

package/src/plugins/plugin.js

@@ -39,14 +39,15 @@ exports.createNodes = [
         const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
             (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
         ]);
-        const targets = targetsCache[hash] ??
+        const { targets, metadata } = targetsCache[hash] ??
             (await buildPlaywrightTargets(configFilePath, projectRoot, normalizedOptions, context));
-        calculatedTargets[hash] = targets;
+        calculatedTargets[hash] = { targets, metadata };
         return {
             projects: {
                 [projectRoot]: {
                     root: projectRoot,
                     targets,
+                    metadata,
                 },
             },
         };
@@ -60,11 +61,16 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
     const playwrightConfig = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(context.workspaceRoot, configFilePath));
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {};
+    let metadata;
     const baseTargetConfig = {
         command: 'playwright test',
         options: {
             cwd: '{projectRoot}',
         },
+        metadata: {
+            technologies: ['playwright'],
+            description: 'Runs Playwright Tests',
+        },
     };
     targets[options.targetName] = {
         ...baseTargetConfig,
@@ -83,6 +89,9 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
                 : ['default', '^default'],
             outputs: getOutputs(projectRoot, playwrightConfig),
         };
+        const groupName = 'E2E (CI)';
+        metadata = { targetGroups: { [groupName]: [] } };
+        const ciTargetGroup = metadata.targetGroups[groupName];
         const testDir = playwrightConfig.testDir
             ? (0, devkit_1.joinPathFragments)(projectRoot, playwrightConfig.testDir)
             : projectRoot;
@@ -90,11 +99,16 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
         playwrightConfig.testMatch ??= '**/*.@(spec|test).?(c|m)[jt]s?(x)';
         const dependsOn = [];
         forEachTestFile((testFile) => {
-            const relativeToProjectRoot = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, testFile));
-            const targetName = `${options.ciTargetName}--${relativeToProjectRoot}`;
+            const relativeSpecFilePath = (0, devkit_1.normalizePath)((0, path_1.relative)(projectRoot, testFile));
+            const targetName = `${options.ciTargetName}--${relativeSpecFilePath}`;
+            ciTargetGroup.push(targetName);
             targets[targetName] = {
                 ...ciBaseTargetConfig,
-                command: `${baseTargetConfig.command} ${relativeToProjectRoot}`,
+                command: `${baseTargetConfig.command} ${relativeSpecFilePath}`,
+                metadata: {
+                    technologies: ['playwright'],
+                    description: `Runs Playwright Tests in ${relativeSpecFilePath} in CI`,
+                },
             };
             dependsOn.push({
                 target: targetName,
@@ -113,11 +127,16 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             inputs: ciBaseTargetConfig.inputs,
             outputs: ciBaseTargetConfig.outputs,
             dependsOn,
+            metadata: {
+                technologies: ['playwright'],
+                description: 'Runs Playwright Tests in CI',
+            },
         };
+        ciTargetGroup.push(options.ciTargetName);
     }
-    return targets;
+    return { targets, metadata };
 }
-async function forEachTestFile(cb, opts) {
+function forEachTestFile(cb, opts) {
     const files = (0, workspace_context_1.getFilesInDirectoryUsingContext)(opts.context.workspaceRoot, opts.path);
     const matcher = createMatcher(opts.config.testMatch);
     const ignoredMatcher = opts.config.testIgnore