@nx/cypress 16.5.0-beta.3 → 16.6.0-beta.0

package/generators.json

@@ -14,15 +14,16 @@
       "schema": "./src/generators/cypress-project/schema.json",
       "description": "Add a Cypress E2E Project."
     },
-    "cypress-e2e-configuration": {
-      "aliases": ["e2e", "e2e-config"],
-      "factory": "./src/generators/cypress-e2e-configuration/cypress-e2e-configuration#compat",
-      "schema": "./src/generators/cypress-e2e-configuration/schema.json",
+    "configuration": {
+      "aliases": ["cypress-e2e-configuration", "e2e", "e2e-config"],
+      "factory": "./src/generators/configuration/configuration#compat",
+      "schema": "./src/generators/configuration/schema.json",
       "description": "Add a Cypress E2E Configuration to an existing project."
     },
-    "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfiguration",
-      "schema": "./src/generators/cypress-component-configuration/schema.json",
+    "component-configuration": {
+      "aliases": ["cypress-component-configuration"],
+      "factory": "./src/generators/component-configuration/component-configuration#compat",
+      "schema": "./src/generators/component-configuration/schema.json",
       "description": "Set up Cypress Component Test for a project"
     },
     "migrate-to-cypress-11": {
@@ -45,15 +46,16 @@
       "description": "Add a Cypress E2E Project.",
       "hidden": true
     },
-    "cypress-e2e-configuration": {
-      "aliases": ["e2e", "e2e-config"],
-      "factory": "./src/generators/cypress-e2e-configuration/cypress-e2e-configuration",
-      "schema": "./src/generators/cypress-e2e-configuration/schema.json",
+    "configuration": {
+      "aliases": ["cypress-e2e-configuration", "e2e", "e2e-config"],
+      "factory": "./src/generators/configuration/configuration",
+      "schema": "./src/generators/configuration/schema.json",
       "description": "Add a Cypress E2E Configuration to an existing project."
     },
-    "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfiguration",
-      "schema": "./src/generators/cypress-component-configuration/schema.json",
+    "component-configuration": {
+      "aliases": ["cypress-component-configuration"],
+      "factory": "./src/generators/component-configuration/component-configuration",
+      "schema": "./src/generators/component-configuration/schema.json",
       "description": "Set up Cypress Component Test for a project",
       "hidden": true
     },

package/index.d.ts

@@ -1,6 +1,10 @@
+import { configurationGenerator } from './src/generators/configuration/configuration';
+import { componentConfigurationGenerator } from './src/generators/component-configuration/component-configuration';
+export { configurationGenerator, componentConfigurationGenerator };
+/** @deprecated Use `configurationGenerator` instead. */
+export declare const cypressComponentConfiguration: typeof componentConfigurationGenerator;
+export { configurationGenerator as cypressE2EConfigurationGenerator };
 export { cypressProjectGenerator } from './src/generators/cypress-project/cypress-project';
 export { cypressInitGenerator } from './src/generators/init/init';
 export { conversionGenerator } from './src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint';
-export { cypressComponentConfiguration } from './src/generators/cypress-component-configuration/cypress-component-configuration';
 export { migrateCypressProject } from './src/generators/migrate-to-cypress-11/migrate-to-cypress-11';
-export { cypressE2EConfigurationGenerator } from './src/generators/cypress-e2e-configuration/cypress-e2e-configuration';

package/index.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressE2EConfigurationGenerator = exports.migrateCypressProject = exports.cypressComponentConfiguration = exports.conversionGenerator = exports.cypressInitGenerator = exports.cypressProjectGenerator = void 0;
+exports.migrateCypressProject = exports.conversionGenerator = exports.cypressInitGenerator = exports.cypressProjectGenerator = exports.cypressE2EConfigurationGenerator = exports.cypressComponentConfiguration = exports.componentConfigurationGenerator = exports.configurationGenerator = void 0;
+const configuration_1 = require("./src/generators/configuration/configuration");
+Object.defineProperty(exports, "configurationGenerator", { enumerable: true, get: function () { return configuration_1.configurationGenerator; } });
+Object.defineProperty(exports, "cypressE2EConfigurationGenerator", { enumerable: true, get: function () { return configuration_1.configurationGenerator; } });
+const component_configuration_1 = require("./src/generators/component-configuration/component-configuration");
+Object.defineProperty(exports, "componentConfigurationGenerator", { enumerable: true, get: function () { return component_configuration_1.componentConfigurationGenerator; } });
+// Maintain backwards compatibility with the old names in case community plugins used them.
+/** @deprecated Use `configurationGenerator` instead. */
+exports.cypressComponentConfiguration = component_configuration_1.componentConfigurationGenerator;
 var cypress_project_1 = require("./src/generators/cypress-project/cypress-project");
 Object.defineProperty(exports, "cypressProjectGenerator", { enumerable: true, get: function () { return cypress_project_1.cypressProjectGenerator; } });
 var init_1 = require("./src/generators/init/init");
 Object.defineProperty(exports, "cypressInitGenerator", { enumerable: true, get: function () { return init_1.cypressInitGenerator; } });
 var convert_tslint_to_eslint_1 = require("./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint");
 Object.defineProperty(exports, "conversionGenerator", { enumerable: true, get: function () { return convert_tslint_to_eslint_1.conversionGenerator; } });
-var cypress_component_configuration_1 = require("./src/generators/cypress-component-configuration/cypress-component-configuration");
-Object.defineProperty(exports, "cypressComponentConfiguration", { enumerable: true, get: function () { return cypress_component_configuration_1.cypressComponentConfiguration; } });
 var migrate_to_cypress_11_1 = require("./src/generators/migrate-to-cypress-11/migrate-to-cypress-11");
 Object.defineProperty(exports, "migrateCypressProject", { enumerable: true, get: function () { return migrate_to_cypress_11_1.migrateCypressProject; } });
-var cypress_e2e_configuration_1 = require("./src/generators/cypress-e2e-configuration/cypress-e2e-configuration");
-Object.defineProperty(exports, "cypressE2EConfigurationGenerator", { enumerable: true, get: function () { return cypress_e2e_configuration_1.cypressE2EConfigurationGenerator; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "16.5.0-beta.3",
+  "version": "16.6.0-beta.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.5.0-beta.3",
-    "@nx/devkit": "16.5.0-beta.3",
-    "@nx/js": "16.5.0-beta.3",
-    "@nx/linter": "16.5.0-beta.3",
+    "@nrwl/cypress": "16.6.0-beta.0",
+    "@nx/devkit": "16.6.0-beta.0",
+    "@nx/js": "16.6.0-beta.0",
+    "@nx/linter": "16.6.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "dotenv": "~10.0.0",
@@ -55,5 +55,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "b9d30fa0f44051be102f67e8555efc05e3de87e5"
+  "gitHead": "5a7ffb93c9e84bffbf52f6ae9c6c1e3b8edb9d35"
 }

package/src/generators/component-configuration/component-configuration.d.ts

@@ -0,0 +1,6 @@
+import { ProjectConfiguration, Tree } from '@nx/devkit';
+import { CypressComponentConfigurationSchema } from './schema';
+export declare function componentConfigurationGenerator(tree: Tree, options: CypressComponentConfigurationSchema): Promise<() => void>;
+export declare function updateTsConfigForComponentTesting(tree: Tree, projectConfig: ProjectConfiguration): void;
+export default componentConfigurationGenerator;
+export declare const compat: (generatorOptions: CypressComponentConfigurationSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/{cypress-component-configuration/cypress-component-configuration.js → component-configuration/component-configuration.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateTsConfigForComponentTesting = exports.cypressComponentConfiguration = void 0;
+exports.compat = exports.updateTsConfigForComponentTesting = exports.componentConfigurationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
-function cypressComponentConfiguration(tree, options) {
+function componentConfigurationGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const opts = normalizeOptions(options);
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
@@ -23,7 +23,7 @@ function cypressComponentConfiguration(tree, options) {
         };
     });
 }
-exports.cypressComponentConfiguration = cypressComponentConfiguration;
+exports.componentConfigurationGenerator = componentConfigurationGenerator;
 function normalizeOptions(options) {
     var _a;
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
@@ -134,4 +134,5 @@ function updateTsConfigForComponentTesting(tree, projectConfig) {
     }
 }
 exports.updateTsConfigForComponentTesting = updateTsConfigForComponentTesting;
-exports.default = cypressComponentConfiguration;
+exports.default = componentConfigurationGenerator;
+exports.compat = (0, devkit_1.convertNxGenerator)(componentConfigurationGenerator);

package/src/generators/{cypress-component-configuration → component-configuration}/schema.json

@@ -7,7 +7,7 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/cypress:cypress-component-configuration --project=my-cool-lib ",
+      "command": "nx g @nx/cypress:component-configuration --project=my-cool-lib ",
       "description": "Add cypress component testing to an existing project named my-cool-lib"
     }
   ],

package/src/generators/{cypress-e2e-configuration/cypress-e2e-configuration.d.ts → configuration/configuration.d.ts}

@@ -13,6 +13,6 @@ export interface CypressE2EConfigSchema {
     linter?: Linter;
     port?: number | 'cypress-auto';
 }
-export declare function cypressE2EConfigurationGenerator(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;
-export default cypressE2EConfigurationGenerator;
+export declare function configurationGenerator(tree: Tree, options: CypressE2EConfigSchema): Promise<GeneratorCallback>;
+export default configurationGenerator;
 export declare const compat: (generatorOptions: CypressE2EConfigSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/{cypress-e2e-configuration/cypress-e2e-configuration.js → configuration/configuration.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compat = exports.cypressE2EConfigurationGenerator = void 0;
+exports.compat = exports.configurationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
@@ -12,7 +12,7 @@ const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const base_setup_1 = require("../base-setup/base-setup");
-function cypressE2EConfigurationGenerator(tree, options) {
+function configurationGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const opts = normalizeOptions(tree, options);
         const tasks = [];
@@ -31,7 +31,7 @@ function cypressE2EConfigurationGenerator(tree, options) {
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
-exports.cypressE2EConfigurationGenerator = cypressE2EConfigurationGenerator;
+exports.configurationGenerator = configurationGenerator;
 function normalizeOptions(tree, options) {
     var _a, _b, _c, _d, _e;
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -128,5 +128,5 @@ function addTarget(tree, opts) {
     }
     (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
 }
-exports.default = cypressE2EConfigurationGenerator;
-exports.compat = (0, devkit_1.convertNxGenerator)(cypressE2EConfigurationGenerator);
+exports.default = configurationGenerator;
+exports.compat = (0, devkit_1.convertNxGenerator)(configurationGenerator);

package/src/utils/add-linter.d.ts

@@ -1,4 +1,4 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { Linter } from '@nx/linter';
 export interface CyLinterOptions {
     project: string;
@@ -18,4 +18,4 @@ export interface CyLinterOptions {
      **/
     overwriteExisting?: boolean;
 }
-export declare function addLinterToCyProject(tree: Tree, options: CyLinterOptions): Promise<GeneratorCallback>;
+export declare function addLinterToCyProject(tree: Tree, options: CyLinterOptions): Promise<() => void>;

package/src/utils/versions.d.ts

@@ -5,5 +5,5 @@ export declare const cypressViteDevServerVersion = "^2.2.1";
 export declare const cypressVersion = "^12.16.0";
 export declare const cypressWebpackVersion = "^2.0.0";
 export declare const webpackHttpPluginVersion = "^5.5.0";
-export declare const viteVersion = "^4.3.4";
+export declare const viteVersion = "~4.3.9";
 export declare const htmlWebpackPluginVersion = "^5.5.0";

package/src/utils/versions.js

@@ -8,5 +8,5 @@ exports.cypressViteDevServerVersion = '^2.2.1';
 exports.cypressVersion = '^12.16.0';
 exports.cypressWebpackVersion = '^2.0.0';
 exports.webpackHttpPluginVersion = '^5.5.0';
-exports.viteVersion = '^4.3.4';
+exports.viteVersion = '~4.3.9';
 exports.htmlWebpackPluginVersion = '^5.5.0';

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts

@@ -1,5 +0,0 @@
-import { ProjectConfiguration, Tree } from '@nx/devkit';
-import { CypressComponentConfigurationSchema } from './schema';
-export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigurationSchema): Promise<() => void>;
-export declare function updateTsConfigForComponentTesting(tree: Tree, projectConfig: ProjectConfiguration): void;
-export default cypressComponentConfiguration;