@nx/cypress 21.2.1 → 21.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "21.2.1",
+  "version": "21.2.3",
   "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": "21.2.1",
-    "@nx/eslint": "21.2.1",
-    "@nx/js": "21.2.1",
+    "@nx/devkit": "21.2.3",
+    "@nx/eslint": "21.2.3",
+    "@nx/js": "21.2.3",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "semver": "^7.6.3",

package/src/generators/migrate-to-cypress-11/conversion.util.js

@@ -9,8 +9,9 @@ exports.writeNewConfig = writeNewConfig;
 exports.addConfigToTsConfig = addConfigToTsConfig;
 exports.updatePluginFile = updatePluginFile;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const path_1 = require("path");
 let tsModule;
 let tsquery;
 const validFilesEndingsToUpdate = [
@@ -50,7 +51,8 @@ function createNewCypressConfig(tree, projectConfig, cypressConfigPathJson) {
     const { modifyObstructiveCode = null, // no longer needed in configs
     integrationFolder = 'src/e2e', // provide the new defaults if the value isn't present
     supportFile = 'src/support/e2e.ts', ...restOfConfig } = cypressConfigJson;
-    const newIntegrationFolder = tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'integration'))
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const newIntegrationFolder = tree.exists((0, devkit_1.joinPathFragments)(sourceRoot, 'integration'))
         ? 'src/e2e'
         : integrationFolder;
     const cypressConfigTs = {
@@ -61,8 +63,8 @@ function createNewCypressConfig(tree, projectConfig, cypressConfigPathJson) {
             // then use the new default location.
             // otherwise we will use the existing folder location/falsey value
             supportFile: (supportFile &&
-                tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'index.ts'))) ||
-                tree.exists((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'e2e.ts'))
+                tree.exists((0, devkit_1.joinPathFragments)(sourceRoot, 'support', 'index.ts'))) ||
+                tree.exists((0, devkit_1.joinPathFragments)(sourceRoot, 'support', 'e2e.ts'))
                 ? 'src/support/e2e.ts'
                 : supportFile,
             // if the default location is used then will update to the new location otherwise keep the custom location
@@ -97,6 +99,7 @@ function createSupportFileImport(oldSupportFilePath, newSupportFilePath, project
 }
 function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfigJson, }) {
     const { integrationFolder, supportFile } = cypressConfigTs['e2e'];
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
     const oldIntegrationFolder = (0, devkit_1.joinPathFragments)(projectConfig.root, cypressConfigJson.integrationFolder);
     const newIntegrationFolder = (0, devkit_1.joinPathFragments)(projectConfig.root, integrationFolder);
     let newSupportFile;
@@ -121,9 +124,9 @@ function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfi
         shouldUpdateSupportFileImports = false;
         newSupportFile = supportFile;
         // rename the default support file even if not in use to keep the system in sync with cypress v10
-        const defaultSupportFile = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'index.ts');
+        const defaultSupportFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'support', 'index.ts');
         if (tree.exists(defaultSupportFile)) {
-            const newSupportDefaultPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'support', 'e2e.ts');
+            const newSupportDefaultPath = (0, devkit_1.joinPathFragments)(sourceRoot, 'support', 'e2e.ts');
             if (defaultSupportFile !== newSupportDefaultPath &&
                 tree.exists(defaultSupportFile)) {
                 tree.rename(defaultSupportFile, newSupportDefaultPath);
@@ -131,13 +134,13 @@ function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfi
         }
     }
     if (shouldUpdateSupportFileImports) {
-        const newImportPaths = createSupportFileImport(oldSupportFile, newSupportFile, projectConfig.sourceRoot);
+        const newImportPaths = createSupportFileImport(oldSupportFile, newSupportFile, sourceRoot);
         oldImportLeafPath = newImportPaths.oldImportPathLeaf;
         newImportLeafPath = newImportPaths.newImportPathLeaf;
     }
     // tree.rename doesn't work on directories must update each file within
     // the directory to the new directory
-    (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (path) => {
+    (0, devkit_1.visitNotIgnoredFiles)(tree, sourceRoot, (path) => {
         const normalizedPath = (0, devkit_1.normalizePath)(path);
         if (!normalizedPath.includes(oldIntegrationFolder)) {
             return;

package/src/migrations/update-20-8-0/set-inject-document-domain.js

@@ -32,7 +32,9 @@ function setInjectDocumentDomain(cypressConfig) {
     }
     const sourceFile = tsquery_1.tsquery.ast(cypressConfig);
     let e2eProperty = (0, migrations_1.getObjectProperty)(config, 'e2e');
-    let componentProperty = (0, migrations_1.getObjectProperty)(config, 'component');
+    let hasOtherTopLevelProperties = config.properties.some((p) => ts.isPropertyAssignment(p) &&
+        p.name.getText() !== 'e2e' &&
+        p.name.getText() !== 'component');
     let updatedConfig = config;
     const topLevelExperimentalSkipDomainInjectionProperty = (0, migrations_1.getObjectProperty)(updatedConfig, 'experimentalSkipDomainInjection');
     const topLevelSkipDomainState = !topLevelExperimentalSkipDomainInjectionProperty
@@ -76,43 +78,9 @@ function setInjectDocumentDomain(cypressConfig) {
             });
         }
     }
-    let componentSkipDomainState = 'not-set';
-    if (componentProperty) {
-        let experimentalSkipDomainInjectionProperty;
-        let isObjectLiteral = false;
-        if (ts.isObjectLiteralExpression(componentProperty.initializer)) {
-            experimentalSkipDomainInjectionProperty = (0, migrations_1.getObjectProperty)(componentProperty.initializer, 'experimentalSkipDomainInjection');
-            isObjectLiteral = true;
-        }
-        if (experimentalSkipDomainInjectionProperty) {
-            componentSkipDomainState =
-                !ts.isArrayLiteralExpression(experimentalSkipDomainInjectionProperty.initializer) ||
-                    experimentalSkipDomainInjectionProperty.initializer.elements.length > 0
-                    ? 'skipping'
-                    : 'not-skipping';
-        }
-        if (componentSkipDomainState === 'not-set' &&
-            topLevelSkipDomainState === 'not-set') {
-            updatedConfig = (0, migrations_1.updateObjectProperty)(updatedConfig, componentProperty, {
-                newValue: setInjectDocumentDomainInObject(componentProperty.initializer),
-            });
-        }
-        else if (componentSkipDomainState === 'not-skipping') {
-            updatedConfig = (0, migrations_1.updateObjectProperty)(updatedConfig, componentProperty, {
-                newValue: replaceExperimentalSkipDomainInjectionInObject(componentProperty.initializer),
-            });
-        }
-        else if (componentSkipDomainState === 'skipping') {
-            updatedConfig = (0, migrations_1.updateObjectProperty)(updatedConfig, componentProperty, {
-                newValue: (0, migrations_1.removeObjectProperty)(
-                // we only determine that it's skipping if it's an object literal
-                componentProperty.initializer, (0, migrations_1.getObjectProperty)(componentProperty.initializer, 'experimentalSkipDomainInjection')),
-            });
-        }
-    }
     if (topLevelSkipDomainState === 'not-set' &&
         !e2eProperty &&
-        !componentProperty) {
+        hasOtherTopLevelProperties) {
         updatedConfig = setInjectDocumentDomainInObject(updatedConfig);
     }
     else if (topLevelSkipDomainState === 'not-skipping') {

package/src/plugins/plugin.js

@@ -327,7 +327,10 @@ async function buildCypressTargets(configFilePath, projectRoot, options, context
     }
     targets[options.openTargetName] = {
         command: `cypress open`,
-        options: { cwd: projectRoot },
+        options: {
+            cwd: projectRoot,
+            env: { TS_NODE_COMPILER_OPTIONS: tsNodeCompilerOptions },
+        },
         metadata: {
             technologies: ['cypress'],
             description: 'Opens Cypress',