@nx/cypress 22.6.0-beta.1 → 22.6.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "22.6.0-beta.1",
+  "version": "22.6.0-beta.10",
   "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": "22.6.0-beta.1",
-    "@nx/eslint": "22.6.0-beta.1",
-    "@nx/js": "22.6.0-beta.1",
+    "@nx/devkit": "22.6.0-beta.10",
+    "@nx/eslint": "22.6.0-beta.10",
+    "@nx/js": "22.6.0-beta.10",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "detect-port": "^1.5.1",
     "semver": "^7.6.3",
@@ -46,7 +46,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.6.0-beta.1"
+    "nx": "22.6.0-beta.10"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"

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,EAUnB,MAAM,YAAY,CAAC;AAYpB,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;AA8BD,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;AAgBD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,oBAAoB,CAqB3D,CAAC;AAEF,eAAO,MAAM,aAAa,qCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -9,22 +9,10 @@ const js_1 = require("@nx/js");
 const fs_1 = require("fs");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
+const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const path_1 = require("path");
 const constants_1 = require("../utils/constants");
-function readTargetsCache(cachePath) {
-    try {
-        return process.env.NX_CACHE_PROJECT_GRAPH !== 'false'
-            ? (0, devkit_1.readJsonFile)(cachePath)
-            : {};
-    }
-    catch {
-        return {};
-    }
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 const cypressConfigGlob = '**/cypress.config.{js,ts,mjs,cjs}';
 const defaultPatterns = {
     e2e: {
@@ -42,17 +30,17 @@ exports.createNodes = [
     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 targetsCache = readTargetsCache(cachePath);
+        const pluginCache = new plugin_cache_utils_1.PluginCache(cachePath);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, targetsCache), configFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context, pluginCache), configFiles, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            pluginCache.writeToDisk(cachePath);
         }
     },
 ];
 exports.createNodesV2 = exports.createNodes;
-async function createNodesInternal(configFilePath, options, context, targetsCache) {
+async function createNodesInternal(configFilePath, options, context, pluginCache) {
     options = normalizeOptions(options);
     const projectRoot = (0, path_1.dirname)(configFilePath);
     // Do not create a project if package.json and project.json isn't there.
@@ -62,8 +50,10 @@ async function createNodesInternal(configFilePath, options, context, targetsCach
         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))]);
-    targetsCache[hash] ??= await buildCypressTargets(configFilePath, projectRoot, options, context);
-    const { targets, metadata } = targetsCache[hash];
+    if (!pluginCache.has(hash)) {
+        pluginCache.set(hash, await buildCypressTargets(configFilePath, projectRoot, options, context));
+    }
+    const { targets, metadata } = pluginCache.get(hash);
     const project = {
         projectType: 'application',
         targets,

package/src/utils/start-dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start-dev-server.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/start-dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAShB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAQ3E,wBAAuB,cAAc,CACnC,IAAI,EAAE,IAAI,CAAC,sBAAsB,EAAE,eAAe,CAAC,EACnD,OAAO,EAAE,eAAe;;;;;;kBAiEzB"}
+{"version":3,"file":"start-dev-server.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/start-dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAShB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAW3E,wBAAuB,cAAc,CACnC,IAAI,EAAE,IAAI,CAAC,sBAAsB,EAAE,eAAe,CAAC,EACnD,OAAO,EAAE,eAAe;;;;;;kBAiEzB"}

package/src/utils/start-dev-server.js

@@ -6,6 +6,8 @@ const path_1 = require("path");
 const detectPort = require("detect-port");
 const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
 const fs_1 = require("fs");
+const os_1 = require("os");
+const PORT_LOCK_DIR = (0, path_1.join)((0, os_1.tmpdir)(), 'nx-cypress-port-locks');
 async function* startDevServer(opts, context) {
     // no dev server, return the provisioned base url
     if (!opts.devServerTarget || opts.skipServe) {
@@ -46,7 +48,7 @@ If the port is in use, try using a different port value or passing --port='cypre
         }
         yield {
             baseUrl: opts.baseUrl || output.baseUrl || output.info?.baseUrl,
-            portLockFilePath: overrides.port && (0, path_1.join)(__dirname, `${overrides.port}.txt`),
+            portLockFilePath: overrides.port && (0, path_1.join)(PORT_LOCK_DIR, `${overrides.port}.lock`),
         };
     }
 }
@@ -142,7 +144,13 @@ ${e.message || e}`);
     return [targetHasOpt, targetOpts[property]];
 }
 function attemptToLockPort(port) {
-    const portLockFilePath = (0, path_1.join)(__dirname, `${port}.txt`);
+    try {
+        (0, fs_1.mkdirSync)(PORT_LOCK_DIR, { recursive: true });
+    }
+    catch {
+        // ignore if already exists
+    }
+    const portLockFilePath = (0, path_1.join)(PORT_LOCK_DIR, `${port}.lock`);
     try {
         if ((0, fs_1.existsSync)(portLockFilePath)) {
             return false;