@nrwl/cypress 15.9.2 → 15.9.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/cypress",
-  "version": "15.9.2",
+  "version": "15.9.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": {
@@ -34,10 +34,10 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/devkit": "15.9.2",
-    "@nrwl/js": "15.9.2",
-    "@nrwl/linter": "15.9.2",
-    "@nrwl/workspace": "15.9.2",
+    "@nrwl/devkit": "15.9.3",
+    "@nrwl/js": "15.9.3",
+    "@nrwl/linter": "15.9.3",
+    "@nrwl/workspace": "15.9.3",
     "@phenomnomnominal/tsquery": "4.1.1",
     "detect-port": "^1.5.1",
     "dotenv": "~10.0.0",
@@ -55,5 +55,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "c60dd8b2f03545ba7d9bbf58c10ac7b49f7f3e92"
+  "gitHead": "80792b60b9de4322bbd71cd4601d03ab0b294c4e"
 }

package/src/plugins/preprocessor-vite.d.ts

@@ -1,15 +1,32 @@
+/**
+ * https://github.com/mammadataei/cypress-vite
+ *
+ * MIT License
+ *
+ * Copyright (c) 2022 Mohammad Ataei
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ **/
 type CypressPreprocessor = (file: Record<string, any>) => string | Promise<string>;
 /**
- * Cypress preprocessor for running e2e tests using vite.
- *
- * @param {string} userConfigPath
- * @example
- * setupNodeEvents(on) {
- *   on(
- *     'file:preprocessor',
- *     vitePreprocessor(path.resolve(__dirname, './vite.config.ts')),
- *   )
- * },
+ * Use Vite as a file preprocess for Cypress test files.
+ * This preprocessor shouldn't be used directly.
+ * Instead, use the nxE2EPreset(__filename, { bundler: 'vite' }) function instead.
  */
 declare function vitePreprocessor(userConfigPath?: string): CypressPreprocessor;
 export default vitePreprocessor;

package/src/plugins/preprocessor-vite.js

@@ -1,25 +1,45 @@
 "use strict";
-// Adapted from: https://github.com/mammadataei/cypress-vite
+/**
+ * https://github.com/mammadataei/cypress-vite
+ *
+ * MIT License
+ *
+ * Copyright (c) 2022 Mohammad Ataei
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ **/
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const path = require("path");
+const path_1 = require("path");
+const cache = new Map();
 /**
- * Cypress preprocessor for running e2e tests using vite.
- *
- * @param {string} userConfigPath
- * @example
- * setupNodeEvents(on) {
- *   on(
- *     'file:preprocessor',
- *     vitePreprocessor(path.resolve(__dirname, './vite.config.ts')),
- *   )
- * },
+ * Use Vite as a file preprocess for Cypress test files.
+ * This preprocessor shouldn't be used directly.
+ * Instead, use the nxE2EPreset(__filename, { bundler: 'vite' }) function instead.
  */
 function vitePreprocessor(userConfigPath) {
     return (file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { outputPath, filePath, shouldWatch } = file;
-        const fileName = path.basename(outputPath);
-        const filenameWithoutExtension = path.basename(outputPath, path.extname(outputPath));
+        if (cache.has(filePath)) {
+            return cache.get(filePath);
+        }
+        const fileName = (0, path_1.basename)(outputPath);
+        const filenameWithoutExtension = (0, path_1.basename)(outputPath, (0, path_1.extname)(outputPath));
         const defaultConfig = {
             logLevel: 'silent',
             define: {
@@ -28,7 +48,7 @@ function vitePreprocessor(userConfigPath) {
             build: {
                 emptyOutDir: false,
                 minify: false,
-                outDir: path.dirname(outputPath),
+                outDir: (0, path_1.dirname)(outputPath),
                 sourcemap: true,
                 write: true,
                 watch: getWatcherConfig(shouldWatch),
@@ -40,29 +60,37 @@ function vitePreprocessor(userConfigPath) {
                 },
             },
         };
+        cache.set(filePath, outputPath);
         const { build } = require('vite');
-        const watcher = yield build(Object.assign({ configFile: userConfigPath }, defaultConfig));
-        if (shouldWatch && isWatcher(watcher)) {
-            watcher.on('event', (event) => {
-                if (event.code === 'END') {
-                    file.emit('rerun');
-                }
-                if (event.code === 'ERROR') {
-                    console.error(event);
-                }
-            });
-            file.on('close', () => {
-                watcher.close();
-            });
-        }
-        return outputPath;
+        const watcher = (yield build(Object.assign({ configFile: userConfigPath }, defaultConfig)));
+        return new Promise((resolve, reject) => {
+            if (shouldWatch && isWatcher(watcher)) {
+                watcher.on('event', (event) => {
+                    if (event.code === 'END') {
+                        resolve(outputPath);
+                        file.emit('rerun');
+                    }
+                    if (event.code === 'ERROR') {
+                        console.error(event);
+                        reject(new Error(event.error.message));
+                    }
+                });
+                file.on('close', () => {
+                    cache.delete(filePath);
+                    watcher.close();
+                });
+            }
+            else {
+                resolve(outputPath);
+            }
+        });
     });
 }
+function isWatcher(maybeWatcher) {
+    return maybeWatcher.on !== undefined;
+}
 function getWatcherConfig(shouldWatch) {
     return shouldWatch ? {} : null;
 }
-function isWatcher(watcher) {
-    return watcher.on !== undefined;
-}
 exports.default = vitePreprocessor;
 //# sourceMappingURL=preprocessor-vite.js.map

package/src/plugins/preprocessor-vite.js.map

@@ -1 +1 @@
-{"version":3,"file":"preprocessor-vite.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/preprocessor-vite.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;AAE5D,6BAA6B;AAO7B;;;;;;;;;;;GAWG;AACH,SAAS,gBAAgB,CAAC,cAAuB;IAC/C,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAEnD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,wBAAwB,GAAG,IAAI,CAAC,QAAQ,CAC5C,UAAU,EACV,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CACzB,CAAC;QAEF,MAAM,aAAa,GAAG;YACpB,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE;gBACN,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;aAC7D;YACD,KAAK,EAAE;gBACL,WAAW,EAAE,KAAK;gBAClB,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBAChC,SAAS,EAAE,IAAI;gBACf,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,gBAAgB,CAAC,WAAW,CAAC;gBACpC,GAAG,EAAE;oBACH,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ;oBACxB,OAAO,EAAE,CAAC,KAAK,CAAC;oBAChB,IAAI,EAAE,wBAAwB;iBAC/B;aACF;SACF,CAAC;QACF,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAElC,MAAM,OAAO,GAAG,MAAM,KAAK,iBACzB,UAAU,EAAE,cAAc,IACvB,aAAa,EAChB,CAAC;QAEH,IAAI,WAAW,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE;YACrC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE;oBACxB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACpB;gBAED,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;oBAC1B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACtB;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACpB,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,CAAC;IACpB,CAAC,CAAA,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAoB;IAC5C,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACjC,CAAC;AAID,SAAS,SAAS,CAAC,OAAoB;IACrC,OAAQ,OAAyB,CAAC,EAAE,KAAK,SAAS,CAAC;AACrD,CAAC;AAED,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"preprocessor-vite.js","sourceRoot":"","sources":["../../../../../packages/cypress/src/plugins/preprocessor-vite.ts"],"names":[],"mappings":"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"}

package/src/utils/ct-helpers.d.ts

@@ -8,7 +8,7 @@ export declare const CY_FILE_MATCHER: RegExp;
  */
 export declare function getTempTailwindPath(context: ExecutorContext): string;
 /**
- * Checks if the childProjectName is a decendent of the parentProjectName
+ * Checks if the childProjectName is a descendent of the parentProjectName
  * in the project graph
  **/
 export declare function isCtProjectUsingBuildProject(graph: ProjectGraph, parentProjectName: string, childProjectName: string): boolean;

package/src/utils/ct-helpers.js

@@ -28,7 +28,7 @@ function getTempTailwindPath(context) {
 }
 exports.getTempTailwindPath = getTempTailwindPath;
 /**
- * Checks if the childProjectName is a decendent of the parentProjectName
+ * Checks if the childProjectName is a descendent of the parentProjectName
  * in the project graph
  **/
 function isCtProjectUsingBuildProject(graph, parentProjectName, childProjectName) {