@nx/playwright 23.2.0-beta.6 → 23.2.0-beta.8

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

@@ -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,7 @@ 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.
@@ -34,5 +34,5 @@ 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": {

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

@@ -1,8 +1,8 @@
 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;
+    linter: LinterType;
     enableTypedLinting?: boolean;
     /**
      * @deprecated Use `enableTypedLinting` instead. This option will be removed in Nx v24.

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 () => { };
@@ -13,11 +13,12 @@ async function addLinterToPlaywrightProject(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const eslintFile = (0, internal_1.findEslintFile)(tree, projectConfig.root);
     const enableTypedLinting = (0, internal_1.isTypedLintingEnabled)(options);
-    if (!eslintFile) {
-        tasks.push(await (0, eslint_1.lintProjectGenerator)(tree, {
+    // 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')],
             enableTypedLinting,
             skipPackageJson: options.skipPackageJson,
@@ -25,7 +26,9 @@ async function addLinterToPlaywrightProject(tree, options) {
             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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "23.2.0-beta.6",
+  "version": "23.2.0-beta.8",
   "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.6",
-    "@nx/eslint": "23.2.0-beta.6",
-    "@nx/js": "23.2.0-beta.6"
+    "@nx/devkit": "23.2.0-beta.8",
+    "@nx/eslint": "23.2.0-beta.8",
+    "@nx/js": "23.2.0-beta.8"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.6"
+    "nx": "23.2.0-beta.8"
   },
   "peerDependencies": {
     "@playwright/test": "^1.36.0"