@nx/playwright 18.1.0-beta.2 → 18.1.0-beta.4

package/migrations.json

@@ -5,6 +5,12 @@
       "version": "17.3.1-beta.0",
       "description": "Add project property to playwright config",
       "implementation": "./src/migrations/update-17-3-1/add-project-to-config"
+    },
+    "18-1-0-remove-baseUrl-from-project-json": {
+      "cli": "nx",
+      "version": "18.1.0-beta.3",
+      "description": "Remove invalid baseUrl option from @nx/playwright:playwright targets in project.json.",
+      "implementation": "./src/migrations/update-18-1-0/remove-baseUrl-from-project-json"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "18.1.0-beta.2",
+  "version": "18.1.0-beta.4",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -33,9 +33,9 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "18.1.0-beta.2",
-    "@nx/eslint": "18.1.0-beta.2",
-    "@nx/js": "18.1.0-beta.2",
+    "@nx/devkit": "18.1.0-beta.4",
+    "@nx/eslint": "18.1.0-beta.4",
+    "@nx/js": "18.1.0-beta.4",
     "tslib": "^2.3.0",
     "minimatch": "9.0.3"
   },

package/src/generators/configuration/configuration.js

@@ -14,7 +14,10 @@ function configurationGenerator(tree, options) {
 }
 exports.configurationGenerator = configurationGenerator;
 async function configurationGeneratorInternal(tree, options) {
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    options.addPlugin ??=
+        process.env.NX_ADD_PLUGINS !== 'false' &&
+            nxJson.useInferencePlugins !== false;
     const tasks = [];
     tasks.push(await (0, init_1.initGenerator)(tree, {
         skipFormat: true,

package/src/generators/configuration/files/playwright.config.ts.template

@@ -29,7 +29,8 @@ export default defineConfig({
     url: '<%= webServerAddress %>',
     reuseExistingServer: !process.env.CI,
     cwd: workspaceRoot
-  },<% } else {%>// webServer: {
+  },<% } else {%>
+  // webServer: {
   //   command: 'npm run start',
   //   url: 'http://127.0.0.1:3000',
   //   reuseExistingServer: !process.env.CI,

package/src/generators/init/init.js

@@ -11,7 +11,10 @@ function initGenerator(tree, options) {
 exports.initGenerator = initGenerator;
 async function initGeneratorInternal(tree, options) {
     const tasks = [];
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     if (!options.skipPackageJson) {
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@nx/playwright': versions_1.nxVersion,

package/src/migrations/update-18-1-0/remove-baseUrl-from-project-json.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-18-1-0/remove-baseUrl-from-project-json.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+async function default_1(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/playwright:playwright', (options, projectName, targetName, configurationName) => {
+        if (options?.['baseUrl']) {
+            const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+            if (configurationName) {
+                delete project.targets[targetName].configurations[configurationName]['baseUrl'];
+            }
+            else {
+                delete project.targets[targetName].options['baseUrl'];
+            }
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+        }
+    });
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    for (const [targetNameOrExecutor, target] of Object.entries(nxJson.targetDefaults)) {
+        if (targetNameOrExecutor === '@nx/playwright:playwright' ||
+            (target.executor && target.executor === '@nx/playwright:playwright')) {
+            let updated = false;
+            if (target.options?.['baseUrl']) {
+                delete nxJson.targetDefaults[targetNameOrExecutor].options['baseUrl'];
+                updated = true;
+            }
+            if (target.configurations) {
+                for (const [configurationName, configuration] of Object.entries(target.configurations)) {
+                    if (configuration['baseUrl']) {
+                        delete nxJson.targetDefaults[targetNameOrExecutor].configurations[configurationName]['baseUrl'];
+                        updated = true;
+                    }
+                }
+            }
+            if (updated) {
+                (0, devkit_1.updateNxJson)(tree, nxJson);
+            }
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;

package/src/plugins/plugin.js

@@ -30,7 +30,7 @@ exports.createNodes = [
     async (configFilePath, options, context) => {
         const projectRoot = (0, path_1.dirname)(configFilePath);
         // Do not create a project if package.json and project.json isn't there.
-        const siblingFiles = (0, fs_1.readdirSync)(projectRoot);
+        const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
         if (!siblingFiles.includes('package.json') &&
             !siblingFiles.includes('project.json')) {
             return {};