@nx/playwright 20.4.0 → 20.4.2

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",
+  "version": "20.4.2",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -35,11 +35,11 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "20.4.0",
-    "@nx/eslint": "20.4.0",
-    "@nx/webpack": "20.4.0",
-    "@nx/vite": "20.4.0",
-    "@nx/js": "20.4.0",
+    "@nx/devkit": "20.4.2",
+    "@nx/eslint": "20.4.2",
+    "@nx/webpack": "20.4.2",
+    "@nx/vite": "20.4.2",
+    "@nx/js": "20.4.2",
     "tslib": "^2.3.0",
     "minimatch": "9.0.3"
   },

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') {