@nx/playwright 23.2.0-beta.1 → 23.2.0-beta.11

package/dist/src/generators/configuration/configuration.js

@@ -149,7 +149,7 @@ async function configurationGeneratorInternal(tree, rawOptions) {
         skipPackageJson: options.skipPackageJson,
         js: options.js,
         directory: options.directory,
-        setParserOptionsProject: options.setParserOptionsProject,
+        enableTypedLinting: (0, internal_3.isTypedLintingEnabled)(options),
         rootProject: options.rootProject ?? projectConfig.root === '.',
         addPlugin: options.addPlugin,
     }));
@@ -197,23 +197,23 @@ async function normalizeOptions(tree, options) {
     };
 }
 async function promptForMissingServeData(projectName) {
-    const { command, port } = await (0, internal_1.promptWhenInteractive)([
-        {
-            type: 'input',
-            name: 'command',
-            message: 'What command should be run to serve the application locally?',
-            initial: `npx nx serve ${projectName}`,
-        },
-        {
-            type: 'numeral',
-            name: 'port',
-            message: 'What port will the application be served on?',
-            initial: 3000,
-        },
-    ], {
-        command: `npx nx serve ${projectName}`,
-        port: 3000,
+    if (!(0, internal_1.isInteractive)()) {
+        return {
+            webServerCommand: `npx nx serve ${projectName}`,
+            webServerAddress: 'http://localhost:3000',
+        };
+    }
+    const command = await (0, internal_1.textPrompt)({
+        message: 'What command should be run to serve the application locally?',
+        initialValue: `npx nx serve ${projectName}`,
     });
+    const port = Number(await (0, internal_1.textPrompt)({
+        message: 'What port will the application be served on?',
+        initialValue: '3000',
+        validate: (value) => value !== '' && !Number.isNaN(Number(value))
+            ? undefined
+            : 'Please enter a number',
+    }));
     return {
         webServerCommand: command,
         webServerAddress: `http://localhost:${port}`,

package/dist/src/generators/configuration/schema.d.ts

@@ -1,4 +1,4 @@
-import type { Linter, LinterType } from '@nx/eslint';
+import type { LinterType } from '@nx/js';
 
 export interface ConfigurationGeneratorSchema {
   project: string;
@@ -10,7 +10,11 @@ export interface ConfigurationGeneratorSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
   skipInstall?: boolean;
-  linter?: Linter | LinterType;
+  linter?: LinterType;
+  enableTypedLinting?: boolean; // default is false
+  /**
+   * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+   */
   setParserOptionsProject?: boolean; // default is false
   /**
    * command to give playwright to run the web server
@@ -26,9 +30,8 @@ export interface ConfigurationGeneratorSchema {
   addPlugin?: boolean;
 }
 
-export interface NormalizedGeneratorOptions
-  extends ConfigurationGeneratorSchema {
+export interface NormalizedGeneratorOptions extends ConfigurationGeneratorSchema {
   addPlugin: boolean;
   directory: string;
-  linter: Linter | LinterType;
+  linter: LinterType;
 }

package/dist/src/generators/configuration/schema.json

@@ -21,9 +21,9 @@
       "default": "e2e"
     },
     "linter": {
-      "description": "The tool to use for running lint checks.",
+      "description": "The tool to use for running lint checks. Defaults to the linter the workspace already uses.",
       "type": "string",
-      "enum": ["none", "eslint"],
+      "enum": ["none", "eslint", "oxlint"],
       "x-priority": "important"
     },
     "js": {
@@ -39,11 +39,17 @@
       "type": "string",
       "description": "The address of the web server."
     },
-    "setParserOptionsProject": {
+    "enableTypedLinting": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether to enable typed linting. For flat configs, this configures the recommended `parserOptions.projectService` and `tsconfigRootDir`. For legacy `.eslintrc` configs, this configures `parserOptions.project`. We do not enable this by default for lint performance reasons.",
       "default": false
     },
+    "setParserOptionsProject": {
+      "type": "boolean",
+      "description": "Deprecated alias for `enableTypedLinting`.",
+      "default": false,
+      "x-deprecated": "Use `enableTypedLinting` instead. This option will be removed in Nx v24."
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/dist/src/plugins/plugin.js

@@ -8,18 +8,14 @@ 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");
-const file_hasher_1 = require("nx/src/hasher/file-hasher");
-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 playwrightConfigGlob = '**/playwright.config.{js,ts,cjs,cts,mjs,mts}';
 exports.createNodes = [
     playwrightConfigGlob,
     async (configFilePaths, options, context) => {
-        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 optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, node_path_1.join)(internal_1.workspaceDataDirectory, `playwright-${optionsHash}.hash`);
+        const pluginCache = new internal_1.PluginCache(cachePath);
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
@@ -249,7 +245,7 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
     return { targets, metadata };
 }
 async function getAllTestFiles(opts) {
-    const files = await (0, workspace_context_1.getFilesInDirectoryUsingContext)(opts.context.workspaceRoot, opts.path);
+    const files = await (0, internal_1.getFilesInDirectoryUsingContext)(opts.context.workspaceRoot, opts.path);
     const matcher = createMatcher(opts.config.testMatch);
     const ignoredMatcher = opts.config.testIgnore
         ? createMatcher(opts.config.testIgnore)

package/dist/src/utils/add-linter.d.ts

@@ -1,9 +1,13 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
-import { Linter, LinterType } from '@nx/eslint';
+import { LinterType } from '@nx/js';
 export interface PlaywrightLinterOptions {
     project: string;
-    linter: Linter | LinterType;
-    setParserOptionsProject: boolean;
+    linter: LinterType;
+    enableTypedLinting?: boolean;
+    /**
+     * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.
+     */
+    setParserOptionsProject?: boolean;
     skipPackageJson: boolean;
     rootProject: boolean;
     js?: boolean;

package/dist/src/utils/add-linter.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinterToPlaywrightProject = addLinterToPlaywrightProject;
 const devkit_1 = require("@nx/devkit");
-const eslint_1 = require("@nx/eslint");
 const internal_1 = require("@nx/eslint/internal");
 const versions_1 = require("./versions");
+const internal_2 = require("@nx/js/internal");
 async function addLinterToPlaywrightProject(tree, options) {
     if (options.linter === 'none') {
         return () => { };
@@ -12,19 +12,23 @@ async function addLinterToPlaywrightProject(tree, options) {
     const tasks = [];
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const eslintFile = (0, internal_1.findEslintFile)(tree, projectConfig.root);
-    if (!eslintFile) {
-        tasks.push(await (0, eslint_1.lintProjectGenerator)(tree, {
+    const enableTypedLinting = (0, internal_1.isTypedLintingEnabled)(options);
+    // An existing ESLint config means the project is already registered, so skip
+    // straight to the Playwright-specific shaping below.
+    if (options.linter !== 'eslint' || !eslintFile) {
+        tasks.push(await (0, internal_2.addLintingToProject)(tree, {
             project: options.project,
             linter: options.linter,
-            skipFormat: true,
             tsConfigPaths: [(0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json')],
-            setParserOptionsProject: options.setParserOptionsProject,
+            enableTypedLinting,
             skipPackageJson: options.skipPackageJson,
             rootProject: options.rootProject,
             addPlugin: options.addPlugin,
         }));
     }
-    if (!options.linter || options.linter !== 'eslint') {
+    // Everything below configures ESLint — predefined configs, `extends`, ignore
+    // entries — which have no equivalent in other linters.
+    if (options.linter !== 'eslint') {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     }
     tasks.push(!options.skipPackageJson
@@ -43,6 +47,13 @@ async function addLinterToPlaywrightProject(tree, options) {
                 files: ['*.ts', '*.js'],
                 rules: {},
             });
+            // `lintProjectGenerator` only runs when the project has no ESLint config
+            // (it already emits the projectService block in that case). For an
+            // existing flat config it didn't run, so emit the block here when typed
+            // linting is requested.
+            if (eslintFile && enableTypedLinting) {
+                (0, internal_1.addTypedLintingToFlatConfig)(tree, projectConfig.root);
+            }
         }
         else {
             const addExtendsTask = (0, internal_1.addExtendsToLintConfig)(tree, projectConfig.root, 'plugin:playwright/recommended');
@@ -53,11 +64,12 @@ async function addLinterToPlaywrightProject(tree, options) {
             }
             (0, internal_1.addOverrideToLintConfig)(tree, projectConfig.root, {
                 files: [`${options.directory}/**/*.{ts,js,tsx,jsx}`],
-                parserOptions: !options.setParserOptionsProject
-                    ? undefined
-                    : {
-                        project: `${projectConfig.root}/tsconfig.*?.json`,
-                    },
+                // Only emit `parserOptions.project` here on the legacy `.eslintrc`
+                // stack. Flat configs use `parserOptions.projectService` emitted by
+                // `lintProjectGenerator`.
+                parserOptions: enableTypedLinting
+                    ? { project: `${projectConfig.root}/tsconfig.*?.json` }
+                    : undefined,
                 rules: {},
             });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "23.2.0-beta.1",
+  "version": "23.2.0-beta.11",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -78,12 +78,12 @@
     "tslib": "^2.3.0",
     "minimatch": "10.2.5",
     "semver": "^7.6.3",
-    "@nx/devkit": "23.2.0-beta.1",
-    "@nx/eslint": "23.2.0-beta.1",
-    "@nx/js": "23.2.0-beta.1"
+    "@nx/devkit": "23.2.0-beta.11",
+    "@nx/eslint": "23.2.0-beta.11",
+    "@nx/js": "23.2.0-beta.11"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.1"
+    "nx": "23.2.0-beta.11"
   },
   "peerDependencies": {
     "@playwright/test": "^1.36.0"