@nx/playwright 21.0.0-beta.1 → 21.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.3",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -35,26 +35,18 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "21.0.0-beta.1",
-    "@nx/eslint": "21.0.0-beta.1",
-    "@nx/js": "21.0.0-beta.1",
+    "@nx/devkit": "21.0.0-beta.3",
+    "@nx/eslint": "21.0.0-beta.3",
+    "@nx/js": "21.0.0-beta.3",
     "tslib": "^2.3.0",
     "minimatch": "9.0.3"
   },
   "peerDependencies": {
-    "@playwright/test": "^1.36.0",
-    "@nx/webpack": "file:../webpack",
-    "@nx/vite": "file:../vite"
+    "@playwright/test": "^1.36.0"
   },
   "peerDependenciesMeta": {
     "@playwright/test": {
       "optional": true
-    },
-    "@nx/webpack": {
-      "optional": true
-    },
-    "@nx/vite": {
-      "optional": true
     }
   },
   "executors": "./executors.json",

package/src/generators/configuration/configuration.js

@@ -115,10 +115,10 @@ async function configurationGeneratorInternal(tree, rawOptions) {
                 name: importPath,
                 version: '0.0.1',
                 private: true,
-                nx: {
-                    name: options.project,
-                },
             };
+            if (options.project !== importPath) {
+                packageJson.nx = { name: options.project };
+            }
             (0, devkit_1.writeJson)(tree, packageJsonPath, packageJson);
         }
         ignoreTestOutput(tree);

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

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

package/src/migrations/update-19-6-0/use-serve-static-preview-for-command.js

@@ -84,8 +84,9 @@ async function default_1(tree) {
             : 'preview', projectToMigrate.configFileType === 'webpack'
             ? 'serveStaticTargetName'
             : 'previewTargetName', projectToMigrate.configFileType === 'webpack'
-            ? (await getDynamicImportedModule('@nx/webpack/src/plugins/plugin', '@nx/webpack should be installed when attempting to setup @nx/playwright with a webpack config file.')).createNodesV2
-            : (await getDynamicImportedModule('@nx/vite/plugin', '@nx/vite should be installed when attempting to setup @nx/playwright with a vite config file.')).createNodesV2)) ??
+            ? require('@nx/webpack/plugin').createNodesV2
+            : require('@nx/vite/plugin')
+                .createNodesV2)) ??
             getServeStaticLikeTarget(tree, graph, projectToMigrate.projectName, projectToMigrate.configFileType === 'webpack'
                 ? '@nx/web:file-server'
                 : '@nx/vite:preview-server');
@@ -131,14 +132,6 @@ async function default_1(tree) {
     await (0, add_e2e_ci_target_defaults_1.default)(tree);
     await (0, devkit_1.formatFiles)(tree);
 }
-async function getDynamicImportedModule(moduleName, error) {
-    try {
-        return (await Promise.resolve(`${moduleName}`).then(s => require(s)));
-    }
-    catch {
-        throw new Error(error);
-    }
-}
 async function getServeStaticTargetNameForConfigFile(tree, pluginName, configFile, defaultTargetName, targetNamePluginOption, createNodesV2) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const matchingPluginRegistrations = nxJson.plugins?.filter((p) => typeof p === 'string' ? p === pluginName : p.plugin === pluginName);

package/src/plugins/plugin.js

@@ -14,7 +14,14 @@ const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const pmc = (0, devkit_1.getPackageManagerCommand)();
 function readTargetsCache(cachePath) {
-    return (0, node_fs_1.existsSync)(cachePath) ? (0, devkit_1.readJsonFile)(cachePath) : {};
+    try {
+        return process.env.NX_CACHE_PROJECT_GRAPH !== 'false'
+            ? (0, devkit_1.readJsonFile)(cachePath)
+            : {};
+    }
+    catch {
+        return {};
+    }
 }
 function writeTargetsToCache(cachePath, results) {
     (0, devkit_1.writeJsonFile)(cachePath, results);
@@ -78,12 +85,12 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
     let metadata;
     const testOutput = getTestOutput(playwrightConfig);
     const reporterOutputs = getReporterOutputs(playwrightConfig);
+    const webserverCommandTasks = getWebserverCommandTasks(playwrightConfig);
     const baseTargetConfig = {
         command: 'playwright test',
         options: {
             cwd: '{projectRoot}',
         },
-        parallelism: false,
         metadata: {
             technologies: ['playwright'],
             description: 'Runs Playwright Tests',
@@ -97,6 +104,12 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             },
         },
     };
+    if (webserverCommandTasks.length) {
+        baseTargetConfig.dependsOn = getDependsOn(webserverCommandTasks);
+    }
+    else {
+        baseTargetConfig.parallelism = false;
+    }
     targets[options.targetName] = {
         ...baseTargetConfig,
         cache: true,
@@ -290,6 +303,53 @@ function addSubfolderToOutput(output, subfolder) {
     }
     return (0, node_path_1.join)(output, subfolder);
 }
+function getWebserverCommandTasks(playwrightConfig) {
+    if (!playwrightConfig.webServer) {
+        return [];
+    }
+    const tasks = [];
+    const webServer = Array.isArray(playwrightConfig.webServer)
+        ? playwrightConfig.webServer
+        : [playwrightConfig.webServer];
+    for (const server of webServer) {
+        if (!server.reuseExistingServer) {
+            continue;
+        }
+        const task = parseTaskFromCommand(server.command);
+        if (task) {
+            tasks.push(task);
+        }
+    }
+    return tasks;
+}
+function parseTaskFromCommand(command) {
+    const nxRunRegex = /^(?:(?:npx|yarn|bun|pnpm|pnpm exec|pnpx) )?nx run (\S+:\S+)$/;
+    const infixRegex = /^(?:(?:npx|yarn|bun|pnpm|pnpm exec|pnpx) )?nx (\S+ \S+)$/;
+    const nxRunMatch = command.match(nxRunRegex);
+    if (nxRunMatch) {
+        const [project, target] = nxRunMatch[1].split(':');
+        return { project, target };
+    }
+    const infixMatch = command.match(infixRegex);
+    if (infixMatch) {
+        const [target, project] = infixMatch[1].split(' ');
+        return { project, target };
+    }
+    return null;
+}
+function getDependsOn(tasks) {
+    const projectsPerTask = new Map();
+    for (const { project, target } of tasks) {
+        if (!projectsPerTask.has(target)) {
+            projectsPerTask.set(target, []);
+        }
+        projectsPerTask.get(target).push(project);
+    }
+    return Array.from(projectsPerTask.entries()).map(([target, projects]) => ({
+        projects,
+        target,
+    }));
+}
 function normalizeOutput(path, workspaceRoot, projectRoot) {
     const fullProjectRoot = (0, node_path_1.resolve)(workspaceRoot, projectRoot);
     const fullPath = (0, node_path_1.resolve)(fullProjectRoot, path);