@nx/playwright 20.4.0-rc.0 → 20.4.1

package/generators.json

@@ -10,7 +10,8 @@
     "init": {
       "factory": "./src/generators/init/init#initGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
-      "description": "Initializes a Playwright project in the current workspace"
+      "description": "Initializes a Playwright project in the current workspace",
+      "hidden": true
     },
     "convert-to-inferred": {
       "factory": "./src/generators/convert-to-inferred/convert-to-inferred",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "20.4.0-rc.0",
+  "version": "20.4.1",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -35,20 +35,26 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "20.4.0-rc.0",
-    "@nx/eslint": "20.4.0-rc.0",
-    "@nx/webpack": "20.4.0-rc.0",
-    "@nx/vite": "20.4.0-rc.0",
-    "@nx/js": "20.4.0-rc.0",
+    "@nx/devkit": "20.4.1",
+    "@nx/eslint": "20.4.1",
+    "@nx/js": "20.4.1",
     "tslib": "^2.3.0",
     "minimatch": "9.0.3"
   },
   "peerDependencies": {
-    "@playwright/test": "^1.36.0"
+    "@playwright/test": "^1.36.0",
+    "@nx/webpack": "file:../webpack",
+    "@nx/vite": "file:../vite"
   },
   "peerDependenciesMeta": {
     "@playwright/test": {
       "optional": true
+    },
+    "@nx/webpack": {
+      "optional": true
+    },
+    "@nx/vite": {
+      "optional": true
     }
   },
   "executors": "./executors.json",

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

@@ -7,8 +7,6 @@ const add_e2e_ci_target_defaults_1 = require("./add-e2e-ci-target-defaults");
 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");
-const plugin_2 = require("@nx/vite/plugin");
 async function default_1(tree) {
     const graph = await (0, devkit_1.createProjectGraphAsync)();
     const collectedProjects = [];
@@ -86,8 +84,8 @@ async function default_1(tree) {
             : 'preview', projectToMigrate.configFileType === 'webpack'
             ? 'serveStaticTargetName'
             : 'previewTargetName', projectToMigrate.configFileType === 'webpack'
-            ? plugin_1.createNodesV2
-            : plugin_2.createNodesV2)) ??
+            ? (await getDynamicImportedModule('@nx/webpack/src/plugins/plugin', '@nx/webpack should be installed when attempting to setup @nx/playwright with a webpack config file.')).createNodesV2
+            : (await getDynamicImportedModule('@nx/vite/plugin', '@nx/vite should be installed when attempting to setup @nx/playwright with a vite config file.')).createNodesV2)) ??
             getServeStaticLikeTarget(tree, graph, projectToMigrate.projectName, projectToMigrate.configFileType === 'webpack'
                 ? '@nx/web:file-server'
                 : '@nx/vite:preview-server');
@@ -133,6 +131,14 @@ async function default_1(tree) {
     await (0, add_e2e_ci_target_defaults_1.default)(tree);
     await (0, devkit_1.formatFiles)(tree);
 }
+async function getDynamicImportedModule(moduleName, error) {
+    try {
+        return (await Promise.resolve(`${moduleName}`).then(s => require(s)));
+    }
+    catch {
+        throw new Error(error);
+    }
+}
 async function getServeStaticTargetNameForConfigFile(tree, pluginName, configFile, defaultTargetName, targetNamePluginOption, createNodesV2) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const matchingPluginRegistrations = nxJson.plugins?.filter((p) => typeof p === 'string' ? p === pluginName : p.plugin === pluginName);

package/src/plugins/plugin.js

@@ -273,14 +273,23 @@ function getReporterOutputs(playwrightConfig) {
     }
     return outputs;
 }
-function getTargetOutputs(testOutput, reporterOutputs, workspaceRoot, projectRoot, scope) {
+function getTargetOutputs(testOutput, reporterOutputs, workspaceRoot, projectRoot, subFolder) {
     const outputs = new Set();
-    outputs.add(normalizeOutput(scope ? (0, node_path_1.join)(testOutput, scope) : testOutput, workspaceRoot, projectRoot));
+    outputs.add(normalizeOutput(addSubfolderToOutput(testOutput, subFolder), workspaceRoot, projectRoot));
     for (const [, output] of reporterOutputs) {
-        outputs.add(normalizeOutput(scope ? (0, node_path_1.join)(output, scope) : output, workspaceRoot, projectRoot));
+        outputs.add(normalizeOutput(addSubfolderToOutput(output, subFolder), workspaceRoot, projectRoot));
     }
     return Array.from(outputs);
 }
+function addSubfolderToOutput(output, subfolder) {
+    if (!subfolder)
+        return output;
+    const parts = (0, node_path_1.parse)(output);
+    if (parts.ext !== '') {
+        return (0, node_path_1.join)(parts.dir, subfolder, parts.base);
+    }
+    return (0, node_path_1.join)(output, subfolder);
+}
 function normalizeOutput(path, workspaceRoot, projectRoot) {
     const fullProjectRoot = (0, node_path_1.resolve)(workspaceRoot, projectRoot);
     const fullPath = (0, node_path_1.resolve)(fullProjectRoot, path);
@@ -296,7 +305,7 @@ function getOutputEnvVars(reporterOutputs, outputSubfolder) {
         if (outputSubfolder) {
             const isFile = (0, node_path_1.parse)(output).ext !== '';
             const envVarName = `PLAYWRIGHT_${reporter.toUpperCase()}_OUTPUT_${isFile ? 'FILE' : 'DIR'}`;
-            env[envVarName] = (0, node_path_1.join)(output, outputSubfolder);
+            env[envVarName] = addSubfolderToOutput(output, outputSubfolder);
             // Also set PLAYWRIGHT_HTML_REPORT for Playwright prior to 1.45.0.
             // HTML prior to this version did not follow the pattern of "PLAYWRIGHT_<REPORTER>_OUTPUT_<FILE|DIR>".
             if (reporter === 'html') {