@nx/playwright 22.7.0-pr.35019.f500fd7 → 22.7.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "22.7.0-pr.35019.f500fd7",
+  "version": "22.7.0-rc.0",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -22,7 +22,7 @@
     "Front-end"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -34,14 +34,14 @@
     "directory": "packages/playwright"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-pr.35019.f500fd7",
-    "@nx/eslint": "22.7.0-pr.35019.f500fd7",
-    "@nx/js": "22.7.0-pr.35019.f500fd7",
+    "@nx/devkit": "22.7.0-rc.0",
+    "@nx/eslint": "22.7.0-rc.0",
+    "@nx/js": "22.7.0-rc.0",
     "tslib": "^2.3.0",
     "minimatch": "10.2.4"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.35019.f500fd7"
+    "nx": "22.7.0-rc.0"
   },
   "peerDependencies": {
     "@playwright/test": "^1.36.0"
@@ -68,6 +68,5 @@
   },
   "nx-migrations": {
     "migrations": "./migrations.json"
-  },
-  "types": "./index.d.ts"
+  }
 }

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;AAiBpB,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,uBAAuB,CAqB9D,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");
@@ -14,7 +15,6 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
 const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const reporters_1 = require("../utils/reporters");
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 const playwrightConfigGlob = '**/playwright.config.{js,ts,cjs,cts,mjs,mts}';
 exports.createNodes = [
     playwrightConfigGlob,
@@ -22,8 +22,9 @@ exports.createNodes = [
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `playwright-${optionsHash}.hash`);
         const pluginCache = new plugin_cache_utils_1.PluginCache(cachePath);
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache), configFilePaths, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache, pmc), configFilePaths, options, context);
         }
         finally {
             pluginCache.writeToDisk(cachePath);
@@ -31,7 +32,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, pluginCache) {
+async function createNodesInternal(configFilePath, options, context, pluginCache, pmc) {
     const projectRoot = (0, node_path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
     const siblingFiles = (0, node_fs_1.readdirSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot));
@@ -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));
+        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) {
+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);
@@ -99,8 +108,9 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
         cache: true,
         inputs: [
             ...('production' in namedInputs
-                ? ['default', '^{projectRoot}/tsconfig*.json', '^production']
+                ? ['default', '^production', '^{projectRoot}/tsconfig*.json']
                 : ['default', '^default']),
+            ...tsconfigJsonInputs,
             { externalDependencies: ['@playwright/test'] },
         ],
         outputs: getTargetOutputs(testOutput, reporterOutputs, context.workspaceRoot, projectRoot),
@@ -116,8 +126,9 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             cache: true,
             inputs: [
                 ...('production' in namedInputs
-                    ? ['default', '^{projectRoot}/tsconfig*.json', '^production']
+                    ? ['default', '^production', '^{projectRoot}/tsconfig*.json']
                     : ['default', '^default']),
+                ...tsconfigJsonInputs,
                 { externalDependencies: ['@playwright/test'] },
             ],
             outputs: getTargetOutputs(testOutput, ciReporterOutputs, context.workspaceRoot, projectRoot),
@@ -160,7 +171,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
                     env: getAtomizedTaskEnvVars(reporterOutputs, outputSubfolder),
                 },
                 outputs: getAtomizedTaskOutputs(testOutput, reporterOutputs, context.workspaceRoot, projectRoot, outputSubfolder),
-                command: `${baseTargetConfig.command} ${relativeSpecFilePath} --output=${(0, node_path_1.join)(testOutput, outputSubfolder)}`,
+                command: `${baseTargetConfig.command} ${relativeSpecFilePath} --output=${(0, devkit_1.joinPathFragments)(testOutput, outputSubfolder)}`,
                 metadata: {
                     technologies: ['playwright'],
                     description: `Runs Playwright Tests in ${relativeSpecFilePath} in CI`,
@@ -219,7 +230,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             inputs: ciBaseTargetConfig.inputs,
             outputs: Array.from(mergeReportsTargetOutputs),
             options: {
-                config: node_path_1.posix.relative(projectRoot, configFilePath),
+                config: (0, devkit_1.normalizePath)((0, node_path_1.relative)(projectRoot, configFilePath)),
                 expectedSuites: dependsOn.length,
             },
             metadata: {
@@ -306,9 +317,9 @@ function getAtomizedTaskOutputs(testOutput, reporterOutputs, workspaceRoot, proj
 function addSubfolderToOutput(output, subfolder) {
     const parts = (0, node_path_1.parse)(output);
     if (parts.ext !== '') {
-        return (0, node_path_1.join)(parts.dir, subfolder, parts.base);
+        return (0, devkit_1.joinPathFragments)(parts.dir, subfolder, parts.base);
     }
-    return (0, node_path_1.join)(output, subfolder);
+    return (0, devkit_1.joinPathFragments)(output, subfolder);
 }
 function getWebserverCommandTasks(playwrightConfig) {
     if (!playwrightConfig.webServer) {
@@ -395,6 +406,59 @@ function getAtomizedTaskEnvVars(reporterOutputs, outputSubfolder) {
 function normalizeAtomizedTaskBlobReportOutput(output, subfolder) {
     // set unique name for the blob report file
     return output.endsWith('.zip')
-        ? (0, node_path_1.join)((0, node_path_1.dirname)(output), `${subfolder}.zip`)
-        : (0, node_path_1.join)(output, `${subfolder}.zip`);
+        ? (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;
 }

package/project.json

@@ -1,58 +0,0 @@
-{
-    "name": "playwright",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/playwright",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/playwright/README.md"],
-            "commands": ["node ./scripts/copy-readme.js playwright"]
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/playwright",
-                        "glob": "PLUGIN.md",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    },
-    "tags": []
-}