@nrwl/react 14.6.0-rc.2 → 14.6.2

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [14.6.0-rc.2](https://github.com/nrwl/nx/compare/14.5.7...14.6.0-rc.2) (2022-08-30)
+## [14.6.2](https://github.com/nrwl/nx/compare/14.6.1...14.6.2) (2022-09-01)
 
 **Note:** Version bump only for package @nrwl/react

package/migrations.json

@@ -658,6 +658,31 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "14.6.0": {
+      "version": "14.6.0-beta.0",
+      "packages": {
+        "@types/react": {
+          "version": "18.0.18",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/node": {
+          "version": "18.7.14",
+          "alwaysAddToPackageJson": false
+        },
+        "@emotion/styled": {
+          "version": "11.10.4",
+          "alwaysAddToPackageJson": false
+        },
+        "@emotion/react": {
+          "version": "11.10.4",
+          "alwaysAddToPackageJson": false
+        },
+        "eslint-plugin-react": {
+          "version": "7.31.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/react",
-  "version": "14.6.0-rc.2",
+  "version": "14.6.2",
   "description": "The React plugin contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -32,14 +32,14 @@
   "dependencies": {
     "@babel/core": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
-    "@nrwl/cypress": "14.6.0-rc.2",
-    "@nrwl/devkit": "14.6.0-rc.2",
-    "@nrwl/jest": "14.6.0-rc.2",
-    "@nrwl/js": "14.6.0-rc.2",
-    "@nrwl/linter": "14.6.0-rc.2",
-    "@nrwl/storybook": "14.6.0-rc.2",
-    "@nrwl/web": "14.6.0-rc.2",
-    "@nrwl/workspace": "14.6.0-rc.2",
+    "@nrwl/cypress": "14.6.2",
+    "@nrwl/devkit": "14.6.2",
+    "@nrwl/jest": "14.6.2",
+    "@nrwl/js": "14.6.2",
+    "@nrwl/linter": "14.6.2",
+    "@nrwl/storybook": "14.6.2",
+    "@nrwl/web": "14.6.2",
+    "@nrwl/workspace": "14.6.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@svgr/webpack": "^6.1.2",
     "chalk": "4.1.0",
@@ -54,5 +54,5 @@
     "webpack": "^5.58.1",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "a04b13dfd7a4d07700e51291d750dcf63a3c0645"
+  "gitHead": "278bb5165fed42d284067092c02d90a99e26f18f"
 }

package/plugins/component-testing/index.d.ts

@@ -1,4 +1,11 @@
-import type { Configuration } from 'webpack';
+export interface ReactComponentTestingOptions {
+    /**
+     * the component testing target name.
+     * this is only when customized away from the default value of `component-test`
+     * @example 'component-test'
+     */
+    ctTargetName: string;
+}
 /**
  * React nx preset for Cypress Component Testing
  *
@@ -14,13 +21,14 @@ import type { Configuration } from 'webpack';
  *   }
  * })
  *
- * @param pathToConfig will be used to construct the output paths for videos and screenshots
+ * @param pathToConfig will be used for loading project options and to construct the output paths for videos and screenshots
+ * @param options override options
  */
-export declare function nxComponentTestingPreset(pathToConfig: string): {
+export declare function nxComponentTestingPreset(pathToConfig: string, options?: ReactComponentTestingOptions): {
     devServer: {
         readonly framework: "react";
         readonly bundler: "webpack";
-        readonly webpackConfig: Configuration;
+        readonly webpackConfig: any;
     };
     videosFolder: string;
     screenshotsFolder: string;

package/plugins/component-testing/index.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = void 0;
 const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
+const devkit_1 = require("@nrwl/devkit");
+const normalize_1 = require("@nrwl/web/src/utils/normalize");
 const web_config_1 = require("@nrwl/web/src/utils/web.config");
-const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
+const runtime_lint_utils_1 = require("@nrwl/workspace/src/utils/runtime-lint-utils");
+const fs_1 = require("fs");
+const project_graph_1 = require("nx/src/project-graph/project-graph");
+const path_1 = require("path");
+const webpack_fallback_1 = require("./webpack-fallback");
 /**
  * React nx preset for Cypress Component Testing
  *
@@ -19,149 +25,123 @@ const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin")
  *   }
  * })
  *
- * @param pathToConfig will be used to construct the output paths for videos and screenshots
+ * @param pathToConfig will be used for loading project options and to construct the output paths for videos and screenshots
+ * @param options override options
  */
-function nxComponentTestingPreset(pathToConfig) {
+function nxComponentTestingPreset(pathToConfig, options) {
+    let webpackConfig;
+    try {
+        const graph = (0, devkit_1.readCachedProjectGraph)();
+        const { targets: ctTargets, name: ctProjectName } = getConfigByPath(graph, pathToConfig);
+        const ctTargetName = (options === null || options === void 0 ? void 0 : options.ctTargetName) || 'component-test';
+        const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
+        const ctExecutorContext = createExecutorContext(graph, ctTargets, ctProjectName, ctTargetName, ctConfigurationName);
+        const ctExecutorOptions = (0, devkit_1.readTargetOptions)({
+            project: ctProjectName,
+            target: ctTargetName,
+            configuration: ctConfigurationName,
+        }, ctExecutorContext);
+        const buildTarget = ctExecutorOptions.devServerTarget;
+        if (!buildTarget) {
+            throw new Error(`Unable to find the 'devServerTarget' executor option in the '${ctTargetName}' target of the '${ctProjectName}' project`);
+        }
+        webpackConfig = buildTargetWebpack(graph, buildTarget, ctProjectName);
+    }
+    catch (e) {
+        devkit_1.logger.warn((0, devkit_1.stripIndents) `Unable to build a webpack config with the project graph. 
+      Falling back to default webpack config.`);
+        devkit_1.logger.warn(e);
+        webpackConfig = (0, webpack_fallback_1.buildBaseWebpackConfig)({
+            tsConfigPath: 'tsconfig.cy.json',
+            compiler: 'babel',
+        });
+    }
     return Object.assign(Object.assign({}, (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig)), { devServer: {
             // cypress uses string union type,
             // need to use const to prevent typing to string
             framework: 'react',
             bundler: 'webpack',
-            webpackConfig: buildBaseWebpackConfig({
-                tsConfigPath: 'tsconfig.cy.json',
-                compiler: 'babel',
-            }),
+            webpackConfig,
         } });
 }
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
-// TODO(caleb): use the webpack utils to build the config
-//  can't seem to get css modules to play nice when using it 🤔
-function buildBaseWebpackConfig({ tsConfigPath = 'tsconfig.cy.json', compiler = 'babel', }) {
-    const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
-    const config = {
-        target: 'web',
-        resolve: {
-            extensions,
-            plugins: [
-                new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
-                    configFile: tsConfigPath,
-                    extensions,
-                }),
-            ],
-        },
-        mode: 'development',
-        devtool: false,
-        output: {
-            publicPath: '/',
-            chunkFilename: '[name].bundle.js',
-        },
-        module: {
-            rules: [
-                {
-                    test: /\.(bmp|png|jpe?g|gif|webp|avif)$/,
-                    type: 'asset',
-                    parser: {
-                        dataUrlCondition: {
-                            maxSize: 10000, // 10 kB
-                        },
-                    },
-                },
-                CSS_MODULES_LOADER,
-            ],
-        },
-    };
-    if (compiler === 'swc') {
-        config.module.rules.push({
-            test: /\.([jt])sx?$/,
-            loader: require.resolve('swc-loader'),
-            exclude: /node_modules/,
-            options: {
-                jsc: {
-                    parser: {
-                        syntax: 'typescript',
-                        decorators: true,
-                        tsx: true,
-                    },
-                    transform: {
-                        react: {
-                            runtime: 'automatic',
-                        },
-                    },
-                    loose: true,
-                },
-            },
-        });
+/**
+ * apply the schema.json defaults from the @nrwl/web:webpack executor to the target options
+ */
+function withSchemaDefaults(target, context) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    const options = (0, devkit_1.readTargetOptions)(target, context);
+    (_a = options.compiler) !== null && _a !== void 0 ? _a : (options.compiler = 'babel');
+    (_b = options.deleteOutputPath) !== null && _b !== void 0 ? _b : (options.deleteOutputPath = true);
+    (_c = options.vendorChunk) !== null && _c !== void 0 ? _c : (options.vendorChunk = true);
+    (_d = options.commonChunk) !== null && _d !== void 0 ? _d : (options.commonChunk = true);
+    (_e = options.runtimeChunk) !== null && _e !== void 0 ? _e : (options.runtimeChunk = true);
+    (_f = options.sourceMap) !== null && _f !== void 0 ? _f : (options.sourceMap = true);
+    (_g = options.assets) !== null && _g !== void 0 ? _g : (options.assets = []);
+    (_h = options.scripts) !== null && _h !== void 0 ? _h : (options.scripts = []);
+    (_j = options.styles) !== null && _j !== void 0 ? _j : (options.styles = []);
+    (_k = options.budgets) !== null && _k !== void 0 ? _k : (options.budgets = []);
+    (_l = options.namedChunks) !== null && _l !== void 0 ? _l : (options.namedChunks = true);
+    (_m = options.outputHashing) !== null && _m !== void 0 ? _m : (options.outputHashing = 'none');
+    (_o = options.extractCss) !== null && _o !== void 0 ? _o : (options.extractCss = true);
+    (_p = options.memoryLimit) !== null && _p !== void 0 ? _p : (options.memoryLimit = 2048);
+    (_q = options.maxWorkers) !== null && _q !== void 0 ? _q : (options.maxWorkers = 2);
+    (_r = options.fileReplacements) !== null && _r !== void 0 ? _r : (options.fileReplacements = []);
+    (_s = options.buildLibsFromSource) !== null && _s !== void 0 ? _s : (options.buildLibsFromSource = true);
+    (_t = options.generateIndexHtml) !== null && _t !== void 0 ? _t : (options.generateIndexHtml = true);
+    return options;
+}
+function buildTargetWebpack(graph, buildTarget, componentTestingProjectName) {
+    var _a, _b;
+    const parsed = (0, devkit_1.parseTargetString)(buildTarget);
+    const buildableProjectConfig = (_a = graph.nodes[parsed.project]) === null || _a === void 0 ? void 0 : _a.data;
+    const ctProjectConfig = (_b = graph.nodes[componentTestingProjectName]) === null || _b === void 0 ? void 0 : _b.data;
+    if (!buildableProjectConfig || !ctProjectConfig) {
+        throw new Error((0, devkit_1.stripIndents) `Unable to load project configs from graph. 
+    Using build target '${buildTarget}'
+    Has build config? ${!!buildableProjectConfig}
+    Has component config? ${!!ctProjectConfig}
+    `);
     }
-    if (compiler === 'babel') {
-        config.module.rules.push({
-            test: /\.(js|jsx|mjs|ts|tsx)$/,
-            loader: require.resolve('babel-loader'),
-            options: {
-                presets: [`@nrwl/react/babel`],
-                rootMode: 'upward',
-                babelrc: true,
-            },
-        });
+    const options = (0, normalize_1.normalizeWebBuildOptions)(withSchemaDefaults(parsed, createExecutorContext(graph, buildableProjectConfig.targets, parsed.project, parsed.target, parsed.target)), devkit_1.workspaceRoot, buildableProjectConfig.sourceRoot);
+    const isScriptOptimizeOn = typeof options.optimization === 'boolean'
+        ? options.optimization
+        : options.optimization && options.optimization.scripts
+            ? options.optimization.scripts
+            : false;
+    return (0, web_config_1.getWebConfig)(devkit_1.workspaceRoot, ctProjectConfig.root, ctProjectConfig.sourceRoot, options, true, isScriptOptimizeOn, parsed.configuration);
+}
+function getConfigByPath(graph, configPath) {
+    var _a, _b, _c;
+    var _d;
+    const configFileFromWorkspaceRoot = (0, path_1.relative)(devkit_1.workspaceRoot, configPath);
+    const normalizedPathFromWorkspaceRoot = (0, fs_1.lstatSync)(configPath).isFile()
+        ? configFileFromWorkspaceRoot.replace((0, path_1.extname)(configPath), '')
+        : configFileFromWorkspaceRoot;
+    const mappedGraph = (0, runtime_lint_utils_1.mapProjectGraphFiles)(graph);
+    const componentTestingProjectName = mappedGraph.allFiles[normalizedPathFromWorkspaceRoot];
+    if (!componentTestingProjectName ||
+        !((_a = graph.nodes[componentTestingProjectName]) === null || _a === void 0 ? void 0 : _a.data)) {
+        throw new Error((0, devkit_1.stripIndents) `Unable to find the project configuration that includes ${normalizedPathFromWorkspaceRoot}. 
+      Found project name? ${componentTestingProjectName}. 
+      Graph has data? ${!!((_b = graph.nodes[componentTestingProjectName]) === null || _b === void 0 ? void 0 : _b.data)}`);
     }
-    return config;
+    // make sure name is set since it can be undefined
+    (_c = (_d = graph.nodes[componentTestingProjectName].data).name) !== null && _c !== void 0 ? _c : (_d.name = componentTestingProjectName);
+    return graph.nodes[componentTestingProjectName].data;
+}
+function createExecutorContext(graph, targets, projectName, targetName, configurationName) {
+    const projectConfigs = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
+    return {
+        cwd: process.cwd(),
+        projectGraph: graph,
+        target: targets[targetName],
+        targetName,
+        configurationName,
+        root: devkit_1.workspaceRoot,
+        isVerbose: false,
+        projectName,
+        workspace: Object.assign(Object.assign({}, (0, devkit_1.readNxJson)()), projectConfigs),
+    };
 }
-const loaderModulesOptions = {
-    modules: {
-        mode: 'local',
-        getLocalIdent: web_config_1.getCSSModuleLocalIdent,
-    },
-    importLoaders: 1,
-};
-const commonLoaders = [
-    {
-        loader: require.resolve('style-loader'),
-    },
-    {
-        loader: require.resolve('css-loader'),
-        options: loaderModulesOptions,
-    },
-];
-const CSS_MODULES_LOADER = {
-    test: /\.css$|\.scss$|\.sass$|\.less$|\.styl$/,
-    oneOf: [
-        {
-            test: /\.module\.css$/,
-            use: commonLoaders,
-        },
-        {
-            test: /\.module\.(scss|sass)$/,
-            use: [
-                ...commonLoaders,
-                {
-                    loader: require.resolve('sass-loader'),
-                    options: {
-                        implementation: require('sass'),
-                        sassOptions: {
-                            fiber: false,
-                            precision: 8,
-                        },
-                    },
-                },
-            ],
-        },
-        {
-            test: /\.module\.less$/,
-            use: [
-                ...commonLoaders,
-                {
-                    loader: require.resolve('less-loader'),
-                },
-            ],
-        },
-        {
-            test: /\.module\.styl$/,
-            use: [
-                ...commonLoaders,
-                {
-                    loader: require.resolve('stylus-loader'),
-                },
-            ],
-        },
-    ],
-};
 //# sourceMappingURL=index.js.map

package/plugins/component-testing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/index.ts"],"names":[],"mappings":";;;AAAA,yEAA2E;AAE3E,yCAasB;AAEtB,6DAAyE;AACzE,+DAA8D;AAC9D,qFAAoF;AACpF,2BAA+B;AAC/B,sEAA+F;AAC/F,+BAAyC;AACzC,yDAA4D;AAW5D;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,wBAAwB,CACtC,YAAoB,EACpB,OAAsC;IAEtC,IAAI,aAAa,CAAC;IAClB,IAAI;QACF,MAAM,KAAK,GAAG,IAAA,+BAAsB,GAAE,CAAC;QACvC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,eAAe,CACjE,KAAK,EACL,YAAY,CACb,CAAC;QACF,MAAM,YAAY,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,KAAI,gBAAgB,CAAC;QAC/D,MAAM,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;QAExE,MAAM,iBAAiB,GAAG,qBAAqB,CAC7C,KAAK,EACL,SAAS,EACT,aAAa,EACb,YAAY,EACZ,mBAAmB,CACpB,CAAC;QAEF,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC;YACE,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE,YAAY;YACpB,aAAa,EAAE,mBAAmB;SACnC,EACD,iBAAiB,CAClB,CAAC;QAEF,MAAM,WAAW,GAAG,iBAAiB,CAAC,eAAe,CAAC;QAEtD,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CACb,gEAAgE,YAAY,oBAAoB,aAAa,WAAW,CACzH,CAAC;SACH;QAED,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;KACvE;IAAC,OAAO,CAAC,EAAE;QACV,eAAM,CAAC,IAAI,CACT,IAAA,qBAAY,EAAA;8CAC4B,CACzC,CAAC;QACF,eAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,aAAa,GAAG,IAAA,yCAAsB,EAAC;YACrC,YAAY,EAAE,kBAAkB;YAChC,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;KACJ;IACD,uCACK,IAAA,oCAAmB,EAAC,YAAY,CAAC,KACpC,SAAS,EAAE;YACT,kCAAkC;YAClC,gDAAgD;YAChD,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,SAAS;YAClB,aAAa;SACL,IACV;AACJ,CAAC;AA7DD,4DA6DC;AAED;;GAEG;AACH,SAAS,kBAAkB,CACzB,MAAc,EACd,OAAwB;;IAExB,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAA4B,MAAM,EAAE,OAAO,CAAC,CAAC;IAE9E,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,OAAO,EAAC;IAC7B,MAAA,OAAO,CAAC,gBAAgB,oCAAxB,OAAO,CAAC,gBAAgB,GAAK,IAAI,EAAC;IAClC,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,YAAY,oCAApB,OAAO,CAAC,YAAY,GAAK,IAAI,EAAC;IAC9B,MAAA,OAAO,CAAC,SAAS,oCAAjB,OAAO,CAAC,SAAS,GAAK,IAAI,EAAC;IAC3B,MAAA,OAAO,CAAC,MAAM,oCAAd,OAAO,CAAC,MAAM,GAAK,EAAE,EAAC;IACtB,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;IACvB,MAAA,OAAO,CAAC,MAAM,oCAAd,OAAO,CAAC,MAAM,GAAK,EAAE,EAAC;IACtB,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;IACvB,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,aAAa,oCAArB,OAAO,CAAC,aAAa,GAAK,MAAM,EAAC;IACjC,MAAA,OAAO,CAAC,UAAU,oCAAlB,OAAO,CAAC,UAAU,GAAK,IAAI,EAAC;IAC5B,MAAA,OAAO,CAAC,WAAW,oCAAnB,OAAO,CAAC,WAAW,GAAK,IAAI,EAAC;IAC7B,MAAA,OAAO,CAAC,UAAU,oCAAlB,OAAO,CAAC,UAAU,GAAK,CAAC,EAAC;IACzB,MAAA,OAAO,CAAC,gBAAgB,oCAAxB,OAAO,CAAC,gBAAgB,GAAK,EAAE,EAAC;IAChC,MAAA,OAAO,CAAC,mBAAmB,oCAA3B,OAAO,CAAC,mBAAmB,GAAK,IAAI,EAAC;IACrC,MAAA,OAAO,CAAC,iBAAiB,oCAAzB,OAAO,CAAC,iBAAiB,GAAK,IAAI,EAAC;IACnC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,kBAAkB,CACzB,KAAmB,EACnB,WAAmB,EACnB,2BAAmC;;IAEnC,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;IAE9C,MAAM,sBAAsB,GAAG,MAAA,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,IAAI,CAAC;IACjE,MAAM,eAAe,GAAG,MAAA,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,0CAAE,IAAI,CAAC;IAEvE,IAAI,CAAC,sBAAsB,IAAI,CAAC,eAAe,EAAE;QAC/C,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA;0BACN,WAAW;wBACb,CAAC,CAAC,sBAAsB;4BACpB,CAAC,CAAC,eAAe;KACxC,CAAC,CAAC;KACJ;IAED,MAAM,OAAO,GAAG,IAAA,oCAAwB,EACtC,kBAAkB,CAChB,MAAM,EACN,qBAAqB,CACnB,KAAK,EACL,sBAAsB,CAAC,OAAO,EAC9B,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,MAAM,CACd,CACF,EACD,sBAAa,EACb,sBAAsB,CAAC,UAAW,CACnC,CAAC;IAEF,MAAM,kBAAkB,GACtB,OAAO,OAAO,CAAC,YAAY,KAAK,SAAS;QACvC,CAAC,CAAC,OAAO,CAAC,YAAY;QACtB,CAAC,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO;YACtD,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO;YAC9B,CAAC,CAAC,KAAK,CAAC;IACZ,OAAO,IAAA,yBAAY,EACjB,sBAAa,EACb,eAAe,CAAC,IAAI,EACpB,eAAe,CAAC,UAAU,EAC1B,OAAO,EACP,IAAI,EACJ,kBAAkB,EAClB,MAAM,CAAC,aAAa,CACrB,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,KAAmB,EACnB,UAAkB;;;IAElB,MAAM,2BAA2B,GAAG,IAAA,eAAQ,EAAC,sBAAa,EAAE,UAAU,CAAC,CAAC;IACxE,MAAM,+BAA+B,GAAG,IAAA,cAAS,EAAC,UAAU,CAAC,CAAC,MAAM,EAAE;QACpE,CAAC,CAAC,2BAA2B,CAAC,OAAO,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC,EAAE,EAAE,CAAC;QAC9D,CAAC,CAAC,2BAA2B,CAAC;IAEhC,MAAM,WAAW,GAAG,IAAA,yCAAoB,EAAC,KAAK,CAAC,CAAC;IAChD,MAAM,2BAA2B,GAC/B,WAAW,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;IACxD,IACE,CAAC,2BAA2B;QAC5B,CAAC,CAAA,MAAA,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,0CAAE,IAAI,CAAA,EAC/C;QACA,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,0DAA0D,+BAA+B;4BAC/E,2BAA2B;wBAC/B,CAAC,CAAC,CAAA,MAAA,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,0CAAE,IAAI,CAAA,EAAE,CACrE,CAAC;KACH;IACD,kDAAkD;IAClD,YAAA,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,IAAI,EAAC,IAAI,uCAAJ,IAAI,GAChD,2BAA2B,EAAC;IAC9B,OAAO,KAAK,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC,IAAI,CAAC;AACvD,CAAC;AAED,SAAS,qBAAqB,CAC5B,KAAmB,EACnB,OAA4C,EAC5C,WAAmB,EACnB,UAAkB,EAClB,iBAAyB;IAEzB,MAAM,cAAc,GAAG,IAAA,yDAAyC,EAAC,KAAK,CAAC,CAAC;IACxE,OAAO;QACL,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;QAClB,YAAY,EAAE,KAAK;QACnB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;QAC3B,UAAU;QACV,iBAAiB;QACjB,IAAI,EAAE,sBAAa;QACnB,SAAS,EAAE,KAAK;QAChB,WAAW;QACX,SAAS,kCACJ,IAAA,mBAAU,GAAE,GACZ,cAAc,CAClB;KACF,CAAC;AACJ,CAAC"}

package/plugins/component-testing/webpack-fallback.d.ts

@@ -0,0 +1,5 @@
+import { Configuration } from 'webpack';
+export declare function buildBaseWebpackConfig({ tsConfigPath, compiler, }: {
+    tsConfigPath: string;
+    compiler: 'swc' | 'babel';
+}): Configuration;

package/plugins/component-testing/webpack-fallback.js

@@ -0,0 +1,135 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildBaseWebpackConfig = void 0;
+const web_config_1 = require("@nrwl/web/src/utils/web.config");
+const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
+function buildBaseWebpackConfig({ tsConfigPath = 'tsconfig.cy.json', compiler = 'babel', }) {
+    const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
+    const config = {
+        target: 'web',
+        resolve: {
+            extensions,
+            plugins: [
+                new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
+                    configFile: tsConfigPath,
+                    extensions,
+                }),
+            ],
+        },
+        mode: 'development',
+        devtool: false,
+        output: {
+            publicPath: '/',
+            chunkFilename: '[name].bundle.js',
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.(bmp|png|jpe?g|gif|webp|avif)$/,
+                    type: 'asset',
+                    parser: {
+                        dataUrlCondition: {
+                            maxSize: 10000, // 10 kB
+                        },
+                    },
+                },
+                CSS_MODULES_LOADER,
+            ],
+        },
+    };
+    if (compiler === 'swc') {
+        config.module.rules.push({
+            test: /\.([jt])sx?$/,
+            loader: require.resolve('swc-loader'),
+            exclude: /node_modules/,
+            options: {
+                jsc: {
+                    parser: {
+                        syntax: 'typescript',
+                        decorators: true,
+                        tsx: true,
+                    },
+                    transform: {
+                        react: {
+                            runtime: 'automatic',
+                        },
+                    },
+                    loose: true,
+                },
+            },
+        });
+    }
+    if (compiler === 'babel') {
+        config.module.rules.push({
+            test: /\.(js|jsx|mjs|ts|tsx)$/,
+            loader: require.resolve('babel-loader'),
+            options: {
+                presets: [`@nrwl/react/babel`],
+                rootMode: 'upward',
+                babelrc: true,
+            },
+        });
+    }
+    return config;
+}
+exports.buildBaseWebpackConfig = buildBaseWebpackConfig;
+const loaderModulesOptions = {
+    modules: {
+        mode: 'local',
+        getLocalIdent: web_config_1.getCSSModuleLocalIdent,
+    },
+    importLoaders: 1,
+};
+const commonLoaders = [
+    {
+        loader: require.resolve('style-loader'),
+    },
+    {
+        loader: require.resolve('css-loader'),
+        options: loaderModulesOptions,
+    },
+];
+const CSS_MODULES_LOADER = {
+    test: /\.css$|\.scss$|\.sass$|\.less$|\.styl$/,
+    oneOf: [
+        {
+            test: /\.module\.css$/,
+            use: commonLoaders,
+        },
+        {
+            test: /\.module\.(scss|sass)$/,
+            use: [
+                ...commonLoaders,
+                {
+                    loader: require.resolve('sass-loader'),
+                    options: {
+                        implementation: require('sass'),
+                        sassOptions: {
+                            fiber: false,
+                            precision: 8,
+                        },
+                    },
+                },
+            ],
+        },
+        {
+            test: /\.module\.less$/,
+            use: [
+                ...commonLoaders,
+                {
+                    loader: require.resolve('less-loader'),
+                },
+            ],
+        },
+        {
+            test: /\.module\.styl$/,
+            use: [
+                ...commonLoaders,
+                {
+                    loader: require.resolve('stylus-loader'),
+                },
+            ],
+        },
+    ],
+};
+//# sourceMappingURL=webpack-fallback.js.map

package/plugins/component-testing/webpack-fallback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webpack-fallback.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/component-testing/webpack-fallback.ts"],"names":[],"mappings":"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"}

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

@@ -25,6 +25,9 @@ function generateSpecsForComponents(tree, filePath) {
     const componentDir = (0, path_1.dirname)(filePath);
     const ext = (0, path_1.extname)(filePath);
     const fileName = (0, path_1.basename)(filePath, ext);
+    if (tree.exists((0, devkit_1.joinPathFragments)(componentDir, `${fileName}.cy${ext}`))) {
+        return;
+    }
     const defaultExport = (0, ast_utils_1.getComponentNode)(sourceFile);
     if (cmpNodes === null || cmpNodes === void 0 ? void 0 : cmpNodes.length) {
         const components = cmpNodes.map((cmp) => {

package/src/generators/component-test/component-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-test.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-test.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"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"}

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nrwl/devkit';
-import { CypressComponentConfigurationSchema } from './schema';
+import { CypressComponentConfigurationSchema } from './schema.d';
 /**
  * This is for using cypresses own Component testing, if you want to use test
  * storybook components then use componentCypressGenerator instead.

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

@@ -4,11 +4,8 @@ exports.cypressComponentConfigGenerator = void 0;
 const tslib_1 = require("tslib");
 const cypress_1 = require("@nrwl/cypress");
 const devkit_1 = require("@nrwl/devkit");
-const ts = require("typescript");
-const ast_utils_1 = require("../../utils/ast-utils");
-const component_test_1 = require("../component-test/component-test");
-const allowedFileExt = new RegExp(/\.[jt]sx?/g);
-const isSpecFile = new RegExp(/(spec|test)\./g);
+const add_files_1 = require("./lib/add-files");
+const update_configs_1 = require("./lib/update-configs");
 /**
  * This is for using cypresses own Component testing, if you want to use test
  * storybook components then use componentCypressGenerator instead.
@@ -21,8 +18,9 @@ function cypressComponentConfigGenerator(tree, options) {
             project: options.project,
             skipFormat: true,
         });
-        addFiles(tree, projectConfig, options);
-        updateTsConfig(tree, projectConfig);
+        yield (0, update_configs_1.updateProjectConfig)(tree, options);
+        (0, add_files_1.addFiles)(tree, projectConfig, options);
+        (0, update_configs_1.updateTsConfig)(tree, projectConfig);
         if (options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
@@ -32,77 +30,5 @@ function cypressComponentConfigGenerator(tree, options) {
     });
 }
 exports.cypressComponentConfigGenerator = cypressComponentConfigGenerator;
-function addFiles(tree, projectConfig, options) {
-    const cypressConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
-    if (tree.exists(cypressConfigPath)) {
-        tree.delete(cypressConfigPath);
-    }
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectConfig.root, {
-        tpl: '',
-    });
-    if (options.generateTests) {
-        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
-            if (isComponent(tree, filePath)) {
-                (0, component_test_1.default)(tree, {
-                    project: options.project,
-                    componentPath: filePath,
-                });
-            }
-        });
-    }
-}
-function updateTsConfig(tree, projectConfig) {
-    const tsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'library'
-        ? 'tsconfig.lib.json'
-        : 'tsconfig.app.json');
-    if (tree.exists(tsConfigPath)) {
-        (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
-            const excluded = new Set([
-                ...(json.exclude || []),
-                'cypress/**/*',
-                'cypress.config.ts',
-                '**/*.cy.ts',
-                '**/*.cy.js',
-                '**/*.cy.tsx',
-                '**/*.cy.jsx',
-            ]);
-            json.exclude = Array.from(excluded);
-            return json;
-        });
-    }
-    const projectBaseTsConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
-    if (tree.exists(projectBaseTsConfig)) {
-        (0, devkit_1.updateJson)(tree, projectBaseTsConfig, (json) => {
-            if (json.references) {
-                const hasCyTsConfig = json.references.some((r) => r.path === './tsconfig.cy.json');
-                if (!hasCyTsConfig) {
-                    json.references.push({ path: './tsconfig.cy.json' });
-                }
-            }
-            else {
-                const excluded = new Set([
-                    ...(json.exclude || []),
-                    'cypress/**/*',
-                    'cypress.config.ts',
-                    '**/*.cy.ts',
-                    '**/*.cy.js',
-                    '**/*.cy.tsx',
-                    '**/*.cy.jsx',
-                ]);
-                json.exclude = Array.from(excluded);
-            }
-            return json;
-        });
-    }
-}
-function isComponent(tree, filePath) {
-    if (isSpecFile.test(filePath) || !allowedFileExt.test(filePath)) {
-        return false;
-    }
-    const content = tree.read(filePath, 'utf-8');
-    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
-    const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
-    return !!cmpDeclaration;
-}
 exports.default = cypressComponentConfigGenerator;
 //# sourceMappingURL=cypress-component-configuration.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AACxD,yCAA2E;AAC3E,+CAA2C;AAC3C,yDAA2E;AAG3E;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;YACtD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,oCAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QACvC,IAAA,+BAAc,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,WAAW,EAAE,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AApBD,0EAoBC;AAED,kBAAe,+BAA+B,CAAC"}

package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__

@@ -2,5 +2,5 @@ import { defineConfig } from 'cypress';
 import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing';
 
 export default defineConfig({
-  component: nxComponentTestingPreset(__dirname),
+  component: nxComponentTestingPreset(__filename),
 });

package/src/generators/cypress-component-configuration/lib/add-files.d.ts

@@ -0,0 +1,3 @@
+import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import { CypressComponentConfigurationSchema } from '../schema';
+export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema): void;

package/src/generators/cypress-component-configuration/lib/add-files.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addFiles = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const ts = require("typescript");
+const ast_utils_1 = require("../../../utils/ast-utils");
+const component_test_1 = require("../../component-test/component-test");
+const allowedFileExt = new RegExp(/\.[jt]sx?/g);
+const isSpecFile = new RegExp(/(spec|test)\./g);
+function addFiles(tree, projectConfig, options) {
+    const cypressConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
+    if (tree.exists(cypressConfigPath)) {
+        tree.delete(cypressConfigPath);
+    }
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), projectConfig.root, {
+        tpl: '',
+    });
+    if (options.generateTests) {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
+            if (isComponent(tree, filePath)) {
+                (0, component_test_1.componentTestGenerator)(tree, {
+                    project: options.project,
+                    componentPath: filePath,
+                });
+            }
+        });
+    }
+}
+exports.addFiles = addFiles;
+function isComponent(tree, filePath) {
+    if (isSpecFile.test(filePath) || !allowedFileExt.test(filePath)) {
+        return false;
+    }
+    const content = tree.read(filePath, 'utf-8');
+    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
+    const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
+    return !!cmpDeclaration;
+}
+//# sourceMappingURL=add-files.js.map

package/src/generators/cypress-component-configuration/lib/add-files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,iCAAiC;AACjC,wDAA4D;AAC5D,wEAA6E;AAG7E,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC;AAChD,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAEhD,SAAgB,QAAQ,CACtB,IAAU,EACV,aAAmC,EACnC,OAA4C;IAE5C,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAClC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;KAChC;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,aAAa,CAAC,IAAI,EAClB;QACE,GAAG,EAAE,EAAE;KACR,CACF,CAAC;IAEF,IAAI,OAAO,CAAC,aAAa,EAAE;QACzB,IAAA,6BAAoB,EAAC,IAAI,EAAE,aAAa,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;YAChE,IAAI,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;gBAC/B,IAAA,uCAAsB,EAAC,IAAI,EAAE;oBAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,aAAa,EAAE,QAAQ;iBACxB,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAhCD,4BAgCC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,QAAgB;IAC/C,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAC/D,OAAO,KAAK,CAAC;KACd;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,QAAQ,EACR,OAAO,EACP,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,4BAAgB,EAAC,UAAU,CAAC,CAAC;IACpD,OAAO,CAAC,CAAC,cAAc,CAAC;AAC1B,CAAC"}

package/src/generators/cypress-component-configuration/lib/update-configs.d.ts

@@ -0,0 +1,4 @@
+import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import { CypressComponentConfigurationSchema } from '../schema';
+export declare function updateTsConfig(tree: Tree, projectConfig: ProjectConfiguration): void;
+export declare function updateProjectConfig(tree: Tree, options: CypressComponentConfigurationSchema): Promise<void>;

package/src/generators/cypress-component-configuration/lib/update-configs.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateProjectConfig = exports.updateTsConfig = void 0;
+const tslib_1 = require("tslib");
+const find_target_options_1 = require("@nrwl/cypress/src/utils/find-target-options");
+const devkit_1 = require("@nrwl/devkit");
+function updateTsConfig(tree, projectConfig) {
+    const tsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, projectConfig.projectType === 'library'
+        ? 'tsconfig.lib.json'
+        : 'tsconfig.app.json');
+    if (tree.exists(tsConfigPath)) {
+        (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+            const excluded = new Set([
+                ...(json.exclude || []),
+                'cypress/**/*',
+                'cypress.config.ts',
+                '**/*.cy.ts',
+                '**/*.cy.js',
+                '**/*.cy.tsx',
+                '**/*.cy.jsx',
+            ]);
+            json.exclude = Array.from(excluded);
+            return json;
+        });
+    }
+    const projectBaseTsConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
+    if (tree.exists(projectBaseTsConfig)) {
+        (0, devkit_1.updateJson)(tree, projectBaseTsConfig, (json) => {
+            if (json.references) {
+                const hasCyTsConfig = json.references.some((r) => r.path === './tsconfig.cy.json');
+                if (!hasCyTsConfig) {
+                    json.references.push({ path: './tsconfig.cy.json' });
+                }
+            }
+            else {
+                const excluded = new Set([
+                    ...(json.exclude || []),
+                    'cypress/**/*',
+                    'cypress.config.ts',
+                    '**/*.cy.ts',
+                    '**/*.cy.js',
+                    '**/*.cy.tsx',
+                    '**/*.cy.jsx',
+                ]);
+                json.exclude = Array.from(excluded);
+            }
+            return json;
+        });
+    }
+}
+exports.updateTsConfig = updateTsConfig;
+function updateProjectConfig(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const found = yield (0, find_target_options_1.findBuildConfig)(tree, {
+            project: options.project,
+            buildTarget: options.buildTarget,
+            validExecutorNames: new Set(['@nrwl/web:webpack']),
+        });
+        assetValidConfig(found.config);
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+        projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { devServerTarget: found.target, skipServe: true });
+        (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
+    });
+}
+exports.updateProjectConfig = updateProjectConfig;
+function assetValidConfig(config) {
+    if (!config) {
+        throw new Error('Unable to find a valid build configuration. Try passing in a target for a React app. --build-target=<project>:<target>[:<configuration>]');
+    }
+}
+//# sourceMappingURL=update-configs.js.map

package/src/generators/cypress-component-configuration/lib/update-configs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":"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"}

package/src/generators/cypress-component-configuration/schema.d.ts

@@ -1,5 +1,6 @@
 export interface CypressComponentConfigurationSchema {
-    project: string;
-    generateTests: boolean;
-    skipFormat?: boolean;
+  project: string;
+  generateTests: boolean;
+  skipFormat?: boolean;
+  buildTarget?: string;
 }

package/src/generators/cypress-component-configuration/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactCypressComponentTestConfiguration",
   "title": "Add Cypress component testing",
@@ -24,6 +24,11 @@
       },
       "x-prompt": "What project should we add Cypress component testing to?"
     },
+    "buildTarget": {
+      "type": "string",
+      "description": "A build target used to configure Cypress component testing in the format of `project:target[:configuration]`. The build target should be from a React app. If not provided we will try to infer it from your projects usage.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:\\S+)?$"
+    },
     "generateTests": {
       "type": "boolean",
       "description": "Generate default component tests for existing components in the project",

package/src/utils/versions.d.ts

@@ -2,14 +2,14 @@ export declare const nxVersion: any;
 export declare const reactVersion = "18.2.0";
 export declare const reactDomVersion = "18.2.0";
 export declare const reactIsVersion = "18.2.0";
-export declare const typesReactVersion = "18.0.17";
+export declare const typesReactVersion = "18.0.18";
 export declare const typesReactDomVersion = "18.0.6";
 export declare const typesReactIsVersion = "17.0.3";
-export declare const typesNodeVersion = "18.7.9";
+export declare const typesNodeVersion = "18.7.14";
 export declare const styledComponentsVersion = "5.3.5";
 export declare const typesStyledComponentsVersion = "5.1.26";
-export declare const emotionStyledVersion = "11.10.0";
-export declare const emotionReactVersion = "11.10.0";
+export declare const emotionStyledVersion = "11.10.4";
+export declare const emotionReactVersion = "11.10.4";
 export declare const emotionBabelPlugin = "11.10.2";
 export declare const styledJsxVersion = "5.0.4";
 export declare const reactRouterDomVersion = "6.3.0";
@@ -20,7 +20,7 @@ export declare const reactReduxVersion = "8.0.2";
 export declare const reactTestRendererVersion = "18.2.0";
 export declare const eslintPluginImportVersion = "2.26.0";
 export declare const eslintPluginJsxA11yVersion = "6.6.1";
-export declare const eslintPluginReactVersion = "7.30.1";
+export declare const eslintPluginReactVersion = "7.31.1";
 export declare const eslintPluginReactHooksVersion = "4.6.0";
 export declare const babelPluginStyledComponentsVersion = "1.10.7";
 export declare const tsLibVersion = "^2.3.0";

package/src/utils/versions.js

@@ -5,14 +5,14 @@ exports.nxVersion = require('../../package.json').version;
 exports.reactVersion = '18.2.0';
 exports.reactDomVersion = '18.2.0';
 exports.reactIsVersion = '18.2.0';
-exports.typesReactVersion = '18.0.17';
+exports.typesReactVersion = '18.0.18';
 exports.typesReactDomVersion = '18.0.6';
 exports.typesReactIsVersion = '17.0.3';
-exports.typesNodeVersion = '18.7.9';
+exports.typesNodeVersion = '18.7.14';
 exports.styledComponentsVersion = '5.3.5';
 exports.typesStyledComponentsVersion = '5.1.26';
-exports.emotionStyledVersion = '11.10.0';
-exports.emotionReactVersion = '11.10.0';
+exports.emotionStyledVersion = '11.10.4';
+exports.emotionReactVersion = '11.10.4';
 exports.emotionBabelPlugin = '11.10.2';
 // WARNING: This needs to be in sync with Next.js' dependency or else there might be issues.
 exports.styledJsxVersion = '5.0.4';
@@ -24,7 +24,7 @@ exports.reactReduxVersion = '8.0.2';
 exports.reactTestRendererVersion = '18.2.0';
 exports.eslintPluginImportVersion = '2.26.0';
 exports.eslintPluginJsxA11yVersion = '6.6.1';
-exports.eslintPluginReactVersion = '7.30.1';
+exports.eslintPluginReactVersion = '7.31.1';
 exports.eslintPluginReactHooksVersion = '4.6.0';
 exports.babelPluginStyledComponentsVersion = '1.10.7';
 exports.tsLibVersion = '^2.3.0';

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAE5B,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AAExC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAE5C,4FAA4F;AAC/E,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAE3B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAErC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AAEtC,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,iBAAiB,GAAG,OAAO,CAAC;AAC5B,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AAEpC,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,6BAA6B,GAAG,OAAO,CAAC;AAExC,QAAA,kCAAkC,GAAG,QAAQ,CAAC;AAE9C,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAC7B,QAAA,mBAAmB,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAE/B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAE7B,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AAExC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAE5C,4FAA4F;AAC/E,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAE3B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AAErC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AAEtC,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,iBAAiB,GAAG,OAAO,CAAC;AAC5B,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AAEpC,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,6BAA6B,GAAG,OAAO,CAAC;AAExC,QAAA,kCAAkC,GAAG,QAAQ,CAAC;AAE9C,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,kBAAkB,GAAG,OAAO,CAAC;AAC7B,QAAA,mBAAmB,GAAG,QAAQ,CAAC"}

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

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=schema.js.map

package/src/generators/cypress-component-configuration/schema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/schema.ts"],"names":[],"mappings":""}