@nx/playwright 16.8.0-beta.0 → 16.8.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "16.8.0-beta.0",
+  "version": "16.8.0-beta.2",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -32,8 +32,8 @@
     "directory": "packages/playwright"
   },
   "dependencies": {
-    "@nx/devkit": "16.8.0-beta.0",
-    "@nx/linter": "16.8.0-beta.0",
+    "@nx/devkit": "16.8.0-beta.2",
+    "@nx/linter": "16.8.0-beta.2",
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
@@ -56,5 +56,5 @@
     "./executors/*/schema.json": "./src/executors/*/schema.json",
     "./preset": "./src/utils/preset.js"
   },
-  "gitHead": "818352404283c1d34ab303d91b3bd16474f54916"
+  "gitHead": "9bcc04742f9e1516d8c1ddbfb1907770c347876f"
 }

package/src/utils/add-linter.js

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const global_eslint_config_1 = require("@nx/linter/src/generators/init/global-eslint-config");
 const versions_1 = require("./versions");
+const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
 function addLinterToPlaywrightProject(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.linter === linter_1.Linter.None) {
@@ -13,7 +14,8 @@ function addLinterToPlaywrightProject(tree, options) {
         }
         const tasks = [];
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        if (!tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, '.eslintrc.json'))) {
+        const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
+        if (!eslintFile) {
             tasks.push(yield (0, linter_1.lintProjectGenerator)(tree, {
                 project: options.project,
                 linter: options.linter,
@@ -33,33 +35,22 @@ function addLinterToPlaywrightProject(tree, options) {
         tasks.push(!options.skipPackageJson
             ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'eslint-plugin-playwright': versions_1.eslintPluginPlaywrightVersion })
             : () => { });
-        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, '.eslintrc.json'), (json) => {
-            var _a;
+        if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
+            (0, eslint_file_1.addExtendsToLintConfig)(tree, projectConfig.root, 'plugin:playwright/recommended');
             if (options.rootProject) {
-                json.plugins = ['@nx'];
-                json.extends = ['plugin:playwright/recommended'];
+                (0, eslint_file_1.addPluginsToLintConfig)(tree, projectConfig.root, '@nx');
+                (0, eslint_file_1.addOverrideToLintConfig)(tree, projectConfig.root, global_eslint_config_1.javaScriptOverride);
             }
-            else {
-                json.extends = ['plugin:playwright/recommended', ...json.extends];
-            }
-            (_a = json.overrides) !== null && _a !== void 0 ? _a : (json.overrides = []);
-            const globals = options.rootProject ? [global_eslint_config_1.globalJavaScriptOverrides] : [];
-            const override = {
-                files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+            (0, eslint_file_1.addOverrideToLintConfig)(tree, projectConfig.root, {
+                files: [`${options.directory}/**/*.{ts,js,tsx,jsx}`],
                 parserOptions: !options.setParserOptionsProject
                     ? undefined
                     : {
                         project: `${projectConfig.root}/tsconfig.*?.json`,
                     },
                 rules: {},
-            };
-            const palywrightFiles = [
-                Object.assign(Object.assign({}, override), { files: [`${options.directory}/**/*.{ts,js,tsx,jsx}`] }),
-            ];
-            json.overrides.push(...globals);
-            json.overrides.push(...palywrightFiles);
-            return json;
-        });
+            });
+        }
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }

package/src/utils/preset.js

@@ -74,7 +74,7 @@ function nxE2EPreset(pathToConfig, options) {
         ]);
     }
     return (0, test_1.defineConfig)({
-        testDir: (_a = options.testDir) !== null && _a !== void 0 ? _a : './src',
+        testDir: (_a = options === null || options === void 0 ? void 0 : options.testDir) !== null && _a !== void 0 ? _a : './src',
         outputDir: testResultOuputDir,
         /* Run tests in files in parallel */
         fullyParallel: true,