@nx/playwright 22.7.0-beta.12 → 22.7.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "22.7.0-beta.12",
+  "version": "22.7.0-beta.13",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -34,14 +34,14 @@
     "directory": "packages/playwright"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.12",
-    "@nx/eslint": "22.7.0-beta.12",
-    "@nx/js": "22.7.0-beta.12",
+    "@nx/devkit": "22.7.0-beta.13",
+    "@nx/eslint": "22.7.0-beta.13",
+    "@nx/js": "22.7.0-beta.13",
     "tslib": "^2.3.0",
     "minimatch": "10.2.4"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.12"
+    "nx": "22.7.0-beta.13"
   },
   "peerDependencies": {
     "@playwright/test": "^1.36.0"

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/playwright/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAepB,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,uBAAuB,CAwB9D,CAAC;AAEF,eAAO,MAAM,aAAa,wCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/playwright/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAgBpB,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,uBAAuB,CAwB9D,CAAC;AAEF,eAAO,MAAM,aAAa,wCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -6,6 +6,7 @@ const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculat
 const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const js_1 = require("@nx/js");
+const internal_1 = require("@nx/js/src/internal");
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -40,12 +41,16 @@ async function createNodesInternal(configFilePath, options, context, pluginCache
         return {};
     }
     const normalizedOptions = normalizeOptions(options);
+    const externalTsconfigInputs = collectExternalTsconfigInputs(projectRoot, context.workspaceRoot);
     const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, {
         ...normalizedOptions,
         CI: process.env.CI,
-    }, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+    }, context, [
+        (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+        ...externalTsconfigInputs,
+    ]);
     if (!pluginCache.has(hash)) {
-        pluginCache.set(hash, await buildPlaywrightTargets(configFilePath, projectRoot, normalizedOptions, context, pmc));
+        pluginCache.set(hash, await buildPlaywrightTargets(configFilePath, projectRoot, normalizedOptions, context, pmc, externalTsconfigInputs));
     }
     const { targets, metadata } = pluginCache.get(hash);
     return {
@@ -58,13 +63,17 @@ async function createNodesInternal(configFilePath, options, context, pluginCache
         },
     };
 }
-async function buildPlaywrightTargets(configFilePath, projectRoot, options, context, pmc) {
+async function buildPlaywrightTargets(configFilePath, projectRoot, options, context, pmc, externalTsconfigInputs) {
     // Playwright forbids importing the `@playwright/test` module twice. This would affect running the tests,
     // but we're just reading the config so let's delete the variable they are using to detect this.
     // See: https://github.com/microsoft/playwright/pull/11218/files
     delete process['__pw_initiator__'];
     const playwrightConfig = await (0, config_utils_1.loadConfigFile)((0, node_path_1.join)(context.workspaceRoot, configFilePath));
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const tsconfigJsonInputs = externalTsconfigInputs.map((file) => ({
+        json: `{workspaceRoot}/${file}`,
+        fields: ['compilerOptions', 'extends', 'files', 'include'],
+    }));
     const targets = {};
     let metadata;
     const testOutput = getTestOutput(playwrightConfig);
@@ -101,6 +110,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             ...('production' in namedInputs
                 ? ['default', '^production', '^{projectRoot}/tsconfig*.json']
                 : ['default', '^default']),
+            ...tsconfigJsonInputs,
             { externalDependencies: ['@playwright/test'] },
         ],
         outputs: getTargetOutputs(testOutput, reporterOutputs, context.workspaceRoot, projectRoot),
@@ -118,6 +128,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
                 ...('production' in namedInputs
                     ? ['default', '^production', '^{projectRoot}/tsconfig*.json']
                     : ['default', '^default']),
+                ...tsconfigJsonInputs,
                 { externalDependencies: ['@playwright/test'] },
             ],
             outputs: getTargetOutputs(testOutput, ciReporterOutputs, context.workspaceRoot, projectRoot),
@@ -398,3 +409,56 @@ function normalizeAtomizedTaskBlobReportOutput(output, subfolder) {
         ? (0, devkit_1.joinPathFragments)((0, node_path_1.dirname)(output), `${subfolder}.zip`)
         : (0, devkit_1.joinPathFragments)(output, `${subfolder}.zip`);
 }
+/**
+ * Collects tsconfig files read by the Playwright task that are NOT already
+ * covered by other inputs, returned as workspace-relative paths.
+ *
+ * Sources:
+ * - The project tsconfig's `extends` chain (compile-time config loading)
+ * - The workspace root `tsconfig.json` (read at runtime by
+ *   `isUsingTsSolutionSetup`, which `nxE2EPreset` calls from the Playwright
+ *   worker to pick the output directory convention)
+ *
+ * Exclusions:
+ * - Files inside the project root — covered by `default`
+ * - The native `TsConfiguration` hash instruction file at the workspace
+ *   root (`tsconfig.base.json` when it exists, otherwise `tsconfig.json`)
+ * - Files under `node_modules` — invalidated via the lockfile
+ * - Paths outside the workspace — cannot be expressed as inputs
+ */
+function collectExternalTsconfigInputs(projectRoot, workspaceRoot) {
+    const rootTsConfigName = (0, js_1.getRootTsConfigFileName)();
+    const projectPrefix = `${projectRoot}/`;
+    const collected = [];
+    const seen = new Set();
+    const visit = (absolutePath) => {
+        const wsRelative = (0, node_path_1.relative)(workspaceRoot, absolutePath)
+            .split(node_path_1.sep)
+            .join('/');
+        if (seen.has(wsRelative))
+            return 'continue';
+        seen.add(wsRelative);
+        if (wsRelative.startsWith('../') || wsRelative === '..')
+            return 'continue';
+        if (wsRelative.startsWith('node_modules/') ||
+            wsRelative.includes('/node_modules/')) {
+            return 'continue';
+        }
+        if (wsRelative === projectRoot || wsRelative.startsWith(projectPrefix)) {
+            return 'continue';
+        }
+        if (wsRelative === rootTsConfigName)
+            return 'continue';
+        collected.push(wsRelative);
+        return 'continue';
+    };
+    const projectTsconfig = (0, node_path_1.join)(workspaceRoot, projectRoot, 'tsconfig.json');
+    if ((0, node_fs_1.existsSync)(projectTsconfig)) {
+        (0, internal_1.walkTsconfigExtendsChain)(projectTsconfig, visit);
+    }
+    const rootTsconfig = (0, node_path_1.join)(workspaceRoot, 'tsconfig.json');
+    if ((0, node_fs_1.existsSync)(rootTsconfig)) {
+        (0, internal_1.walkTsconfigExtendsChain)(rootTsconfig, visit);
+    }
+    return collected;
+}