@nx/cypress 16.7.0-beta.5 → 16.7.0-rc.0

package/generators.json

@@ -41,7 +41,7 @@
       "hidden": true
     },
     "cypress-project": {
-      "factory": "./src/generators/cypress-project/cypress-project#cypressProjectGenerator",
+      "factory": "./src/generators/cypress-project/cypress-project#cypressProjectGeneratorInternal",
       "schema": "./src/generators/cypress-project/schema.json",
       "description": "Add a Cypress E2E Project.",
       "hidden": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "16.7.0-beta.5",
+  "version": "16.7.0-rc.0",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -34,10 +34,10 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/cypress": "16.7.0-beta.5",
-    "@nx/devkit": "16.7.0-beta.5",
-    "@nx/js": "16.7.0-beta.5",
-    "@nx/linter": "16.7.0-beta.5",
+    "@nrwl/cypress": "16.7.0-rc.0",
+    "@nx/devkit": "16.7.0-rc.0",
+    "@nx/js": "16.7.0-rc.0",
+    "@nx/linter": "16.7.0-rc.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "dotenv": "~16.3.1",
@@ -56,5 +56,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "fa513731d4e6a960f112a5af6b0d725b2e624b36"
+  "gitHead": "d1f76ff83fa110c3332f617e6433fcd5b2bf7201"
 }

package/src/generators/cypress-project/cypress-project.d.ts

@@ -9,5 +9,9 @@ export interface CypressProjectSchema extends Schema {
  * @deprecated use cypressE2EConfigurationGenerator instead
  **/
 export declare function cypressProjectGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
+/**
+ * @deprecated use cypressE2EConfigurationGenerator instead
+ **/
+export declare function cypressProjectGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default cypressProjectGenerator;
 export declare const cypressProjectSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/cypress-project/cypress-project.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressProjectSchematic = exports.cypressProjectGenerator = void 0;
+exports.cypressProjectSchematic = exports.cypressProjectGeneratorInternal = exports.cypressProjectGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const linter_1 = require("@nx/linter");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const semver_1 = require("@nx/devkit/src/utils/semver");
 const js_1 = require("@nx/js");
+const linter_1 = require("@nx/linter");
 const path_1 = require("path");
+const semver_2 = require("semver");
+const add_linter_1 = require("../../utils/add-linter");
 const cypress_version_1 = require("../../utils/cypress-version");
-const project_name_1 = require("../../utils/project-name");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
-const add_linter_1 = require("../../utils/add-linter");
-const semver_1 = require("@nx/devkit/src/utils/semver");
-const semver_2 = require("semver");
 function createFiles(tree, options) {
     // if not installed or >v10 use v10 folder
     // else use v9 folder
@@ -111,7 +111,16 @@ function addProject(tree, options) {
  **/
 function cypressProjectGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(host, schema);
+        return yield cypressProjectGeneratorInternal(host, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.cypressProjectGenerator = cypressProjectGenerator;
+/**
+ * @deprecated use cypressE2EConfigurationGenerator instead
+ **/
+function cypressProjectGeneratorInternal(host, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield normalizeOptions(host, schema);
         const tasks = [];
         const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
         // if there is an installed cypress version, then we don't call
@@ -134,40 +143,38 @@ function cypressProjectGenerator(host, schema) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.cypressProjectGenerator = cypressProjectGenerator;
+exports.cypressProjectGeneratorInternal = cypressProjectGeneratorInternal;
 function normalizeOptions(host, options) {
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : (0, devkit_1.getWorkspaceLayout)(host).appsDir;
-    let projectName;
-    let projectRoot;
-    let maybeRootProject;
-    let isRootProject = false;
-    const projects = (0, devkit_1.getProjects)(host);
-    // nx will set the project option for generators when ran within a project.
-    // since the root project will always be set for standlone projects we can just check it here.
-    if (options.project) {
-        maybeRootProject = projects.get(options.project);
-    }
-    if ((maybeRootProject === null || maybeRootProject === void 0 ? void 0 : maybeRootProject.root) === '.' ||
-        // should still check to see if we are in a standalone based workspace
-        (!maybeRootProject &&
-            Array.from(projects.values()).some((config) => config.root === '.'))) {
-        projectName = options.name;
-        projectRoot = options.name;
-        isRootProject = true;
-    }
-    else {
-        projectName = (0, project_name_1.filePathPrefix)(projectDirectory ? `${projectDirectory}-${options.name}` : options.name);
-        projectRoot = projectDirectory
-            ? (0, devkit_1.joinPathFragments)(appsDir, (0, devkit_1.names)(projectDirectory).fileName, options.name)
-            : (0, devkit_1.joinPathFragments)(appsDir, options.name);
-    }
-    options.linter = options.linter || linter_1.Linter.EsLint;
-    options.bundler = options.bundler || 'webpack';
-    return Object.assign(Object.assign({}, options), { 
-        // other generators depend on the rootProject flag down stream
-        rootProject: isRootProject, projectName,
-        projectRoot });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let maybeRootProject;
+        let isRootProject = false;
+        const projects = (0, devkit_1.getProjects)(host);
+        // nx will set the project option for generators when ran within a project.
+        // since the root project will always be set for standalone projects we can just check it here.
+        if (options.project) {
+            maybeRootProject = projects.get(options.project);
+        }
+        if ((maybeRootProject === null || maybeRootProject === void 0 ? void 0 : maybeRootProject.root) === '.' ||
+            // should still check to see if we are in a standalone based workspace
+            (!maybeRootProject &&
+                Array.from(projects.values()).some((config) => config.root === '.'))) {
+            isRootProject = true;
+        }
+        let { projectName, projectRoot } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'application',
+            directory: isRootProject ? options.name : options.directory,
+            projectNameAndRootFormat: isRootProject
+                ? 'as-provided'
+                : options.projectNameAndRootFormat,
+        });
+        options.linter = options.linter || linter_1.Linter.EsLint;
+        options.bundler = options.bundler || 'webpack';
+        return Object.assign(Object.assign({}, options), { 
+            // other generators depend on the rootProject flag down stream
+            rootProject: isRootProject, projectName,
+            projectRoot });
+    });
 }
 exports.default = cypressProjectGenerator;
 exports.cypressProjectSchematic = (0, devkit_1.convertNxGenerator)(cypressProjectGenerator);

package/src/generators/cypress-project/schema.d.ts

@@ -1,10 +1,12 @@
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
 
 export interface Schema {
   project?: string;
   baseUrl?: string;
   name: string;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   linter?: Linter;
   js?: boolean;
   skipFormat?: boolean;

package/src/generators/cypress-project/schema.json

@@ -32,6 +32,11 @@
       "description": "A directory where the project is placed.",
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",