@nx/cypress 22.7.0-beta.1 → 22.7.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "22.7.0-beta.1",
+  "version": "22.7.0-beta.2",
   "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.7.0-beta.1",
-    "@nx/eslint": "22.7.0-beta.1",
-    "@nx/js": "22.7.0-beta.1",
+    "@nx/devkit": "22.7.0-beta.2",
+    "@nx/eslint": "22.7.0-beta.2",
+    "@nx/js": "22.7.0-beta.2",
     "@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.7.0-beta.1"
+    "nx": "22.7.0-beta.2"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"

package/plugins/cypress-preset.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxBaseCypressPreset = nxBaseCypressPreset;
 exports.nxE2EPreset = nxE2EPreset;
+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 child_process_1 = require("child_process");
@@ -9,7 +10,7 @@ const fs_1 = require("fs");
 const http_1 = require("http");
 const https_1 = require("https");
 const path_1 = require("path");
-const preprocessor_vite_1 = require("../src/plugins/preprocessor-vite");
+const preprocessor_vite_1 = tslib_1.__importDefault(require("../src/plugins/preprocessor-vite"));
 const constants_1 = require("../src/utils/constants");
 const treeKill = require('tree-kill');
 function nxBaseCypressPreset(pathToConfig, options) {
@@ -44,13 +45,13 @@ function startWebServer(webServerCommand) {
         // Windows is fine so we leave it attached to this process
         detached: process.platform !== 'win32',
         stdio: 'inherit',
-        windowsHide: false,
+        windowsHide: true,
     });
     return async () => {
         if (process.platform === 'win32') {
             try {
                 (0, child_process_1.execSync)('taskkill /pid ' + serverProcess.pid + ' /T /F', {
-                    windowsHide: false,
+                    windowsHide: true,
                 });
             }
             catch (e) {

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

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentConfigurationGenerator = componentConfigurationGenerator;
 exports.componentConfigurationGeneratorInternal = componentConfigurationGeneratorInternal;
 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 versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
-const init_1 = require("../init/init");
+const init_1 = tslib_1.__importDefault(require("../init/init"));
 function componentConfigurationGenerator(tree, options) {
     return componentConfigurationGeneratorInternal(tree, {
         addPlugin: false,

package/src/generators/configuration/configuration.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configurationGenerator = configurationGenerator;
 exports.configurationGeneratorInternal = configurationGeneratorInternal;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const prompt_1 = require("@nx/devkit/src/generators/prompt");
@@ -14,7 +15,7 @@ const add_linter_1 = require("../../utils/add-linter");
 const config_1 = require("../../utils/config");
 const versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
-const init_1 = require("../init/init");
+const init_1 = tslib_1.__importStar(require("../init/init"));
 function configurationGenerator(tree, options) {
     return configurationGeneratorInternal(tree, {
         addPlugin: false,

package/src/utils/add-linter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-linter.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/add-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAwB,MAAM,YAAY,CAAC;AAiBtE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;;QAGI;IACJ,UAAU,EAAE,MAAM,CAAC;IACnB;;;QAGI;IACJ,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,eAAe,uBA4HzB"}
+{"version":3,"file":"add-linter.d.ts","sourceRoot":"","sources":["../../../../../packages/cypress/src/utils/add-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,UAAU,EAAwB,MAAM,YAAY,CAAC;AAiBtE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;;QAGI;IACJ,UAAU,EAAE,MAAM,CAAC;IACnB;;;QAGI;IACJ,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,eAAe,uBA8HzB"}

package/src/utils/add-linter.js

@@ -38,7 +38,12 @@ async function addLinterToCyProject(tree, options) {
         (0, eslint_file_1.isEslintConfigSupported)(tree)) {
         const overrides = [];
         if ((0, flat_config_1.useFlatConfig)(tree)) {
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, projectConfig.root, 'recommended', 'cypress', 'eslint-plugin-cypress/flat', false, false);
+            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, projectConfig.root, 'recommended', {
+                moduleName: 'cypress',
+                moduleImportPath: 'eslint-plugin-cypress/flat',
+                spread: false,
+                insertAtTheEnd: false,
+            });
             (0, eslint_file_1.addOverrideToLintConfig)(tree, projectConfig.root, {
                 files: ['*.ts', '*.js'],
                 rules: {},

package/src/utils/config.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CYPRESS_CONFIG_FILE_NAME_PATTERN = void 0;
 exports.addDefaultE2EConfig = addDefaultE2EConfig;
@@ -15,7 +48,7 @@ async function addDefaultE2EConfig(cyConfigContents, options, baseUrl) {
     if (!cyConfigContents) {
         throw new Error('The passed in cypress config file is empty!');
     }
-    const { tsquery } = await Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
+    const { tsquery } = await Promise.resolve().then(() => __importStar(require('@phenomnomnominal/tsquery')));
     const isCommonJS = tsquery.query(cyConfigContents, TS_QUERY_COMMON_JS_EXPORT_SELECTOR).length >
         0;
     const testingTypeConfig = tsquery.query(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} PropertyAssignment:has(Identifier[name="e2e"])`);
@@ -57,7 +90,7 @@ async function addDefaultCTConfig(cyConfigContents, options = {}) {
     if (!cyConfigContents) {
         throw new Error('The passed in cypress config file is empty!');
     }
-    const { tsquery } = await Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
+    const { tsquery } = await Promise.resolve().then(() => __importStar(require('@phenomnomnominal/tsquery')));
     const testingTypeConfig = tsquery.query(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} PropertyAssignment:has(Identifier[name="component"])`);
     let updatedConfigContents = cyConfigContents;
     if (testingTypeConfig.length === 0) {
@@ -94,7 +127,7 @@ async function addMountDefinition(cmpCommandFileContents) {
     if (!cmpCommandFileContents) {
         throw new Error('The passed in cypress component file is empty!');
     }
-    const { tsquery } = await Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
+    const { tsquery } = await Promise.resolve().then(() => __importStar(require('@phenomnomnominal/tsquery')));
     const hasMountCommand = tsquery.query(cmpCommandFileContents, 'CallExpression StringLiteral[value="mount"]')?.length > 0;
     if (hasMountCommand) {
         return cmpCommandFileContents;

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

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startDevServer = startDevServer;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const detectPort = require("detect-port");
+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");
@@ -86,7 +87,7 @@ async function getPortForProject(context, target, defaultPort = 4200) {
             // make sure when this check happens in parallel,
             // we don't let the same port be used by multiple projects
             do {
-                freePort = await detectPort(freePort || normalizedPortValue);
+                freePort = await (0, detect_port_1.default)(freePort || normalizedPortValue);
                 if (attemptToLockPort(freePort)) {
                     break;
                 }