@nrwl/cypress 16.0.0-beta.0 → 16.0.0-beta.2

package/executors.json

@@ -1,15 +1,15 @@
 {
   "builders": {
     "cypress": {
-      "implementation": "./src/executors/cypress/compat",
-      "schema": "./src/executors/cypress/schema.json",
+      "implementation": "@nx/cypress/src/executors/cypress/compat",
+      "schema": "@nx/cypress/src/executors/cypress/schema.json",
       "description": "Run Cypress E2E tests."
     }
   },
   "executors": {
     "cypress": {
-      "implementation": "./src/executors/cypress/cypress.impl",
-      "schema": "./src/executors/cypress/schema.json",
+      "implementation": "@nx/cypress/src/executors/cypress/cypress.impl",
+      "schema": "@nx/cypress/src/executors/cypress/schema.json",
       "description": "Run Cypress E2E tests."
     }
   }

package/generators.json

@@ -1,66 +1,4 @@
 {
-  "name": "Nx Cypress",
-  "version": "0.1",
-  "schematics": {
-    "init": {
-      "factory": "./src/generators/init/init#cypressInitSchematic",
-      "schema": "./src/generators/init/schema.json",
-      "description": "Initialize the `@nrwl/cypress` plugin.",
-      "aliases": ["ng-add"],
-      "hidden": true
-    },
-    "cypress-project": {
-      "factory": "./src/generators/cypress-project/cypress-project#cypressProjectSchematic",
-      "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",
-      "description": "Add a Cypress E2E Configuration to an existing project."
-    },
-    "cypress-component-project": {
-      "factory": "./src/generators/cypress-component-project/cypress-component-project#cypressComponentProject",
-      "schema": "./src/generators/cypress-component-project/schema.json",
-      "description": "Set up Cypress Component Test for a project"
-    },
-    "migrate-to-cypress-11": {
-      "factory": "./src/generators/migrate-to-cypress-11/migrate-to-cypress-11#migrateCypressProject",
-      "schema": "./src/generators/migrate-to-cypress-11/schema.json",
-      "description": "Migrate existing Cypress e2e projects to Cypress v11"
-    }
-  },
-  "generators": {
-    "init": {
-      "factory": "./src/generators/init/init#cypressInitGenerator",
-      "schema": "./src/generators/init/schema.json",
-      "description": "Initialize the `@nrwl/cypress` plugin.",
-      "aliases": ["ng-add"],
-      "hidden": true
-    },
-    "cypress-project": {
-      "factory": "./src/generators/cypress-project/cypress-project#cypressProjectGenerator",
-      "schema": "./src/generators/cypress-project/schema.json",
-      "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",
-      "description": "Add a Cypress E2E Configuration to an existing project."
-    },
-    "cypress-component-project": {
-      "factory": "./src/generators/cypress-component-project/cypress-component-project#cypressComponentProject",
-      "schema": "./src/generators/cypress-component-project/schema.json",
-      "description": "Set up Cypress Component Test for a project",
-      "hidden": true
-    },
-    "migrate-to-cypress-11": {
-      "factory": "./src/generators/migrate-to-cypress-11/migrate-to-cypress-11#migrateCypressProject",
-      "schema": "./src/generators/migrate-to-cypress-11/schema.json",
-      "description": "Migrate existing Cypress e2e projects to Cypress v11"
-    }
-  }
+  "extends": ["@nx/cypress"],
+  "schematics": {}
 }

package/index.d.ts

@@ -1,5 +1 @@
-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 { cypressComponentProject } from './src/generators/cypress-component-project/cypress-component-project';
-export { migrateCypressProject } from './src/generators/migrate-to-cypress-11/migrate-to-cypress-11';
+export * from '@nx/cypress';

package/index.js

@@ -1,14 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrateCypressProject = exports.cypressComponentProject = exports.conversionGenerator = exports.cypressInitGenerator = exports.cypressProjectGenerator = void 0;
-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_project_1 = require("./src/generators/cypress-component-project/cypress-component-project");
-Object.defineProperty(exports, "cypressComponentProject", { enumerable: true, get: function () { return cypress_component_project_1.cypressComponentProject; } });
-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; } });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("@nx/cypress"), exports);
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/cypress/index.ts"],"names":[],"mappings":";;;AAAA,oFAA2F;AAAlF,0HAAA,uBAAuB,OAAA;AAChC,mDAAkE;AAAzD,4GAAA,oBAAoB,OAAA;AAC7B,+GAAyG;AAAhG,+HAAA,mBAAmB,OAAA;AAC5B,kHAA+G;AAAtG,oIAAA,uBAAuB,OAAA;AAChC,sGAAqG;AAA5F,8HAAA,qBAAqB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages-legacy/cypress/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nrwl/cypress",
-  "version": "16.0.0-beta.0",
+  "version": "16.0.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
     "type": "git",
     "url": "https://github.com/nrwl/nx.git",
-    "directory": "packages/cypress"
+    "directory": "packages-legacy/cypress"
   },
   "keywords": [
     "Monorepo",
@@ -29,31 +29,15 @@
   "homepage": "https://nx.dev",
   "schematics": "./generators.json",
   "builders": "./executors.json",
-  "ng-update": {
-    "requirements": {},
-    "migrations": "./migrations.json"
-  },
   "dependencies": {
-    "@nrwl/devkit": "16.0.0-beta.0",
-    "@nrwl/js": "16.0.0-beta.0",
-    "@nrwl/linter": "16.0.0-beta.0",
-    "@nrwl/workspace": "16.0.0-beta.0",
-    "@phenomnomnominal/tsquery": "~5.0.1",
-    "detect-port": "^1.5.1",
-    "dotenv": "~10.0.0",
-    "semver": "7.3.4"
-  },
-  "peerDependencies": {
-    "cypress": ">= 3 < 13"
-  },
-  "peerDependenciesMeta": {
-    "cypress": {
-      "optional": true
-    }
+    "@nx/cypress": "16.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"
   },
+  "nx-migrations": {
+    "migrations": "@nx/cypress/migrations.json"
+  },
   "types": "./index.d.ts",
-  "gitHead": "1e31d4726f2c623ede0c515429aa842e943dba47"
+  "gitHead": "0d7dbbc5254390f53a28d94de536da916ed06a70"
 }

package/plugins/cypress-preset.d.ts

@@ -1,62 +1 @@
-interface BaseCypressPreset {
-    videosFolder: string;
-    screenshotsFolder: string;
-    video: boolean;
-    chromeWebSecurity: boolean;
-}
-export interface NxComponentTestingOptions {
-    /**
-     * the component testing target name.
-     * this is only when customized away from the default value of `component-test`
-     * @example 'component-test'
-     */
-    ctTargetName?: string;
-    bundler?: 'vite' | 'webpack';
-}
-export declare function nxBaseCypressPreset(pathToConfig: string): BaseCypressPreset;
-/**
- * nx E2E Preset for Cypress
- * @description
- * this preset contains the base configuration
- * for your e2e tests that nx recommends.
- * you can easily extend this within your cypress config via spreading the preset
- * @example
- * export default defineConfig({
- *   e2e: {
- *     ...nxE2EPreset(__dirname)
- *     // add your own config here
- *   }
- * })
- *
- * @param pathToConfig will be used to construct the output paths for videos and screenshots
- */
-export declare function nxE2EPreset(pathToConfig: string, options?: NxCypressE2EPresetOptions): {
-    fileServerFolder: string;
-    supportFile: string;
-    specPattern: string;
-    fixturesFolder: string;
-    videosFolder: string;
-    screenshotsFolder: string;
-    video: boolean;
-    chromeWebSecurity: boolean;
-} | {
-    setupNodeEvents(on: any): void;
-    fileServerFolder: string;
-    supportFile: string;
-    specPattern: string;
-    fixturesFolder: string;
-    videosFolder: string;
-    screenshotsFolder: string;
-    video: boolean;
-    chromeWebSecurity: boolean;
-};
-export type NxCypressE2EPresetOptions = {
-    bundler?: string;
-    /**
-     * The directory from the project root, where the cypress files (support, fixtures, specs) are located.
-     * i.e. 'cypress/' or 'src'
-     * default is 'src'
-     **/
-    cypressDir?: string;
-};
-export {};
+export * from '@nx/cypress/plugins/cypress-preset';

package/plugins/cypress-preset.js

@@ -1,53 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxE2EPreset = exports.nxBaseCypressPreset = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const path_1 = require("path");
-const fs_1 = require("fs");
-const preprocessor_vite_1 = require("../src/plugins/preprocessor-vite");
-function nxBaseCypressPreset(pathToConfig) {
-    // prevent from placing path outside the root of the workspace
-    // if they pass in a file or directory
-    const normalizedPath = (0, fs_1.lstatSync)(pathToConfig).isDirectory()
-        ? pathToConfig
-        : (0, path_1.dirname)(pathToConfig);
-    const projectPath = (0, path_1.relative)(devkit_1.workspaceRoot, normalizedPath);
-    const offset = (0, path_1.relative)(normalizedPath, devkit_1.workspaceRoot);
-    const videosFolder = (0, path_1.join)(offset, 'dist', 'cypress', projectPath, 'videos');
-    const screenshotsFolder = (0, path_1.join)(offset, 'dist', 'cypress', projectPath, 'screenshots');
-    return {
-        videosFolder,
-        screenshotsFolder,
-        video: true,
-        chromeWebSecurity: false,
-    };
-}
-exports.nxBaseCypressPreset = nxBaseCypressPreset;
-/**
- * nx E2E Preset for Cypress
- * @description
- * this preset contains the base configuration
- * for your e2e tests that nx recommends.
- * you can easily extend this within your cypress config via spreading the preset
- * @example
- * export default defineConfig({
- *   e2e: {
- *     ...nxE2EPreset(__dirname)
- *     // add your own config here
- *   }
- * })
- *
- * @param pathToConfig will be used to construct the output paths for videos and screenshots
- */
-function nxE2EPreset(pathToConfig, options) {
-    const basePath = (options === null || options === void 0 ? void 0 : options.cypressDir) || 'src';
-    const baseConfig = Object.assign(Object.assign({}, nxBaseCypressPreset(pathToConfig)), { fileServerFolder: '.', supportFile: `${basePath}/support/e2e.ts`, specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`, fixturesFolder: `${basePath}/fixtures` });
-    if ((options === null || options === void 0 ? void 0 : options.bundler) === 'vite') {
-        return Object.assign(Object.assign({}, baseConfig), { setupNodeEvents(on) {
-                on('file:preprocessor', (0, preprocessor_vite_1.default)());
-            } });
-    }
-    return baseConfig;
-}
-exports.nxE2EPreset = nxE2EPreset;
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("@nx/cypress/plugins/cypress-preset"), exports);
 //# sourceMappingURL=cypress-preset.js.map

package/plugins/cypress-preset.js.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-preset.js","sourceRoot":"","sources":["../../../../packages/cypress/plugins/cypress-preset.ts"],"names":[],"mappings":";;;AAAA,yCAA6C;AAC7C,+BAA+C;AAC/C,2BAA+B;AAE/B,wEAAgE;AAmBhE,SAAgB,mBAAmB,CAAC,YAAoB;IACtD,8DAA8D;IAC9D,sCAAsC;IACtC,MAAM,cAAc,GAAG,IAAA,cAAS,EAAC,YAAY,CAAC,CAAC,WAAW,EAAE;QAC1D,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,IAAA,cAAO,EAAC,YAAY,CAAC,CAAC;IAC1B,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,IAAA,eAAQ,EAAC,cAAc,EAAE,sBAAa,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC5E,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAC5B,MAAM,EACN,MAAM,EACN,SAAS,EACT,WAAW,EACX,aAAa,CACd,CAAC;IAEF,OAAO;QACL,YAAY;QACZ,iBAAiB;QACjB,KAAK,EAAE,IAAI;QACX,iBAAiB,EAAE,KAAK;KACzB,CAAC;AACJ,CAAC;AAvBD,kDAuBC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,WAAW,CACzB,YAAoB,EACpB,OAAmC;IAEnC,MAAM,QAAQ,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,KAAI,KAAK,CAAC;IAC9C,MAAM,UAAU,mCACX,mBAAmB,CAAC,YAAY,CAAC,KACpC,gBAAgB,EAAE,GAAG,EACrB,WAAW,EAAE,GAAG,QAAQ,iBAAiB,EACzC,WAAW,EAAE,GAAG,QAAQ,0BAA0B,EAClD,cAAc,EAAE,GAAG,QAAQ,WAAW,GACvC,CAAC;IAEF,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,MAAK,MAAM,EAAE;QAC/B,uCACK,UAAU,KACb,eAAe,CAAC,EAAE;gBAChB,EAAE,CAAC,mBAAmB,EAAE,IAAA,2BAAgB,GAAE,CAAC,CAAC;YAC9C,CAAC,IACD;KACH;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAtBD,kCAsBC"}
+{"version":3,"file":"cypress-preset.js","sourceRoot":"","sources":["../../../../packages-legacy/cypress/plugins/cypress-preset.ts"],"names":[],"mappings":";;;AAAA,6EAAmD"}

package/README.md

@@ -1,63 +0,0 @@
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
-
-<div style="text-align: center;">
-
-[![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
-[![License](https://img.shields.io/npm/l/@nrwl/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nrwl/workspace)
-[![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
-[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
-[![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Join us @nrwl/community on slack](https://img.shields.io/badge/slack-%40nrwl%2Fcommunity-brightgreen)](https://join.slack.com/t/nrwlcommunity/shared_invite/enQtNzU5MTE4OTQwOTk0LTgxY2E0ZWYzMWE0YzA5ZDA2MWM1NDVhNmI2ZWMyYmZhNWJiODk3MjkxZjY3MzU5ZjRmM2NmNWU1OTgyZmE4Mzc)
-
-</div>
-
-
-<hr>
-
-# Nx: Smart, Fast and Extensible Build System
-
-Nx is a next generation build system with first class monorepo support and powerful integrations.
-
-This package is a [Cypress plugin for Nx](https://nx.dev/cypress/overview).
-
-## Getting Started
-
-### Creating an Nx Workspace
-
-**Using `npx`**
-
-```bash
-npx create-nx-workspace
-```
-
-**Using `npm init`**
-
-```bash
-npm init nx-workspace
-```
-
-**Using `yarn create`**
-
-```bash
-yarn create nx-workspace
-```
-
-### Adding Nx to an Existing Repository
-
-Run:
-
-```bash
-npx nx@latest init
-```
-
-## Documentation & Resources
-
-- [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
-- [Intro to Nx](https://nx.dev/getting-started/intro)
-- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
-- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
-
-<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
-

package/migrations.json

@@ -1,47 +0,0 @@
-{
-  "schematics": {
-    "remove-typescript-plugin": {
-      "cli": "nx",
-      "version": "12.8.0-beta.0",
-      "description": "Remove Typescript Preprocessor Plugin",
-      "factory": "./src/migrations/update-12-8-0/remove-typescript-plugin"
-    },
-    "update-cypress-configs-preset": {
-      "cli": "nx",
-      "version": "14.6.1-beta.0",
-      "description": "Change Cypress e2e and component testing presets to use __filename instead of __dirname and include a devServerTarget for component testing.",
-      "factory": "./src/migrations/update-14-6-1/update-cypress-configs-presets"
-    },
-    "update-cypress-if-v10": {
-      "cli": "nx",
-      "version": "14.7.0-beta.0",
-      "description": "Update Cypress if using v10 to support latest component testing features",
-      "factory": "./src/migrations/update-14-7-0/update-cypress-version-if-10"
-    },
-    "add-cypress-inputs": {
-      "cli": "nx",
-      "version": "15.0.0-beta.0",
-      "description": "Stop hashing cypress spec files and config files for build targets and dependent tasks",
-      "factory": "./src/migrations/update-15-0-0/add-cypress-inputs"
-    },
-    "update-cy-mount-usage": {
-      "cli": "nx",
-      "version": "15.0.0-beta.4",
-      "description": "Update to using cy.mount in the commands.ts file instead of importing mount for each component test file",
-      "factory": "./src/migrations/update-15-0-0/update-cy-mount-usage"
-    },
-    "update-to-cypress-11": {
-      "cli": "nx",
-      "version": "15.1.0-beta.0",
-      "description": "Update to Cypress v11. This migration will only update if the workspace is already on v10. https://www.cypress.io/blog/2022/11/04/upcoming-changes-to-component-testing/",
-      "factory": "./src/migrations/update-15-1-0/cypress-11"
-    },
-    "update-to-cypress-12": {
-      "cli": "nx",
-      "version": "15.5.0-beta.0",
-      "description": "Update to Cypress v12. Cypress 12 contains a handful of breaking changes that might causes tests to start failing that nx cannot directly fix. Read more Cypress 12 changes: https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-12-0.This migration will only run if you are already using Cypress v11.",
-      "factory": "./src/migrations/update-15-5-0/update-to-cypress-12"
-    }
-  },
-  "packageJsonUpdates": {}
-}

package/src/executors/cypress/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: any;
-export default _default;

package/src/executors/cypress/compat.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nrwl/devkit");
-const cypress_impl_1 = require("./cypress.impl");
-exports.default = (0, devkit_1.convertNxExecutor)(cypress_impl_1.default);
-//# sourceMappingURL=compat.js.map

package/src/executors/cypress/compat.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,iDAA4D;AAE5D,kBAAe,IAAA,0BAAiB,EAAC,sBAAe,CAAC,CAAC"}

package/src/executors/cypress/cypress.impl.d.ts

@@ -1,40 +0,0 @@
-import { ExecutorContext } from '@nrwl/devkit';
-import 'dotenv/config';
-export type Json = {
-    [k: string]: any;
-};
-export interface CypressExecutorOptions extends Json {
-    cypressConfig: string;
-    watch?: boolean;
-    tsConfig?: string;
-    devServerTarget?: string;
-    headed?: boolean;
-    /**
-     * @deprecated use watch instead
-     **/
-    headless?: boolean;
-    exit?: boolean;
-    key?: string;
-    record?: boolean;
-    parallel?: boolean;
-    baseUrl?: string;
-    browser?: string;
-    env?: Record<string, string>;
-    spec?: string;
-    /**
-     * @deprecated no longer used since cypress supports typescript out of the box
-     **/
-    copyFiles?: string;
-    ciBuildId?: string | number;
-    group?: string;
-    ignoreTestFiles?: string;
-    reporter?: string;
-    reporterOptions?: string;
-    skipServe?: boolean;
-    testingType?: 'component' | 'e2e';
-    tag?: string;
-    port?: number | 'cypress-auto';
-}
-export default function cypressExecutor(options: CypressExecutorOptions, context: ExecutorContext): Promise<{
-    success: any;
-}>;