@nx/playwright 17.3.0-beta.5 → 17.3.0-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "17.3.0-beta.5",
+  "version": "17.3.0-beta.8",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -32,11 +32,11 @@
     "directory": "packages/playwright"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-beta.5",
-    "@nx/eslint": "17.3.0-beta.5",
-    "@nx/js": "17.3.0-beta.5",
+    "@nx/devkit": "17.3.0-beta.8",
+    "@nx/eslint": "17.3.0-beta.8",
+    "@nx/js": "17.3.0-beta.8",
     "tslib": "^2.3.0",
-    "minimatch": "3.0.5"
+    "minimatch": "9.0.3"
   },
   "peerDependencies": {
     "@playwright/test": "^1.36.0"

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

@@ -1,4 +1,4 @@
-import { defineConfig } from '@playwright/test';
+import { defineConfig, devices } from '@playwright/test';
 import { nxE2EPreset } from '@nx/playwright/preset';
 <% if(!webServerCommand || !webServerAddress) { %>// eslint-disable-next-line @typescript-eslint/no-unused-vars <% } %>
 import { workspaceRoot } from '@nx/devkit';
@@ -35,4 +35,40 @@ export default defineConfig({
   //   reuseExistingServer: !process.env.CI,
   //   cwd: workspaceRoot,
   // },<% } %>
+  projects: [
+    {
+      name: "chromium",
+      use: { ...devices["Desktop Chrome"] },
+    },
+
+    {
+      name: "firefox",
+      use: { ...devices["Desktop Firefox"] },
+    },
+
+    {
+      name: "webkit",
+      use: { ...devices["Desktop Safari"] },
+    },
+    
+    // Uncomment for mobile browsers support
+    /* {
+      name: 'Mobile Chrome',
+      use: { ...devices['Pixel 5'] },
+    },
+    {
+      name: 'Mobile Safari',
+      use: { ...devices['iPhone 12'] },
+    }, */
+
+    // Uncomment for branded browsers
+    /* {
+      name: 'Microsoft Edge',
+      use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    },
+    {
+      name: 'Google Chrome',
+      use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    } */
+  ],
 });

package/src/generators/init/init.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 async function initGenerator(tree, options) {
     const tasks = [];
@@ -9,11 +11,14 @@ async function initGenerator(tree, options) {
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@nx/playwright': versions_1.nxVersion,
             '@playwright/test': versions_1.playwrightVersion,
-        }));
+        }, undefined, options.keepExistingVersions));
     }
     if (process.env.NX_PCV3 === 'true') {
         addPlugin(tree);
     }
+    if (options.updatePackageScripts) {
+        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/init/schema.d.ts

@@ -1,4 +1,6 @@
 export interface InitGeneratorSchema {
-  skipFormat: boolean;
-  skipPackageJson: boolean;
+  skipFormat?: boolean;
+  skipPackageJson?: boolean;
+  keepExistingVersions?: boolean;
+  updatePackageScripts?: boolean;
 }

package/src/generators/init/schema.json

@@ -16,6 +16,18 @@
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
+    },
+    "updatePackageScripts": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Update `package.json` scripts with inferred targets",
+      "default": false
     }
   },
   "required": []

package/src/plugins/plugin.js

@@ -7,7 +7,7 @@ const devkit_1 = require("@nx/devkit");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const load_config_file_1 = require("../utils/load-config-file");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const js_1 = require("@nx/js");
@@ -136,7 +136,7 @@ function createMatcher(pattern) {
     else {
         return (path) => {
             try {
-                return minimatch(path, pattern);
+                return (0, minimatch_1.minimatch)(path, pattern);
             }
             catch (e) {
                 throw new Error(`Error matching ${path} with ${pattern}: ${e.message}`);

package/src/utils/preset.d.ts

@@ -4,16 +4,6 @@ export interface NxPlaywrightOptions {
      * @default './src'
      **/
     testDir?: string;
-    /**
-     * Include Mobile Chome and Mobile Safari browsers in test projects
-     * @default false
-     **/
-    includeMobileBrowsers?: boolean;
-    /**
-     * Include Microsoft Edge and Google Chrome browsers in test projects
-     * @default false
-     **/
-    includeBrandedBrowsers?: boolean;
 }
 /**
  * nx E2E Preset for Playwright
@@ -25,6 +15,7 @@ export interface NxPlaywrightOptions {
  * - chromium
  * - firefox
  * - webkit
+ * These are generated by default.
  *
  * you can easily extend this within your playwright config via spreading the preset
  * @example

package/src/utils/preset.js

@@ -15,6 +15,7 @@ const test_1 = require("@playwright/test");
  * - chromium
  * - firefox
  * - webkit
+ * These are generated by default.
  *
  * you can easily extend this within your playwright config via spreading the preset
  * @example
@@ -34,44 +35,6 @@ function nxE2EPreset(pathToConfig, options) {
     const offset = (0, node_path_1.relative)(normalizedPath, devkit_1.workspaceRoot);
     const testResultOuputDir = (0, node_path_1.join)(offset, 'dist', '.playwright', projectPath, 'test-output');
     const reporterOutputDir = (0, node_path_1.join)(offset, 'dist', '.playwright', projectPath, 'playwright-report');
-    const projects = [
-        {
-            name: 'chromium',
-            use: { ...test_1.devices['Desktop Chrome'] },
-        },
-        {
-            name: 'firefox',
-            use: { ...test_1.devices['Desktop Firefox'] },
-        },
-        {
-            name: 'webkit',
-            use: { ...test_1.devices['Desktop Safari'] },
-        },
-    ];
-    if (options?.includeMobileBrowsers) {
-        projects.push(...[
-            {
-                name: 'Mobile Chrome',
-                use: { ...test_1.devices['Pixel 5'] },
-            },
-            {
-                name: 'Mobile Safari',
-                use: { ...test_1.devices['iPhone 12'] },
-            },
-        ]);
-    }
-    if (options?.includeBrandedBrowsers) {
-        projects.push(...[
-            {
-                name: 'Microsoft Edge',
-                use: { ...test_1.devices['Desktop Edge'], channel: 'msedge' },
-            },
-            {
-                name: 'Google Chrome',
-                use: { ...test_1.devices['Desktop Chrome'], channel: 'chrome' },
-            },
-        ]);
-    }
     return (0, test_1.defineConfig)({
         testDir: options?.testDir ?? './src',
         outputDir: testResultOuputDir,
@@ -92,7 +55,6 @@ function nxE2EPreset(pathToConfig, options) {
                 },
             ],
         ],
-        projects,
     });
 }
 exports.nxE2EPreset = nxE2EPreset;