@nx/cypress 17.2.0-beta.12 → 17.2.0-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "17.2.0-beta.12",
+  "version": "17.2.0-beta.15",
   "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,14 +34,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "17.2.0-beta.12",
-    "@nx/eslint": "17.2.0-beta.12",
-    "@nx/js": "17.2.0-beta.12",
+    "@nx/devkit": "17.2.0-beta.15",
+    "@nx/eslint": "17.2.0-beta.15",
+    "@nx/js": "17.2.0-beta.15",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "17.2.0-beta.12"
+    "@nrwl/cypress": "17.2.0-beta.15"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/src/plugins/plugin.js

@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const internal_1 = require("@nx/js/src/internal");
 const js_1 = require("@nx/js");
-const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const fs_1 = require("fs");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
@@ -105,20 +104,11 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
     if ('e2e' in cypressConfig) {
         targets[options.targetName] = {
             command: `cypress run --config-file ${relativeConfigPath} --e2e`,
-            options: {
-                cwd: projectRoot,
-            },
+            options: { cwd: projectRoot },
+            cache: true,
+            inputs: getInputs(namedInputs),
+            outputs: getOutputs(projectRoot, cypressConfig, 'e2e'),
         };
-        const e2eTargetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.targetName, context.nxJsonConfiguration.targetDefaults, 'run-commands');
-        if (e2eTargetDefaults?.cache === undefined) {
-            targets[options.targetName].cache = true;
-        }
-        if (e2eTargetDefaults?.inputs === undefined) {
-            targets[options.targetName].inputs = getInputs(namedInputs);
-        }
-        if (e2eTargetDefaults?.outputs === undefined) {
-            targets[options.targetName].outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
-        }
         if (webServerCommands?.default) {
             delete webServerCommands.default;
         }
@@ -174,24 +164,14 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
         }
     }
     if ('component' in cypressConfig) {
-        const componentTestingTargetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.componentTestingTargetName, context.nxJsonConfiguration.targetDefaults, 'nx:run-commands');
         // This will not override the e2e target if it is the same
         targets[options.componentTestingTargetName] ??= {
             command: `cypress open --config-file ${relativeConfigPath} --component`,
-            options: {
-                cwd: projectRoot,
-            },
+            options: { cwd: projectRoot },
+            cache: true,
+            inputs: getInputs(namedInputs),
+            outputs: getOutputs(projectRoot, cypressConfig, 'component'),
         };
-        if (componentTestingTargetDefaults?.cache === undefined) {
-            targets[options.componentTestingTargetName].cache = true;
-        }
-        if (componentTestingTargetDefaults?.inputs === undefined) {
-            targets[options.componentTestingTargetName].inputs =
-                getInputs(namedInputs);
-        }
-        if (componentTestingTargetDefaults?.outputs === undefined) {
-            targets[options.componentTestingTargetName].outputs = getOutputs(projectRoot, cypressConfig, 'component');
-        }
     }
     return targets;
 }
@@ -203,18 +183,18 @@ function getCypressConfig(configFilePath, context) {
         if (tsConfigPath) {
             const unregisterTsProject = (0, internal_1.registerTsProject)(tsConfigPath);
             try {
-                module = require(resolvedPath);
+                module = load(resolvedPath);
             }
             finally {
                 unregisterTsProject();
             }
         }
         else {
-            module = require(resolvedPath);
+            module = load(resolvedPath);
         }
     }
     else {
-        module = require(resolvedPath);
+        module = load(resolvedPath);
     }
     return module.default ?? module;
 }
@@ -235,3 +215,16 @@ function getInputs(namedInputs) {
         },
     ];
 }
+/**
+ * Load the module after ensuring that the require cache is cleared.
+ */
+function load(path) {
+    // Clear cache if the path is in the cache
+    if (require.cache[path]) {
+        for (const k of Object.keys(require.cache)) {
+            delete require.cache[k];
+        }
+    }
+    // Then require
+    return require(path);
+}