@nx/cypress 23.2.0-beta.4 → 23.2.0-beta.6

package/dist/src/plugins/plugin.js

@@ -5,10 +5,6 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 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");
 const cypressConfigGlob = '**/cypress.config.{js,ts,mjs,cjs}';
@@ -25,9 +21,9 @@ const defaultPatterns = {
 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 optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, path_1.join)(internal_1.workspaceDataDirectory, `cypress-${optionsHash}.hash`);
+        const pluginCache = new internal_1.PluginCache(cachePath);
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
         const lockFileName = (0, js_1.getLockFileName)(packageManager);
@@ -490,7 +486,7 @@ async function getSpecFilesAndPatternsForTestType(cypressConfig, testType, works
     const excludeSpecPatterns = Array.isArray(excludeSpecPattern)
         ? excludeSpecPattern.map((p) => (0, path_1.join)(projectRoot, p))
         : [(0, path_1.join)(projectRoot, excludeSpecPattern)];
-    const specFiles = await (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, specPatterns, excludeSpecPatterns);
+    const specFiles = await (0, internal_1.globWithWorkspaceContext)(workspaceRoot, specPatterns, excludeSpecPatterns);
     return { specFiles, specPatterns, excludeSpecPatterns };
 }
 async function filterCypressConfigs(configFiles, context) {

package/dist/src/utils/ct-helpers.js

@@ -8,9 +8,7 @@ exports.createExecutorContext = createExecutorContext;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
-const configuration_1 = require("nx/src/config/configuration");
+const internal_1 = require("@nx/devkit/internal");
 exports.CY_FILE_MATCHER = new RegExp(/\.cy\.[tj]sx?$/);
 /**
  * return a path to a temp css file
@@ -55,8 +53,8 @@ function getProjectConfigByPath(graph, configPath) {
     const normalizedPathFromWorkspaceRoot = (0, devkit_1.normalizePath)((0, fs_1.lstatSync)(configPath).isFile()
         ? configFileFromWorkspaceRoot.replace((0, path_1.extname)(configPath), '')
         : configFileFromWorkspaceRoot);
-    const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(graph.nodes);
-    const componentTestingProjectName = (0, find_project_for_path_1.findProjectForPath)(normalizedPathFromWorkspaceRoot, projectRootMappings);
+    const projectRootMappings = (0, internal_1.createProjectRootMappings)(graph.nodes);
+    const componentTestingProjectName = (0, internal_1.findProjectForPath)(normalizedPathFromWorkspaceRoot, projectRootMappings);
     if (!componentTestingProjectName ||
         !graph.nodes[componentTestingProjectName]?.data) {
         throw new Error((0, devkit_1.stripIndents) `Unable to find the project configuration that includes ${normalizedPathFromWorkspaceRoot}. 
@@ -69,8 +67,8 @@ function getProjectConfigByPath(graph, configPath) {
     return graph.nodes[componentTestingProjectName].data;
 }
 function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
-    const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
-    const nxJsonConfiguration = (0, configuration_1.readNxJson)();
+    const projectsConfigurations = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(graph);
+    const nxJsonConfiguration = (0, internal_1.readNxJsonFromDisk)();
     return {
         cwd: process.cwd(),
         projectGraph: graph,

package/dist/src/utils/find-target-options.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findBuildConfig = findBuildConfig;
 const devkit_1 = require("@nx/devkit");
-const configuration_1 = require("nx/src/config/configuration");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
+const internal_1 = require("@nx/devkit/internal");
 async function findBuildConfig(tree, options) {
     try {
         // attempt to use the provided target
@@ -118,8 +117,8 @@ function findTargetOptionsInProject(tree, graph, projectName, options) {
     }
 }
 function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
-    const nxJsonConfiguration = (0, configuration_1.readNxJson)();
-    const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
+    const nxJsonConfiguration = (0, internal_1.readNxJsonFromDisk)();
+    const projectsConfigurations = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(graph);
     return {
         cwd: process.cwd(),
         projectGraph: graph,

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

@@ -5,9 +5,9 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const detect_port_1 = tslib_1.__importDefault(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 internal_1 = require("@nx/devkit/internal");
 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
@@ -136,8 +136,8 @@ ${e.message || e}`);
         // so we double check the schema if readTargetOptions didn't return a value for the property
         const projectConfig = context.projectsConfigurations?.projects?.[target.project];
         const targetConfig = projectConfig.targets[target.target];
-        const [collection, executor] = (0, executor_utils_1.parseExecutor)(targetConfig.executor);
-        const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, context.root, context.projectsConfigurations.projects);
+        const [collection, executor] = (0, internal_1.parseExecutor)(targetConfig.executor);
+        const { schema } = (0, internal_1.getExecutorInformation)(collection, executor, context.root, context.projectsConfigurations.projects);
         // NOTE: schema won't have a default since readTargetOptions would have
         // already set that and this check wouldn't need to be made
         targetHasOpt = Object.keys(schema.properties).includes(property);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "23.2.0-beta.4",
+  "version": "23.2.0-beta.6",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -89,12 +89,12 @@
     "semver": "^7.6.3",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.4",
-    "@nx/eslint": "23.2.0-beta.4",
-    "@nx/js": "23.2.0-beta.4"
+    "@nx/devkit": "23.2.0-beta.6",
+    "@nx/eslint": "23.2.0-beta.6",
+    "@nx/js": "23.2.0-beta.6"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.4"
+    "nx": "23.2.0-beta.6"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"