@nx/playwright 20.3.2 → 20.4.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/playwright",
-  "version": "20.3.2",
+  "version": "20.4.0-beta.1",
   "type": "commonjs",
   "homepage": "https://nx.dev",
   "private": false,
@@ -35,11 +35,11 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@nx/devkit": "20.3.2",
-    "@nx/eslint": "20.3.2",
-    "@nx/webpack": "20.3.2",
-    "@nx/vite": "20.3.2",
-    "@nx/js": "20.3.2",
+    "@nx/devkit": "20.4.0-beta.1",
+    "@nx/eslint": "20.4.0-beta.1",
+    "@nx/webpack": "20.4.0-beta.1",
+    "@nx/vite": "20.4.0-beta.1",
+    "@nx/js": "20.4.0-beta.1",
     "tslib": "^2.3.0",
     "minimatch": "9.0.3"
   },

package/src/generators/configuration/configuration.js

@@ -4,6 +4,7 @@ exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const prompt_1 = require("@nx/devkit/src/generators/prompt");
 const js_1 = require("@nx/js");
 const generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
 const package_manager_workspaces_1 = require("@nx/js/src/utils/package-manager-workspaces");
@@ -36,7 +37,36 @@ async function configurationGeneratorInternal(tree, rawOptions) {
     });
     const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
-    if (!tree.exists(tsconfigPath)) {
+    if (tree.exists(tsconfigPath)) {
+        if (isTsSolutionSetup) {
+            const tsconfig = {
+                extends: (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
+                compilerOptions: {
+                    allowJs: true,
+                    outDir: 'out-tsc/playwright',
+                    sourceMap: false,
+                },
+                include: [
+                    (0, devkit_1.joinPathFragments)(options.directory, '**/*.ts'),
+                    (0, devkit_1.joinPathFragments)(options.directory, '**/*.js'),
+                    'playwright.config.ts',
+                ],
+                exclude: ['out-tsc', 'test-output'],
+            };
+            // skip eslint from typechecking since it extends from root file that is outside rootDir
+            if (options.linter === 'eslint') {
+                tsconfig.exclude.push('eslint.config.js', 'eslint.config.mjs', 'eslint.config.cjs');
+            }
+            (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.e2e.json'), tsconfig);
+            (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
+                // add the project tsconfig to the workspace root tsconfig.json references
+                json.references ??= [];
+                json.references.push({ path: './tsconfig.e2e.json' });
+                return json;
+            });
+        }
+    }
+    else {
         const tsconfig = {
             extends: (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
             compilerOptions: {
@@ -141,6 +171,11 @@ async function normalizeOptions(tree, options) {
         (process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false);
     const linter = await (0, generator_prompts_1.normalizeLinterOption)(tree, options.linter);
+    if (!options.webServerCommand || !options.webServerAddress) {
+        const { webServerCommand, webServerAddress } = await promptForMissingServeData(options.project);
+        options.webServerCommand = webServerCommand;
+        options.webServerAddress = webServerAddress;
+    }
     return {
         ...options,
         addPlugin,
@@ -148,6 +183,29 @@ async function normalizeOptions(tree, options) {
         directory: options.directory ?? 'e2e',
     };
 }
+async function promptForMissingServeData(projectName) {
+    const { command, port } = await (0, prompt_1.promptWhenInteractive)([
+        {
+            type: 'input',
+            name: 'command',
+            message: 'What command should be run to serve the application locally?',
+            initial: `npx nx serve ${projectName}`,
+        },
+        {
+            type: 'numeral',
+            name: 'port',
+            message: 'What port will the application be served on?',
+            initial: 3000,
+        },
+    ], {
+        command: `npx nx serve ${projectName}`,
+        port: 3000,
+    });
+    return {
+        webServerCommand: command,
+        webServerAddress: `http://localhost:${port}`,
+    };
+}
 function getBrowsersInstallTask() {
     return () => {
         devkit_1.output.log({

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

@@ -1,7 +1,6 @@
 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';
+<% if (webServerCommand && webServerAddress) { %>import { workspaceRoot } from '@nx/devkit';<% } %>
 
 // For CI, you may want to set BASE_URL to the deployed application.
 const baseURL = process.env['BASE_URL'] || '<% if(webServerAddress) {%><%= webServerAddress %><% } else {%>http://localhost:3000<% } %>';