@nx/playwright 23.0.0-beta.11 → 23.0.0-beta.13

package/package.json

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

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":"AACA,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,8BAkNzC;AA2JD,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/playwright/src/generators/configuration/configuration.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,iBAAiB,EAWjB,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,8BAkNzC;AAyKD,eAAe,sBAAsB,CAAC"}

package/src/generators/configuration/configuration.js

@@ -6,10 +6,7 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 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");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const deprecation_1 = require("../../utils/deprecation");
 const child_process_1 = require("child_process");
 const path = tslib_1.__importStar(require("path"));
@@ -39,7 +36,7 @@ async function configurationGeneratorInternal(tree, rawOptions) {
         webServerAddress: options.webServerAddress ?? null,
         ...options,
     });
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)(tree);
     const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
     if (tree.exists(tsconfigPath)) {
         if (isTsSolutionSetup) {
@@ -146,7 +143,7 @@ async function configurationGeneratorInternal(tree, rawOptions) {
         addPlugin: options.addPlugin,
     }));
     if (options.js) {
-        const { ModuleKind } = (0, ensure_typescript_1.ensureTypescript)();
+        const { ModuleKind } = (0, internal_2.ensureTypescript)();
         (0, devkit_1.toJS)(tree, { extension: '.cjs', module: ModuleKind.CommonJS });
     }
     recommendVsCodeExtensions(tree);
@@ -163,9 +160,9 @@ async function configurationGeneratorInternal(tree, rawOptions) {
         await (0, devkit_1.formatFiles)(tree);
     }
     if (isTsSolutionSetup) {
-        const projectPackageManagerWorkspaceState = (0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceState)(tree, projectConfig.root);
+        const projectPackageManagerWorkspaceState = (0, internal_2.getProjectPackageManagerWorkspaceState)(tree, projectConfig.root);
         if (projectPackageManagerWorkspaceState !== 'included') {
-            tasks.push((0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, tree.root));
+            tasks.push((0, internal_2.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, tree.root));
         }
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
@@ -175,7 +172,7 @@ async function normalizeOptions(tree, options) {
     const addPlugin = options.addPlugin ??
         (process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false);
-    const linter = await (0, generator_prompts_1.normalizeLinterOption)(tree, options.linter);
+    const linter = await (0, internal_2.normalizeLinterOption)(tree, options.linter);
     if (!options.webServerCommand || !options.webServerAddress) {
         const { webServerCommand, webServerAddress } = await promptForMissingServeData(options.project);
         options.webServerCommand = webServerCommand;
@@ -246,15 +243,30 @@ function setupE2ETargetDefaults(tree) {
         return;
     }
     // E2e targets depend on all their project's sources + production sources of dependencies
-    nxJson.targetDefaults ??= {};
     const productionFileSet = !!nxJson.namedInputs?.production;
-    nxJson.targetDefaults.e2e ??= {};
-    nxJson.targetDefaults.e2e.cache ??= true;
-    nxJson.targetDefaults.e2e.inputs ??= [
-        'default',
-        productionFileSet ? '^production' : '^default',
-    ];
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+    // Either a `target: 'e2e'` default or a default keyed on the executor
+    // we're about to scaffold will apply to the new target — consider both
+    // before deciding to add cache/inputs. Target-keyed wins when both are
+    // present.
+    const existingForTarget = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+        target: 'e2e',
+    });
+    const existingForExecutor = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+        executor: '@nx/playwright:playwright',
+    });
+    const existingCache = existingForTarget?.cache ?? existingForExecutor?.cache;
+    const existingInputs = existingForTarget?.inputs ?? existingForExecutor?.inputs;
+    const patch = {};
+    if (existingCache === undefined) {
+        patch.cache = true;
+    }
+    if (existingInputs === undefined) {
+        patch.inputs = ['default', productionFileSet ? '^production' : '^default'];
+    }
+    if (Object.keys(patch).length > 0) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'e2e', ...patch });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
 }
 function addE2eTarget(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);

package/src/plugins/plugin.js

@@ -4,7 +4,7 @@ exports.createNodesV2 = exports.createNodes = void 0;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_2 = require("@nx/js/src/internal");
+const internal_2 = require("@nx/js/internal");
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -184,7 +184,6 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             };
             dependsOn.push({
                 target: targetName,
-                projects: 'self',
                 params: 'forward',
                 options: 'forward',
             });

package/src/utils/preset.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxE2EPreset = nxE2EPreset;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const test_1 = require("@playwright/test");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -37,7 +37,7 @@ function nxE2EPreset(pathToConfig, options) {
         : (0, node_path_1.dirname)(pathToConfig);
     const projectPath = (0, node_path_1.relative)(devkit_1.workspaceRoot, normalizedPath);
     const offset = (0, node_path_1.relative)(normalizedPath, devkit_1.workspaceRoot);
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+    const isTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
     const testResultOuputDir = isTsSolutionSetup
         ? 'test-output/playwright/output'
         : (0, node_path_1.join)(offset, 'dist', '.playwright', projectPath, 'test-output');