@nrwl/react 14.8.7 → 14.9.0-beta.1

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

@@ -14,13 +14,15 @@
         "$source": "projectName",
         "index": 0
       },
-      "x-prompt": "What's name of the project for which to generate tests?"
+      "x-prompt": "What's name of the project for which to generate tests?",
+      "x-priority": "important"
     },
     "componentPath": {
       "type": "string",
       "description": "Relative path to the component file from the library root?",
       "examples": ["lib/components"],
-      "x-prompt": "What's path of the component relative to the project's lib root for which to generate a test?"
+      "x-prompt": "What's path of the component relative to the project's lib root for which to generate a test?",
+      "x-priority": "important"
     },
     "js": {
       "type": "boolean",

package/src/generators/component-story/component-story.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nrwl/devkit';
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 export interface CreateComponentStoriesFileSchema {
     project: string;
     componentPath: string;

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

@@ -3,10 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentStorySchematic = exports.componentStoryGenerator = exports.findPropsAndGenerateFile = exports.createComponentStoriesFile = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const ts = require("typescript");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
 function createComponentStoriesFile(host, { project, componentPath }) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const proj = (0, devkit_1.getProjects)(host).get(project);
     const sourceRoot = proj.sourceRoot;
     const componentFilePath = (0, devkit_1.joinPathFragments)(sourceRoot, componentPath);
@@ -29,7 +33,7 @@ function createComponentStoriesFile(host, { project, componentPath }) {
     if (contents === null) {
         throw new Error(`Failed to read ${componentFilePath}`);
     }
-    const sourceFile = ts.createSourceFile(componentFilePath, contents, ts.ScriptTarget.Latest, true);
+    const sourceFile = tsModule.createSourceFile(componentFilePath, contents, tsModule.ScriptTarget.Latest, true);
     const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
     if (!cmpDeclaration) {
         const componentNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);

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

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

package/src/generators/component-story/files/__componentFileName__.stories.__fileExt__

@@ -1,4 +1,4 @@
-<% if ( !isPlainJs ) { %>import { ComponentStory, ComponentMeta } from '@storybook/react';<% } %>
+<% if ( !isPlainJs ) { %>import type { Meta } from '@storybook/react';<% } %>
 import<% if ( !isPlainJs ) { %> { <% } %> <%= componentName %> <% if ( !isPlainJs ) { %> } <% } %> from './<%= componentImportFileName %>';
 
 <% if ( isPlainJs ) { %>
@@ -14,7 +14,7 @@ export default {
 
 
 <% if ( !isPlainJs ) { %>
-const Story: ComponentMeta<typeof <%= componentName %>> = {
+const Story: Meta<typeof <%= componentName %>> = {
   component: <%= componentName %>,
   title: '<%= componentName %>',<% if ( argTypes && argTypes.length > 0 ) { %> 
   argTypes: {<% for (let argType of argTypes) { %>
@@ -25,9 +25,8 @@ const Story: ComponentMeta<typeof <%= componentName %>> = {
 export default Story;
 <% } %>
 
-const Template<% if ( !isPlainJs ) { %>: ComponentStory< typeof <%= componentName %> ><% } %> = (args) => <<%= componentName %> {...args} />;
-
-export const Primary = Template.bind({})
-Primary.args = {<% for (let prop of props) { %>
+export const Primary = {
+  args: {<% for (let prop of props) { %>
     <%= prop.name %>:  <%- prop.defaultValue %>,<% } %>
-}
+  },
+};

package/src/generators/component-story/schema.json

@@ -15,13 +15,15 @@
         "$source": "projectName",
         "index": 0
       },
-      "x-prompt": "What's name of the project where the component lives?"
+      "x-prompt": "What's name of the project where the component lives?",
+      "x-priority": "important"
     },
     "componentPath": {
       "type": "string",
       "description": "Relative path to the component file from the library root.",
       "examples": ["lib/components"],
-      "x-prompt": "What's path of the component relative to the project's lib root?"
+      "x-prompt": "What's path of the component relative to the project's lib root?",
+      "x-priority": "important"
     }
   },
   "required": ["project", "componentPath"]

package/src/generators/component-test/component-test.d.ts

@@ -1,4 +1,4 @@
 import { Tree } from '@nrwl/devkit';
 import { ComponentTestSchema } from './schema';
-export declare function componentTestGenerator(tree: Tree, options: ComponentTestSchema): void;
+export declare function componentTestGenerator(tree: Tree, options: ComponentTestSchema): Promise<void>;
 export default componentTestGenerator;

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

@@ -1,26 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentTestGenerator = void 0;
-const cypress_version_1 = require("@nrwl/cypress/src/utils/cypress-version");
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
-const ts = require("typescript");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
+const versions_1 = require("../../utils/versions");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
 function componentTestGenerator(tree, options) {
-    (0, cypress_version_1.assertMinimumCypressVersion)(10);
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const normalizedPath = options.componentPath.startsWith(projectConfig.sourceRoot)
-        ? (0, path_1.relative)(projectConfig.sourceRoot, options.componentPath)
-        : options.componentPath;
-    const componentPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, normalizedPath);
-    if (tree.exists(componentPath)) {
-        generateSpecsForComponents(tree, componentPath);
-    }
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
+        const { assertMinimumCypressVersion } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/utils/cypress-version'));
+        assertMinimumCypressVersion(10);
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+        const normalizedPath = options.componentPath.startsWith(projectConfig.sourceRoot)
+            ? (0, path_1.relative)(projectConfig.sourceRoot, options.componentPath)
+            : options.componentPath;
+        const componentPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, normalizedPath);
+        if (tree.exists(componentPath)) {
+            generateSpecsForComponents(tree, componentPath);
+        }
+    });
 }
 exports.componentTestGenerator = componentTestGenerator;
 function generateSpecsForComponents(tree, filePath) {
-    const sourceFile = ts.createSourceFile(filePath, tree.read(filePath, 'utf-8'), ts.ScriptTarget.Latest, true);
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const sourceFile = tsModule.createSourceFile(filePath, tree.read(filePath, 'utf-8'), tsModule.ScriptTarget.Latest, true);
     const cmpNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);
     const componentDir = (0, path_1.dirname)(filePath);
     const ext = (0, path_1.extname)(filePath);

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":";;;AAAA,6EAAsF;AACtF,yCAKsB;AACtB,+BAA4D;AAC5D,iCAAiC;AACjC,qDAG+B;AAC/B,iEAAsE;AAGtE,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA4B;IAE5B,IAAA,6CAA2B,EAAC,EAAE,CAAC,CAAC;IAEhC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEtE,MAAM,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,CACrD,aAAa,CAAC,UAAU,CACzB;QACC,CAAC,CAAC,IAAA,eAAQ,EAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,aAAa,CAAC;QAC3D,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;IAE1B,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,aAAa,CAAC,UAAU,EACxB,cAAc,CACf,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC9B,0BAA0B,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;KACjD;AACH,CAAC;AAtBD,wDAsBC;AAED,SAAS,0BAA0B,CAAC,IAAU,EAAE,QAAgB;IAC9D,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,QAAQ,EACR,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAC5B,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,QAAQ,GAAG,IAAA,wCAA4B,EAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IACvC,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAEzC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,YAAY,EAAE,GAAG,QAAQ,MAAM,GAAG,EAAE,CAAC,CAAC,EAAE;QACxE,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAA,4BAAgB,EAAC,UAAU,CAAC,CAAC;IAEnD,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAE;QACpB,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,MAAM,QAAQ,GAAG,IAAA,yCAAuB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAC1D,MAAM,eAAe,GAAG,aAAa;gBACnC,CAAC,CAAE,aAAqB,CAAC,IAAI,CAAC,IAAI,KAAM,GAAW,CAAC,IAAI,CAAC,IAAI;gBAC7D,CAAC,CAAC,KAAK,CAAC;YACV,OAAO;gBACL,eAAe;gBACf,KAAK,EAAE,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBAChD,IAAI,EAAG,GAAW,CAAC,IAAI,CAAC,IAAc;gBACtC,QAAQ,EAAE,QAAQ,CAAC,aAAa;aACjC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,UAAU;aAC5B,MAAM,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;YACvB,IAAI,GAAG,CAAC,QAAQ,EAAE;gBAChB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aAC5B;YACD,IAAI,GAAG,CAAC,eAAe,EAAE;gBACvB,OAAO,OAAO,CAAC;aAChB;YAED,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACvB,OAAO,OAAO,CAAC;QACjB,CAAC,EAAE,EAAE,CAAC;aACL,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,MAAM,oBAAoB,GACxB,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,YAAY,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAEzD,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE;YACvE,QAAQ;YACR,UAAU;YACV,eAAe,EAAE,aAAa;gBAC5B,CAAC,CAAC,UACG,aAAqB,CAAC,IAAI,CAAC,IAC9B,GAAG,oBAAoB,YAAY,QAAQ,GAAG;gBAChD,CAAC,CAAC,YAAY,YAAY,cAAc,QAAQ,GAAG;YACrD,GAAG;SACJ,CAAC,CAAC;KACJ;AACH,CAAC;AAED,kBAAe,sBAAsB,CAAC"}
+{"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/component-test/files/__fileName__.cy__ext__

@@ -1,5 +1,4 @@
 import * as React from 'react'
-import { mount } from 'cypress/react'
 <%- importStatement %>
 
 <% for (let cmp of components) { %>
@@ -13,10 +12,10 @@ describe(<%= cmp.name %>.name, () => {<% if (cmp.typeName) { %>
   })
 
   it('renders', () => {
-    mount(<<%= cmp.name %> {...props}/>)
+    cy.mount(<<%= cmp.name %> {...props}/>)
   })<% } else { %>
   it('renders', () => {
-    mount(<<%= cmp.name %> />)
+    cy.mount(<<%= cmp.name %> />)
   })<% } %>
 })
 <% } %>

package/src/generators/component-test/schema.json

@@ -16,13 +16,16 @@
       "type": "string",
       "description": "The name of the project the component is apart of",
       "x-dropdown": "projects",
-      "x-prompt": "What project is this component apart of?"
+      "x-prompt": "What project is this component apart of?",
+      "x-priority": "important"
     },
     "componentPath": {
       "type": "string",
       "description": "Path to component, from the project source root",
-      "x-prompt": "What is the path to the component?"
+      "x-prompt": "What is the path to the component?",
+      "x-priority": "important"
     }
   },
-  "required": ["project", "componentPath"]
+  "required": ["project", "componentPath"],
+  "examplesFile": "../../../docs/component-test-examples.md"
 }

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfigGenerator = void 0;
 const tslib_1 = require("tslib");
-const cypress_1 = require("@nrwl/cypress");
 const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../utils/versions");
 const add_files_1 = require("./lib/add-files");
 const update_configs_1 = require("./lib/update-configs");
 /**
@@ -13,13 +13,14 @@ const update_configs_1 = require("./lib/update-configs");
  */
 function cypressComponentConfigGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { cypressComponentProject } = (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const installTask = yield (0, cypress_1.cypressComponentProject)(tree, {
+        const installTask = yield cypressComponentProject(tree, {
             project: options.project,
             skipFormat: true,
         });
-        yield (0, update_configs_1.updateProjectConfig)(tree, options);
-        (0, add_files_1.addFiles)(tree, projectConfig, options);
+        const found = yield (0, update_configs_1.updateProjectConfig)(tree, options);
+        yield (0, add_files_1.addFiles)(tree, projectConfig, options, found);
         if (options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }

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":";;;;AAAA,2CAAwD;AACxD,yCAA2E;AAC3E,+CAA2C;AAC3C,yDAA2D;AAG3D;;;;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,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;AAnBD,0EAmBC;AAED,kBAAe,+BAA+B,CAAC"}
+{"version":3,"file":"cypress-component-configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,mDAAiD;AACjD,+CAA2C;AAC3C,yDAAwE;AAGxE;;;;GAIG;AACH,SAAsB,+BAA+B,CACnD,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC9E,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE;YACtD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAgB,MAAM,IAAA,oCAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpE,MAAM,IAAA,oBAAQ,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACpD,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/support/commands.ts__tpl__

@@ -0,0 +1,42 @@
+/// <reference types="cypress" />
+import { mount } from 'cypress/react18'
+
+// ***********************************************
+// This example commands.ts shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+
+declare global {
+// eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Chainable<Subject> {
+      login(email: string, password: string): void;
+      mount: typeof mount;
+    }
+  }
+}
+
+Cypress.Commands.add('mount', mount)
+
+//
+// -- This is a parent command --
+Cypress.Commands.add('login', (email, password) => {
+  console.log('Custom command example: Login', email, password);
+});
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

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

@@ -2,5 +2,7 @@ import { defineConfig } from 'cypress';
 import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing';
 
 export default defineConfig({
-  component: nxComponentTestingPreset(__filename),
+  component: nxComponentTestingPreset(__filename, {
+    bundler: '<%= bundler %>'
+  }),
 });

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

@@ -1,3 +1,4 @@
 import { ProjectConfiguration, Tree } from '@nrwl/devkit';
 import { CypressComponentConfigurationSchema } from '../schema';
-export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema): void;
+import { FoundTarget } from './update-configs';
+export declare function addFiles(tree: Tree, projectConfig: ProjectConfiguration, options: CypressComponentConfigurationSchema, found: FoundTarget): Promise<void>;

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

@@ -1,38 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addFiles = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const ts = require("typescript");
+const versions_1 = require("nx/src/utils/versions");
 const ast_utils_1 = require("../../../utils/ast-utils");
 const component_test_1 = require("../../component-test/component-test");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
 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, {
+function addFiles(tree, projectConfig, options, found) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const cypressConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
+        if (tree.exists(cypressConfigPath)) {
+            tree.delete(cypressConfigPath);
+        }
+        const actualBundler = yield getBundler(found, tree);
+        if (options.bundler && options.bundler !== actualBundler) {
+            devkit_1.logger.warn(`You have specified ${options.bundler} as the bundler but this project is configured to use ${actualBundler}.
+      This may cause errors. If you are seeing errors, try removing the --bundler option.`);
+        }
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), projectConfig.root, {
+            tpl: '',
+            bundler: (_a = options.bundler) !== null && _a !== void 0 ? _a : actualBundler,
+        });
+        if (options.bundler === 'webpack' ||
+            (!options.bundler && actualBundler === 'webpack')) {
+            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/webpack': versions_1.nxVersion });
+        }
+        if (options.generateTests) {
+            const filePaths = [];
+            (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
+                if (isComponent(tree, filePath)) {
+                    filePaths.push(filePath);
+                }
+            });
+            for (const filePath of filePaths) {
+                yield (0, component_test_1.componentTestGenerator)(tree, {
                     project: options.project,
                     componentPath: filePath,
                 });
             }
-        });
-    }
+        }
+    });
 }
 exports.addFiles = addFiles;
+function getBundler(found, tree) {
+    var _a, _b, _c;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (found.target && ((_a = found.config) === null || _a === void 0 ? void 0 : _a.executor)) {
+            return found.config.executor === '@nrwl/vite:build' ? 'vite' : 'webpack';
+        }
+        const { target, project } = (0, devkit_1.parseTargetString)(found.target, yield (0, devkit_1.createProjectGraphAsync)());
+        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+        return ((_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b[target]) === null || _c === void 0 ? void 0 : _c.executor) === '@nrwl/vite:build'
+            ? 'vite'
+            : 'webpack';
+    });
+}
 function isComponent(tree, filePath) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     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 sourceFile = tsModule.createSourceFile(filePath, content, tsModule.ScriptTarget.Latest, true);
     const cmpDeclaration = (0, ast_utils_1.getComponentNode)(sourceFile);
     return !!cmpDeclaration;
 }

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

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

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

@@ -1,3 +1,7 @@
-import { Tree } from '@nrwl/devkit';
+import { TargetConfiguration, Tree } from '@nrwl/devkit';
 import { CypressComponentConfigurationSchema } from '../schema';
-export declare function updateProjectConfig(tree: Tree, options: CypressComponentConfigurationSchema): Promise<void>;
+export interface FoundTarget {
+    config?: TargetConfiguration;
+    target: string;
+}
+export declare function updateProjectConfig(tree: Tree, options: CypressComponentConfigurationSchema): Promise<FoundTarget>;

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

@@ -2,19 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfig = 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 updateProjectConfig(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const found = yield (0, find_target_options_1.findBuildConfig)(tree, {
+        const { findBuildConfig } = yield Promise.resolve().then(() => require('@nrwl/cypress/src/utils/find-target-options'));
+        const found = yield findBuildConfig(tree, {
             project: options.project,
             buildTarget: options.buildTarget,
-            validExecutorNames: new Set(['@nrwl/webpack:webpack']),
+            validExecutorNames: new Set([
+                '@nrwl/webpack:webpack',
+                '@nrwl/vite:build',
+            ]),
         });
-        assetValidConfig(found.config);
+        assetValidConfig(found === null || found === void 0 ? void 0 : 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);
+        return found;
     });
 }
 exports.updateProjectConfig = updateProjectConfig;

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

@@ -1 +1 @@
-{"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":";;;;AAAA,qFAA8E;AAC9E,yCAOsB;AAGtB,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAA4C;;QAE5C,MAAM,KAAK,GAAG,MAAM,IAAA,qCAAe,EAAC,IAAI,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS,CAAC,uBAAuB,CAAC,CAAC;SAC/D,CAAC,CAAC;QAEH,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE/B,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,mCAC1C,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,KAClD,eAAe,EAAE,KAAK,CAAC,MAAM,EAC7B,SAAS,EAAE,IAAI,GAChB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACnE,CAAC;CAAA;AAnBD,kDAmBC;AAED,SAAS,gBAAgB,CAAC,MAAe;IACvC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,0IAA0I,CAC3I,CAAC;KACH;AACH,CAAC"}
+{"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAQtB,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,eAAe,EAAE,GAAG,2CAC1B,6CAA6C,EAC9C,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS;gBAClC,uBAAuB;gBACvB,kBAAkB;aACnB,CAAC;SACH,CAAC,CAAC;QAEH,gBAAgB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC;QAEhC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,mCAC1C,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,KAClD,eAAe,EAAE,KAAK,CAAC,MAAM,EAC7B,SAAS,EAAE,IAAI,GAChB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEjE,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AA3BD,kDA2BC;AAED,SAAS,gBAAgB,CAAC,MAAe;IACvC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,0IAA0I,CAC3I,CAAC;KACH;AACH,CAAC"}

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

@@ -3,4 +3,5 @@ export interface CypressComponentConfigurationSchema {
   generateTests: boolean;
   skipFormat?: boolean;
   buildTarget?: string;
+  bundler?: 'webpack' | 'vite';
 }

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

@@ -20,13 +20,15 @@
       "type": "string",
       "description": "The name of the project to add cypress component testing configuration to",
       "x-dropdown": "projects",
-      "x-prompt": "What project should we add Cypress component testing to?"
+      "x-prompt": "What project should we add Cypress component testing to?",
+      "x-priority": "important"
     },
     "generateTests": {
       "type": "boolean",
       "description": "Generate default component tests for existing components in the project",
       "x-prompt": "Automatically generate tests for components declared in this project?",
-      "default": false
+      "default": false,
+      "x-priority": "important"
     },
     "buildTarget": {
       "type": "string",
@@ -36,8 +38,17 @@
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting files",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
+    },
+    "bundler": {
+      "description": "The bundler to use for Cypress Component Testing.",
+      "type": "string",
+      "enum": ["vite", "webpack"],
+      "hidden": true,
+      "x-priority": "internal"
     }
   },
-  "required": ["project"]
+  "required": ["project"],
+  "examplesFile": "../../../docs/cypress-component-configuration-examples.md"
 }

package/src/generators/hook/hook.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hookSchematic = exports.hookGenerator = void 0;
 const tslib_1 = require("tslib");
 // TODO(jack): Remove inline renderHook function when RTL releases with its own version
-const ts = require("typescript");
 const devkit_1 = require("@nrwl/devkit");
 const ast_utils_1 = require("../../utils/ast-utils");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
 function hookGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = yield normalizeOptions(host, schema);
@@ -31,14 +31,18 @@ function createFiles(host, options) {
         (0, devkit_1.toJS)(host);
     }
 }
+let tsModule;
 function addExportsToBarrel(host, options) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const workspace = (0, devkit_1.getProjects)(host);
     const isApp = workspace.get(options.project).projectType === 'application';
     if (options.export && !isApp) {
         const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
         const indexSource = host.read(indexFilePath, 'utf-8');
         if (indexSource !== null) {
-            const indexSourceFile = ts.createSourceFile(indexFilePath, indexSource, ts.ScriptTarget.Latest, true);
+            const indexSourceFile = tsModule.createSourceFile(indexFilePath, indexSource, tsModule.ScriptTarget.Latest, true);
             const changes = (0, devkit_1.applyChangesToString)(indexSource, (0, ast_utils_1.addImport)(indexSourceFile, `export * from './${options.directory}/${options.fileName}';`));
             host.write(indexFilePath, changes);
         }

package/src/generators/hook/hook.js.map

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

package/src/generators/hook/schema.json

@@ -19,7 +19,8 @@
       "$default": {
         "$source": "projectName"
       },
-      "x-prompt": "What is the name of the project for this hook?"
+      "x-prompt": "What is the name of the project for this hook?",
+      "x-priority": "important"
     },
     "name": {
       "type": "string",
@@ -28,7 +29,8 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the hook?"
+      "x-prompt": "What name would you like to use for the hook?",
+      "x-priority": "important"
     },
     "js": {
       "type": "boolean",
@@ -38,12 +40,13 @@
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create `spec.ts` test files for the new hook.",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     },
     "directory": {
       "type": "string",
       "description": "Create the hook under this directory (can be nested).",
-      "alias": "d"
+      "x-priority": "important"
     },
     "flat": {
       "type": "boolean",