@nx/cypress 22.7.0-pr.35019.f500fd7 → 22.7.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "22.7.0-pr.35019.f500fd7",
+  "version": "22.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": {
@@ -22,7 +22,8 @@
     "Testing"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -36,9 +37,9 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-pr.35019.f500fd7",
-    "@nx/eslint": "22.7.0-pr.35019.f500fd7",
-    "@nx/js": "22.7.0-pr.35019.f500fd7",
+    "@nx/devkit": "22.7.0-rc.0",
+    "@nx/eslint": "22.7.0-rc.0",
+    "@nx/js": "22.7.0-rc.0",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "detect-port": "^1.5.1",
     "semver": "^7.6.3",
@@ -46,7 +47,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.35019.f500fd7"
+    "nx": "22.7.0-rc.0"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"
@@ -58,7 +59,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  }
 }

package/plugins/cypress-preset.d.ts

@@ -1,4 +1,4 @@
-import type { InlineConfig } from 'vite';
+type InlineConfig = Record<string, any>;
 interface BaseCypressPreset {
     videosFolder: string;
     screenshotsFolder: string;

package/plugins/cypress-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-preset.d.ts","sourceRoot":"","sources":["../../../../packages/cypress/plugins/cypress-preset.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAYzC,UAAU,iBAAiB;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;CAC5B;AAID,MAAM,WAAW,+BACf,SAAQ,IAAI,CAAC,yBAAyB,EAAE,SAAS,CAAC;CAAG;AAEvD,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE;IAAE,WAAW,EAAE,WAAW,GAAG,KAAK,CAAA;CAAE,GAC7C,iBAAiB,CAwBnB;AA6CD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,yBAAyB,OAkEpC;AA0DD,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;QAII;IACJ,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE3C;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC;;OAEG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC;CACpC,CAAC"}
+{"version":3,"file":"cypress-preset.d.ts","sourceRoot":"","sources":["../../../../packages/cypress/plugins/cypress-preset.ts"],"names":[],"mappings":"AAUA,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAYxC,UAAU,iBAAiB;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,yBAAyB;IACxC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC;CAC5B;AAID,MAAM,WAAW,+BACf,SAAQ,IAAI,CAAC,yBAAyB,EAAE,SAAS,CAAC;CAAG;AAEvD,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE;IAAE,WAAW,EAAE,WAAW,GAAG,KAAK,CAAA;CAAE,GAC7C,iBAAiB,CAwBnB;AA6CD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,yBAAyB,OAkEpC;AA0DD,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;QAII;IACJ,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE3C;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC;;OAEG;IACH,mBAAmB,CAAC,EAAE,YAAY,CAAC;CACpC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/component-configuration/component-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAGjB,oBAAoB,EAKpB,IAAI,EAIL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAI/D,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAM7C;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BA0C7C;AAkHD,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,QAsDpC;AAOD,eAAe,+BAA+B,CAAC"}
+{"version":3,"file":"component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/component-configuration/component-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAIjB,oBAAoB,EAKpB,IAAI,EAIL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAI/D,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAM7C;AAED,wBAAsB,uCAAuC,CAC3D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mCAAmC,8BAwD7C;AAkHD,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,oBAAoB,QAsDpC;AAOD,eAAe,+BAA+B,CAAC"}

package/src/generators/component-configuration/component-configuration.js

@@ -6,6 +6,7 @@ exports.updateTsConfigForComponentTesting = updateTsConfigForComponentTesting;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const semver_1 = require("semver");
 const versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
@@ -17,6 +18,17 @@ function componentConfigurationGenerator(tree, options) {
 }
 async function componentConfigurationGeneratorInternal(tree, options) {
     (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'cypress', 'component-configuration');
+    // Cypress CT does not support Vite 8 yet (@cypress/vite-dev-server
+    // peer dep is ^5.0.0 || ^6.0.0 || ^7.0.0).
+    const viteVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'vite');
+    if (viteVersion) {
+        const viteMajor = (0, semver_1.major)((0, semver_1.coerce)(viteVersion));
+        if (viteMajor >= 8) {
+            throw new Error(`Cypress component testing does not yet support Vite ${viteMajor}. ` +
+                `Downgrade to Vite 7 or earlier to use Cypress component testing. ` +
+                `See: https://github.com/cypress-io/cypress/issues/33078`);
+        }
+    }
     const tasks = [];
     const opts = normalizeOptions(tree, options);
     if (!(0, versions_1.getInstalledCypressMajorVersion)(tree)) {

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,oBAAoB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC;AAgBD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAqB3D,CAAC;AAEF,eAAO,MAAM,aAAa,qCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAapB,MAAM,WAAW,oBAAoB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC;AAcD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAwB3D,CAAC;AAEF,eAAO,MAAM,aAAa,qCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -24,15 +24,15 @@ const defaultPatterns = {
         excludeSpecPattern: ['/snapshots/*', '/image_snapshots/*'],
     },
 };
-const pmc = (0, devkit_1.getPackageManagerCommand)();
 exports.createNodes = [
     cypressConfigGlob,
     async (configFiles, options, context) => {
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `cypress-${optionsHash}.hash`);
         const pluginCache = new plugin_cache_utils_1.PluginCache(cachePath);
+        const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache), configFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache, pmc), configFiles, options, context);
         }
         finally {
             pluginCache.writeToDisk(cachePath);
@@ -40,7 +40,7 @@ exports.createNodes = [
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, pluginCache) {
+async function createNodesInternal(configFilePath, options, context, pluginCache, pmc) {
     options = normalizeOptions(options);
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
@@ -49,9 +49,11 @@ async function createNodesInternal(configFilePath, options, context, pluginCache
         !siblingFiles.includes('project.json')) {
         return {};
     }
-    const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [(0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot))]);
+    const hash = (await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
+        (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+    ])) + configFilePath;
     if (!pluginCache.has(hash)) {
-        pluginCache.set(hash, await buildCypressTargets(configFilePath, projectRoot, options, context));
+        pluginCache.set(hash, await buildCypressTargets(configFilePath, projectRoot, options, context, pmc));
     }
     const { targets, metadata } = pluginCache.get(hash);
     const project = {
@@ -140,7 +142,7 @@ function getOutputs(projectRoot, cypressConfig, testingType) {
     }
     return outputs;
 }
-async function buildCypressTargets(configFilePath, projectRoot, options, context) {
+async function buildCypressTargets(configFilePath, projectRoot, options, context, pmc) {
     const cypressConfig = await (0, config_utils_1.loadConfigFile)((0, path_1.join)(context.workspaceRoot, configFilePath));
     const pluginPresetOptions = {
         ...cypressConfig.e2e?.[constants_1.NX_PLUGIN_OPTIONS],

package/src/plugins/preprocessor-vite.d.ts

@@ -22,7 +22,7 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  **/
-import type { InlineConfig } from 'vite';
+type InlineConfig = Record<string, any>;
 type CypressPreprocessor = (file: Record<string, any>) => string | Promise<string>;
 /**
  * Use Vite as a file preprocess for Cypress test files.

package/src/plugins/preprocessor-vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preprocessor-vite.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/preprocessor-vite.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;IAuBI;AAIJ,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEzC,KAAK,mBAAmB,GAAG,CACzB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACtB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAM9B;;;;GAIG;AACH,iBAAS,gBAAgB,CACvB,eAAe,GAAE,YAAiB,GACjC,mBAAmB,CAkErB;AAUD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"preprocessor-vite.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/preprocessor-vite.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;IAuBI;AAMJ,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAExC,KAAK,mBAAmB,GAAG,CACzB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACtB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAI9B;;;;GAIG;AACH,iBAAS,gBAAgB,CACvB,eAAe,GAAE,YAAiB,GACjC,mBAAmB,CAkErB;AAUD,eAAe,gBAAgB,CAAC"}

package/src/plugins/preprocessor-vite.js

@@ -61,10 +61,10 @@ function vitePreprocessor(configOverrides = {}) {
         };
         cache.set(filePath, outputPath);
         const { build } = await Function('return import("vite")')();
-        const watcher = (await build({
+        const watcher = await build({
             ...defaultConfig,
             ...configOverrides,
-        }));
+        });
         return new Promise((resolve, reject) => {
             if (shouldWatch && isWatcher(watcher)) {
                 watcher.on('event', (event) => {

package/project.json

@@ -1,58 +0,0 @@
-{
-    "name": "cypress",
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "sourceRoot": "packages/cypress",
-    "projectType": "library",
-    "targets": {
-        "build": {
-            "outputs": ["{workspaceRoot}/dist/packages/cypress/README.md"],
-            "command": "node ./scripts/copy-readme.js cypress",
-            "dependsOn": ["^build", "build-base", "legacy-post-build"]
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/cypress",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/cypress",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/cypress",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/cypress",
-                        "glob": "**/*.js",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/cypress",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/cypress",
-                        "glob": "PLUGIN.md",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
-        }
-    }
-}