@nx/playwright 23.0.0-beta.5 → 23.0.0-beta.7

package/package.json

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

package/src/executors/merge-reports/merge-reports.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-reports.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/executors/merge-reports/merge-reports.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,YAAY,CAAC;AAOpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe;;GAqHzB;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"merge-reports.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/executors/merge-reports/merge-reports.impl.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,YAAY,CAAC;AAMpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe;;GAqHzB;AAED,eAAe,oBAAoB,CAAC"}

package/src/executors/merge-reports/merge-reports.impl.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeReportsExecutor = mergeReportsExecutor;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -11,7 +11,7 @@ async function mergeReportsExecutor(options, context) {
     const { config, expectedSuites } = options;
     const projectRoot = (0, node_path_1.join)(context.root, context.projectsConfigurations.projects[context.projectName].root);
     const configPath = (0, node_path_1.join)(projectRoot, config);
-    const playwrightConfig = await (0, config_utils_1.loadConfigFile)(configPath);
+    const playwrightConfig = await (0, internal_1.loadConfigFile)(configPath);
     const reporterOutputs = (0, reporters_1.getReporterOutputs)(playwrightConfig);
     const blobReporterOutput = reporterOutputs.find(([reporter]) => reporter === 'blob');
     if (!blobReporterOutput) {

package/src/generators/configuration/configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAUjB,IAAI,EAML,MAAM,YAAY,CAAC;AAiBpB,OAAO,KAAK,EACV,4BAA4B,EAE7B,MAAM,UAAU,CAAC;AAGlB,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,8BAGtC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,4BAA4B,8BA+MzC;AA2JD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAUjB,IAAI,EAML,MAAM,YAAY,CAAC;AAepB,OAAO,KAAK,EACV,4BAA4B,EAE7B,MAAM,UAAU,CAAC;AAGlB,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,8BAGtC;AAED,wBAAsB,8BAA8B,CAClD,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,4BAA4B,8BA+MzC;AA2JD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 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");
@@ -112,7 +111,7 @@ async function configurationGeneratorInternal(tree, rawOptions) {
     if (isTsSolutionSetup) {
         const packageJsonPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'package.json');
         if (!tree.exists(packageJsonPath)) {
-            const importPath = (0, project_name_and_root_utils_1.resolveImportPath)(tree, projectConfig.name, projectConfig.root);
+            const importPath = (0, internal_1.resolveImportPath)(tree, projectConfig.name, projectConfig.root);
             const packageJson = {
                 name: importPath,
                 version: '0.0.1',
@@ -186,7 +185,7 @@ async function normalizeOptions(tree, options) {
     };
 }
 async function promptForMissingServeData(projectName) {
-    const { command, port } = await (0, prompt_1.promptWhenInteractive)([
+    const { command, port } = await (0, internal_1.promptWhenInteractive)([
         {
             type: 'input',
             name: 'command',

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBA0BlE;AA+BD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAGpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBA0BlE;AA+BD,eAAe,iBAAiB,CAAC"}

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const plugin_1 = require("../../plugins/plugin");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/playwright/plugin', plugin_1.createNodesV2, { targetName: 'e2e', ciTargetName: 'e2e-ci' }, [
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/playwright/plugin', plugin_1.createNodesV2, { targetName: 'e2e', ciTargetName: 'e2e-ci' }, [
         {
             executors: ['@nx/playwright:playwright'],
             postTargetTransformer,
@@ -14,7 +14,7 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+        throw new internal_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,8BAErE;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BA0C7B;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,8BAErE;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,8BA0C7B;AAED,eAAe,aAAa,CAAC"}

package/src/generators/init/init.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = initGenerator;
 exports.initGeneratorInternal = initGeneratorInternal;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function initGenerator(tree, options) {
@@ -22,7 +22,7 @@ async function initGeneratorInternal(tree, options) {
         }, undefined, options.keepExistingVersions));
     }
     if (options.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/playwright/plugin', plugin_1.createNodesV2, { targetName: ['e2e', 'playwright:e2e', 'playwright-e2e'] }, options.updatePackageScripts);
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/playwright/plugin', plugin_1.createNodesV2, { targetName: ['e2e', 'playwright:e2e', 'playwright-e2e'] }, options.updatePackageScripts);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

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;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"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/playwright/src/plugins/plugin.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,uBAAuB,CA+B9D,CAAC;AAEF,eAAO,MAAM,aAAa,wCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
-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 internal_2 = require("@nx/js/src/internal");
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -22,17 +20,19 @@ 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));
+        const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
+        const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
+        const lockFileName = (0, js_1.getLockFileName)(packageManager);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache, pmc), configFilePaths, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache, pmc, lockFileName), configFilePaths, options, context);
         }
         finally {
-            pluginCache.writeToDisk(cachePath);
+            pluginCache.writeToDisk();
         }
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, pluginCache, pmc) {
+async function createNodesInternal(configFilePath, options, context, pluginCache, pmc, lockFileName) {
     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));
@@ -42,13 +42,10 @@ async function createNodesInternal(configFilePath, options, context, pluginCache
     }
     const normalizedOptions = normalizeOptions(options);
     const externalTsconfigInputs = collectExternalTsconfigInputs(projectRoot, context.workspaceRoot);
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, {
+    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, {
         ...normalizedOptions,
         CI: process.env.CI,
-    }, context, [
-        (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
-        ...externalTsconfigInputs,
-    ]);
+    }, context, [lockFileName, ...externalTsconfigInputs]);
     if (!pluginCache.has(hash)) {
         pluginCache.set(hash, await buildPlaywrightTargets(configFilePath, projectRoot, normalizedOptions, context, pmc, externalTsconfigInputs));
     }
@@ -68,8 +65,8 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
     // 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 playwrightConfig = await (0, internal_1.loadConfigFile)((0, node_path_1.join)(context.workspaceRoot, configFilePath));
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const tsconfigJsonInputs = externalTsconfigInputs.map((file) => ({
         json: `{workspaceRoot}/${file}`,
         fields: ['compilerOptions', 'extends', 'files', 'include'],
@@ -454,11 +451,11 @@ function collectExternalTsconfigInputs(projectRoot, workspaceRoot) {
     };
     const projectTsconfig = (0, node_path_1.join)(workspaceRoot, projectRoot, 'tsconfig.json');
     if ((0, node_fs_1.existsSync)(projectTsconfig)) {
-        (0, internal_1.walkTsconfigExtendsChain)(projectTsconfig, visit);
+        (0, internal_2.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);
+        (0, internal_2.walkTsconfigExtendsChain)(rootTsconfig, visit);
     }
     return collected;
 }