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

package/migrations.json

@@ -1,17 +1,5 @@
 {
   "generators": {
-    "17-3-1-add-project-to-config": {
-      "cli": "nx",
-      "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"
-    },
     "19-6-0-use-serve-static-preview-for-command": {
       "cli": "nx",
       "version": "19.6.0-beta.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.10",
   "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.10",
+    "@nx/eslint": "21.0.0-beta.10",
+    "@nx/js": "21.0.0-beta.10",
     "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,
@@ -174,7 +187,6 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
             inputs: ciBaseTargetConfig.inputs,
             outputs: ciBaseTargetConfig.outputs,
             dependsOn,
-            parallelism: false,
             metadata: {
                 technologies: ['playwright'],
                 description: 'Runs Playwright Tests in CI',
@@ -189,6 +201,9 @@ async function buildPlaywrightTargets(configFilePath, projectRoot, options, cont
                 },
             },
         };
+        if (!webserverCommandTasks.length) {
+            targets[options.ciTargetName].parallelism = false;
+        }
         ciTargetGroup.push(options.ciTargetName);
     }
     return { targets, metadata };
@@ -290,6 +305,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);

package/README.md

@@ -1,66 +0,0 @@
-<p style="text-align: center;">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
-  </picture>
-</p>
-
-<div style="text-align: center;">
-
-[![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
-[![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
-[![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
-[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
-[![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Join us on the Official Nx Discord Server](https://img.shields.io/discord/1143497901675401286?label=discord)](https://go.nx.dev/community)
-
-</div>
-
-
-<hr>
-
-# Nx: Smart Monorepos · Fast CI
-
-Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
-
-## Getting Started
-
-### Creating an Nx Workspace
-
-**Using `npx`**
-
-```bash
-npx create-nx-workspace
-```
-
-**Using `npm init`**
-
-```bash
-npm init nx-workspace
-```
-
-**Using `yarn create`**
-
-```bash
-yarn create nx-workspace
-```
-
-### Adding Nx to an Existing Repository
-
-Run:
-
-```bash
-npx nx@latest init
-```
-
-## Documentation & Resources
-
-- [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
-- [Intro to Nx](https://nx.dev/getting-started/intro)
-- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
-- [Blog Posts About Nx](https://nx.dev/blog)
-
-<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
-

package/src/migrations/update-17-3-1/add-project-to-config.d.ts

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

package/src/migrations/update-17-3-1/add-project-to-config.js

@@ -1,95 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const ts = require("typescript");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    projects.forEach((project) => {
-        // Check if the project contains playwright config
-        const configPath = (0, devkit_1.joinPathFragments)(project.root, 'playwright.config.ts');
-        if (tree.exists(configPath)) {
-            addProjectIfExists(tree, (0, devkit_1.joinPathFragments)(configPath));
-        }
-    });
-}
-function addProjectIfExists(tree, configFilePath) {
-    const configFileContent = tree.read(configFilePath, 'utf-8');
-    const sourceFile = tsquery_1.tsquery.ast(configFileContent);
-    const printer = ts.createPrinter();
-    const updatedStatements = updateOrCreateImportStatement(sourceFile, '@playwright/test', ['devices']);
-    const exportAssignment = tsquery_1.tsquery.query(sourceFile, 'ExportAssignment')[0];
-    if (!exportAssignment) {
-        // No export found in the file
-        return;
-    }
-    const exportAssignemntObject = exportAssignment.expression;
-    if (!(ts.isCallExpression(exportAssignemntObject) &&
-        exportAssignemntObject.getText(sourceFile).startsWith('defineConfig') &&
-        exportAssignemntObject.arguments.length > 0)) {
-        // Export is not a call expression with defineConfig ex. export default defineConfig({ ... })
-        return;
-    }
-    let firstArgument = exportAssignemntObject.arguments[0];
-    if (!ts.isObjectLiteralExpression(firstArgument)) {
-        // First argument is not an object literal ex. defineConfig('foo')
-        return;
-    }
-    const projectProperty = tsquery_1.tsquery.query(exportAssignemntObject, 'PropertyAssignment > Identifier[name="projects"]')[0];
-    if (projectProperty) {
-        // Projects property already exists in the config
-        return;
-    }
-    // Add projects property to the config
-    const projectsArray = ts.factory.createArrayLiteralExpression([
-        createProperty('chromium', 'Desktop Chrome'),
-        createProperty('firefox', 'Desktop Firefox'),
-        createProperty('webkit', 'Desktop Safari'),
-    ], true);
-    const newProjectsProperty = ts.factory.createPropertyAssignment('projects', projectsArray);
-    const newObj = ts.factory.createObjectLiteralExpression([
-        ...firstArgument.properties,
-        newProjectsProperty,
-    ]);
-    const newCallExpression = ts.factory.updateCallExpression(exportAssignemntObject, exportAssignemntObject.expression, exportAssignemntObject.typeArguments, [newObj]);
-    const newExportAssignment = ts.factory.updateExportAssignment(exportAssignment, exportAssignment.modifiers, newCallExpression);
-    const transformedStatements = updatedStatements.map((statement) => {
-        return statement === exportAssignment ? newExportAssignment : statement;
-    });
-    const transformedSourceFile = ts.factory.updateSourceFile(sourceFile, transformedStatements);
-    const updatedConfigFileContent = printer.printFile(transformedSourceFile);
-    tree.write(configFilePath, updatedConfigFileContent);
-}
-function createProperty(name, device) {
-    return ts.factory.createObjectLiteralExpression([
-        ts.factory.createPropertyAssignment('name', ts.factory.createStringLiteral(name)),
-        ts.factory.createPropertyAssignment('use', ts.factory.createObjectLiteralExpression([
-            ts.factory.createSpreadAssignment(ts.factory.createElementAccessExpression(ts.factory.createIdentifier('devices'), ts.factory.createStringLiteral(device))),
-        ])),
-    ]);
-}
-function updateOrCreateImportStatement(sourceFile, moduleName, importNames) {
-    let importDeclarationFound = false;
-    const newStatements = sourceFile.statements.map((statement) => {
-        if (ts.isImportDeclaration(statement) &&
-            statement.moduleSpecifier.getText(sourceFile) === `'${moduleName}'`) {
-            importDeclarationFound = true;
-            const existingSpecifiers = statement.importClause?.namedBindings &&
-                ts.isNamedImports(statement.importClause.namedBindings)
-                ? statement.importClause.namedBindings.elements.map((e) => e.name.text)
-                : [];
-            // Merge with new import names, avoiding duplicates
-            const mergedImportNames = Array.from(new Set([...existingSpecifiers, ...importNames]));
-            // Create new import specifiers
-            const importSpecifiers = mergedImportNames.map((name) => ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(name)));
-            return ts.factory.updateImportDeclaration(statement, statement.modifiers, ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports(importSpecifiers)), statement.moduleSpecifier, undefined);
-        }
-        return statement;
-    });
-    if (!importDeclarationFound) {
-        const importDeclaration = ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports(importNames.map((name) => ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(name))))), ts.factory.createStringLiteral(moduleName));
-        newStatements.push(importDeclaration);
-    }
-    return newStatements;
-}

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

@@ -1,2 +0,0 @@
-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

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-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);
-}