@nx/playwright 20.3.1 → 20.3.3

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/package.json

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

package/src/generators/configuration/configuration.js

@@ -4,6 +4,7 @@ exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const prompt_1 = require("@nx/devkit/src/generators/prompt");
 const js_1 = require("@nx/js");
 const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
 const package_manager_workspaces_1 = require("@nx/js/src/utils/package-manager-workspaces");
@@ -141,6 +142,11 @@ async function normalizeOptions(tree, options) {
         (process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false);
     const linter = await (0, generator_prompts_1.normalizeLinterOption)(tree, options.linter);
+    if (!options.webServerCommand || !options.webServerAddress) {
+        const { webServerCommand, webServerAddress } = await promptForMissingServeData(options.project);
+        options.webServerCommand = webServerCommand;
+        options.webServerAddress = webServerAddress;
+    }
     return {
         ...options,
         addPlugin,
@@ -148,6 +154,29 @@ async function normalizeOptions(tree, options) {
         directory: options.directory ?? 'e2e',
     };
 }
+async function promptForMissingServeData(projectName) {
+    const { command, port } = await (0, prompt_1.promptWhenInteractive)([
+        {
+            type: 'input',
+            name: 'command',
+            message: 'What command should be run to serve the application locally?',
+            initial: `npx nx serve ${projectName}`,
+        },
+        {
+            type: 'numeral',
+            name: 'port',
+            message: 'What port will the application be served on?',
+            initial: 3000,
+        },
+    ], {
+        command: `npx nx serve ${projectName}`,
+        port: 3000,
+    });
+    return {
+        webServerCommand: command,
+        webServerAddress: `http://localhost:${port}`,
+    };
+}
 function getBrowsersInstallTask() {
     return () => {
         devkit_1.output.log({

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

@@ -3,7 +3,7 @@ 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 loaded_nx_plugin_1 = require("nx/src/project-graph/plugins/loaded-nx-plugin");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const path_1 = require("path");
@@ -19,7 +19,7 @@ async function addE2eCiTargetDefaults(tree) {
     for (const plugin of matchingPluginRegistrations) {
         let projectConfigs;
         try {
-            const loadedPlugin = new internal_api_1.LoadedNxPlugin({ createNodesV2, name: pluginName }, plugin);
+            const loadedPlugin = new loaded_nx_plugin_1.LoadedNxPlugin({ createNodesV2, name: pluginName }, plugin);
             projectConfigs = await (0, devkit_internals_1.retrieveProjectConfigurations)([loadedPlugin], tree.root, nxJson);
         }
         catch (e) {

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

@@ -4,7 +4,7 @@ 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");
-const internal_api_1 = require("nx/src/project-graph/plugins/internal-api");
+const loaded_nx_plugin_1 = require("nx/src/project-graph/plugins/loaded-nx-plugin");
 const retrieve_workspace_files_1 = require("nx/src/project-graph/utils/retrieve-workspace-files");
 const error_types_1 = require("nx/src/project-graph/error-types");
 const plugin_1 = require("@nx/webpack/src/plugins/plugin");
@@ -143,7 +143,7 @@ async function getServeStaticTargetNameForConfigFile(tree, pluginName, configFil
     for (const plugin of matchingPluginRegistrations) {
         let projectConfigs;
         try {
-            const loadedPlugin = new internal_api_1.LoadedNxPlugin({ createNodesV2, name: pluginName }, plugin);
+            const loadedPlugin = new loaded_nx_plugin_1.LoadedNxPlugin({ createNodesV2, name: pluginName }, plugin);
             projectConfigs = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)([loadedPlugin], tree.root, nxJson);
         }
         catch (e) {

package/src/plugins/plugin.js

@@ -106,7 +106,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
                 : ['default', '^default']),
             { externalDependencies: ['@playwright/test'] },
         ],
-        outputs: getTargetOutputs(testOutput, reporterOutputs, projectRoot),
+        outputs: getTargetOutputs(testOutput, reporterOutputs, context.workspaceRoot, projectRoot),
     };
     if (options.ciTargetName) {
         const ciBaseTargetConfig = {
@@ -118,7 +118,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
                     : ['default', '^default']),
                 { externalDependencies: ['@playwright/test'] },
             ],
-            outputs: getTargetOutputs(testOutput, reporterOutputs, projectRoot),
+            outputs: getTargetOutputs(testOutput, reporterOutputs, context.workspaceRoot, projectRoot),
         };
         const groupName = 'E2E (CI)';
         metadata = { targetGroups: { [groupName]: [] } };
@@ -142,7 +142,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
                     ...ciBaseTargetConfig.options,
                     env: getOutputEnvVars(reporterOutputs, outputSubfolder),
                 },
-                outputs: getTargetOutputs(testOutput, reporterOutputs, projectRoot, outputSubfolder),
+                outputs: getTargetOutputs(testOutput, reporterOutputs, context.workspaceRoot, projectRoot, outputSubfolder),
                 command: `${baseTargetConfig.command} ${relativeSpecFilePath} --output=${(0, node_path_1.join)(testOutput, outputSubfolder)}`,
                 metadata: {
                     technologies: ['playwright'],
@@ -273,21 +273,22 @@ function getReporterOutputs(playwrightConfig) {
     }
     return outputs;
 }
-function getTargetOutputs(testOutput, reporterOutputs, projectRoot, scope) {
+function getTargetOutputs(testOutput, reporterOutputs, workspaceRoot, projectRoot, scope) {
     const outputs = new Set();
-    outputs.add(normalizeOutput(projectRoot, scope ? (0, node_path_1.join)(testOutput, scope) : testOutput));
+    outputs.add(normalizeOutput(scope ? (0, node_path_1.join)(testOutput, scope) : testOutput, workspaceRoot, projectRoot));
     for (const [, output] of reporterOutputs) {
-        outputs.add(normalizeOutput(projectRoot, scope ? (0, node_path_1.join)(output, scope) : output));
+        outputs.add(normalizeOutput(scope ? (0, node_path_1.join)(output, scope) : output, workspaceRoot, projectRoot));
     }
     return Array.from(outputs);
 }
-function normalizeOutput(projectRoot, path) {
-    if (path.startsWith('..')) {
-        return (0, node_path_1.join)('{workspaceRoot}', (0, node_path_1.join)(projectRoot, path));
-    }
-    else {
-        return (0, node_path_1.join)('{projectRoot}', path);
+function normalizeOutput(path, workspaceRoot, projectRoot) {
+    const fullProjectRoot = (0, node_path_1.resolve)(workspaceRoot, projectRoot);
+    const fullPath = (0, node_path_1.resolve)(fullProjectRoot, path);
+    const pathRelativeToProjectRoot = (0, devkit_1.normalizePath)((0, node_path_1.relative)(fullProjectRoot, fullPath));
+    if (pathRelativeToProjectRoot.startsWith('..')) {
+        return (0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, node_path_1.relative)(workspaceRoot, fullPath));
     }
+    return (0, devkit_1.joinPathFragments)('{projectRoot}', pathRelativeToProjectRoot);
 }
 function getOutputEnvVars(reporterOutputs, outputSubfolder) {
     const env = {};