@nx/cypress 20.3.2 → 20.4.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "20.3.2",
+  "version": "20.4.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -36,9 +36,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.3.2",
-    "@nx/eslint": "20.3.2",
-    "@nx/js": "20.3.2",
+    "@nx/devkit": "20.4.0-beta.1",
+    "@nx/eslint": "20.4.0-beta.1",
+    "@nx/js": "20.4.0-beta.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "tslib": "^2.3.0"

package/src/generators/base-setup/base-setup.js

@@ -12,19 +12,27 @@ function addBaseCypressSetup(tree, options) {
         return;
     }
     const opts = normalizeOptions(tree, projectConfig, options);
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     const templateVars = {
         ...opts,
         jsx: !!opts.jsx,
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
         offsetFromProjectRoot: opts.hasTsConfig ? opts.offsetFromProjectRoot : '',
-        tsConfigPath: opts.hasTsConfig
-            ? `${opts.offsetFromProjectRoot}tsconfig.json`
-            : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
+        tsConfigPath: 
+        // TS solution setup should always extend from tsconfig.base.json to use shared compilerOptions, the project's tsconfig.json will not have compilerOptions.
+        isUsingTsSolutionConfig
+            ? (0, js_1.getRelativePathToRootTsConfig)(tree, opts.hasTsConfig
+                ? (0, devkit_1.joinPathFragments)(projectConfig.root, options.directory)
+                : // If an existing tsconfig.json file does not exist, then cypress tsconfig will be moved to the project root.
+                    projectConfig.root)
+            : opts.hasTsConfig
+                ? `${opts.offsetFromProjectRoot}tsconfig.json`
+                : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
         linter: isEslintInstalled(tree) ? 'eslint' : 'none',
         ext: '',
     };
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files/common'), projectConfig.root, templateVars);
-    (0, devkit_1.generateFiles)(tree, (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree)
+    (0, devkit_1.generateFiles)(tree, isUsingTsSolutionConfig
         ? (0, path_1.join)(__dirname, 'files/tsconfig/ts-solution')
         : (0, path_1.join)(__dirname, 'files/tsconfig/non-ts-solution'), projectConfig.root, templateVars);
     if (options.js) {

package/src/generators/configuration/configuration.js

@@ -15,6 +15,7 @@ const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
 const init_1 = require("../init/init");
+const prompt_1 = require("@nx/devkit/src/generators/prompt");
 function configurationGenerator(tree, options) {
     return configurationGeneratorInternal(tree, {
         addPlugin: false,
@@ -106,6 +107,13 @@ async function normalizeOptions(tree, options) {
         throw new Error(`Project ${options.project} already has an e2e target.
 Rename or remove the existing e2e target.`);
     }
+    if (!options.baseUrl &&
+        !options.devServerTarget &&
+        !projectConfig?.targets?.serve) {
+        const { devServerTarget, baseUrl } = await promptForMissingServeData(options.project);
+        options.devServerTarget = devServerTarget;
+        options.baseUrl = baseUrl;
+    }
     if (!options.baseUrl &&
         !options.devServerTarget &&
         !projectConfig?.targets?.serve) {
@@ -131,6 +139,29 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
         devServerTarget,
     };
 }
+async function promptForMissingServeData(projectName) {
+    const { devServerTarget, port } = await (0, prompt_1.promptWhenInteractive)([
+        {
+            type: 'input',
+            name: 'devServerTarget',
+            message: 'What is the name of the target used to serve the application locally?',
+            initial: `${projectName}:serve`,
+        },
+        {
+            type: 'numeral',
+            name: 'port',
+            message: 'What port will the application be served on?',
+            initial: 3000,
+        },
+    ], {
+        devServerTarget: `${projectName}:serve`,
+        port: 3000,
+    });
+    return {
+        devServerTarget,
+        baseUrl: `http://localhost:${port}`,
+    };
+}
 async function addFiles(tree, options, projectGraph, hasPlugin) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();