@nrwl/react 15.3.0-beta.0 → 15.3.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/package.json +12 -12
  3. package/src/generators/application/application.js +15 -7
  4. package/src/generators/application/application.js.map +1 -1
  5. package/src/generators/application/lib/add-cypress.js +1 -1
  6. package/src/generators/application/lib/add-cypress.js.map +1 -1
  7. package/src/generators/application/lib/normalize-options.js +11 -12
  8. package/src/generators/application/lib/normalize-options.js.map +1 -1
  9. package/src/generators/application/lib/set-defaults.js +1 -1
  10. package/src/generators/application/lib/set-defaults.js.map +1 -1
  11. package/src/generators/application/schema.d.ts +2 -1
  12. package/src/generators/application/schema.json +2 -1
  13. package/src/generators/init/schema.d.ts +1 -0
  14. package/src/generators/init/schema.json +5 -0
  15. package/src/generators/library/files/{lib → common}/.babelrc__tmpl__ +0 -0
  16. package/src/generators/library/files/{lib → common}/README.md +0 -0
  17. package/src/generators/library/files/common/package.json__tmpl__ +12 -0
  18. package/src/generators/library/files/{lib → common}/src/index.ts__tmpl__ +0 -0
  19. package/src/generators/library/files/{lib → common}/tsconfig.json__tmpl__ +0 -0
  20. package/src/generators/library/files/{lib → common}/tsconfig.lib.json__tmpl__ +0 -0
  21. package/src/generators/library/files/vite/index.html__tmpl__ +15 -0
  22. package/src/generators/library/files/vite/package.json__tmpl__ +12 -0
  23. package/src/generators/library/files/vite/src/demo.tsx__tmpl__ +19 -0
  24. package/src/generators/library/lib/normalize-options.d.ts +4 -0
  25. package/src/generators/library/lib/normalize-options.js +45 -0
  26. package/src/generators/library/lib/normalize-options.js.map +1 -0
  27. package/src/generators/library/library.d.ts +1 -0
  28. package/src/generators/library/library.js +25 -38
  29. package/src/generators/library/library.js.map +1 -1
  30. package/src/generators/library/schema.d.ts +18 -17
  31. package/src/generators/library/schema.json +9 -4
  32. package/src/generators/storybook-configuration/configuration.js +14 -3
  33. package/src/generators/storybook-configuration/configuration.js.map +1 -1
  34. package/src/generators/storybook-configuration/schema.d.ts +1 -0
  35. package/src/generators/storybook-configuration/schema.json +7 -2
  36. package/src/utils/lint.d.ts +23 -0
  37. package/src/utils/lint.js +7 -1
  38. package/src/utils/lint.js.map +1 -1
  39. package/src/generators/library/files/lib/package.json__tmpl__ +0 -4
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- # [15.3.0-beta.0](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.0) (2022-11-24)
6
+ # [15.3.0-beta.2](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.2) (2022-11-25)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/react
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/react",
3
- "version": "15.3.0-beta.0",
3
+ "version": "15.3.0-beta.2",
4
4
  "private": false,
5
5
  "description": "The React plugin for Nx 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.",
6
6
  "repository": {
@@ -33,16 +33,16 @@
33
33
  "dependencies": {
34
34
  "@babel/core": "^7.15.0",
35
35
  "@babel/preset-react": "^7.14.5",
36
- "@nrwl/cypress": "15.3.0-beta.0",
37
- "@nrwl/devkit": "15.3.0-beta.0",
38
- "@nrwl/jest": "15.3.0-beta.0",
39
- "@nrwl/js": "15.3.0-beta.0",
40
- "@nrwl/linter": "15.3.0-beta.0",
41
- "@nrwl/storybook": "15.3.0-beta.0",
42
- "@nrwl/vite": "15.3.0-beta.0",
43
- "@nrwl/web": "15.3.0-beta.0",
44
- "@nrwl/webpack": "15.3.0-beta.0",
45
- "@nrwl/workspace": "15.3.0-beta.0",
36
+ "@nrwl/cypress": "15.3.0-beta.2",
37
+ "@nrwl/devkit": "15.3.0-beta.2",
38
+ "@nrwl/jest": "15.3.0-beta.2",
39
+ "@nrwl/js": "15.3.0-beta.2",
40
+ "@nrwl/linter": "15.3.0-beta.2",
41
+ "@nrwl/storybook": "15.3.0-beta.2",
42
+ "@nrwl/vite": "15.3.0-beta.2",
43
+ "@nrwl/web": "15.3.0-beta.2",
44
+ "@nrwl/webpack": "15.3.0-beta.2",
45
+ "@nrwl/workspace": "15.3.0-beta.2",
46
46
  "@phenomnomnominal/tsquery": "4.1.1",
47
47
  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
48
48
  "@svgr/webpack": "^6.1.2",
@@ -62,5 +62,5 @@
62
62
  "access": "public"
63
63
  },
64
64
  "types": "./index.d.ts",
65
- "gitHead": "61f6e2d7287beaac1993e32f3fe18703d2c63e41"
65
+ "gitHead": "70fa4b9e4127a5f17c084b7f0620dbf65ffd0499"
66
66
  }
package/src/generators/application/application.js CHANGED
@@ -19,6 +19,7 @@ const linter_1 = require("@nrwl/linter");
19
19
  const versions_1 = require("@nrwl/js/src/utils/versions");
20
20
  const versions_2 = require("@nrwl/webpack/src/utils/versions");
21
21
  const vite_1 = require("@nrwl/vite");
22
+ const lint_project_1 = require("@nrwl/linter/src/generators/lint-project/lint-project");
22
23
  function addLinting(host, options) {
23
24
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
24
25
  const tasks = [];
@@ -30,12 +31,14 @@ function addLinting(host, options) {
30
31
  (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
31
32
  ],
32
33
  unitTestRunner: options.unitTestRunner,
33
- eslintFilePatterns: [`${options.appProjectRoot}/**/*.{ts,tsx,js,jsx}`],
34
+ eslintFilePatterns: [
35
+ (0, lint_project_1.mapLintPattern)(options.appProjectRoot, '{ts,tsx,js,jsx}', options.rootProject),
36
+ ],
34
37
  skipFormat: true,
38
+ rootProject: options.rootProject,
35
39
  });
36
40
  tasks.push(lintTask);
37
- const reactEslintJson = (0, lint_1.createReactEslintJson)(options.appProjectRoot, options.setParserOptionsProject);
38
- (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, '.eslintrc.json'), () => reactEslintJson);
41
+ (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, '.eslintrc.json'), lint_1.extendReactEslintJson);
39
42
  const installTask = yield (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, Object.assign(Object.assign({}, lint_1.extraEslintDependencies.devDependencies), (options.compiler === 'swc'
40
43
  ? { '@swc/core': versions_1.swcCoreVersion, 'swc-loader': versions_2.swcLoaderVersion }
41
44
  : {})));
@@ -48,11 +51,14 @@ function applicationGenerator(host, schema) {
48
51
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
49
52
  const tasks = [];
50
53
  const options = (0, normalize_options_1.normalizeOptions)(host, schema);
51
- const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
54
+ const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true, skipBabelConfig: options.bundler === 'vite' }));
52
55
  tasks.push(initTask);
53
56
  (0, create_application_files_1.createApplicationFiles)(host, options);
54
57
  (0, add_project_1.addProject)(host, options);
55
58
  if (options.bundler === 'vite') {
59
+ // We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
60
+ // See: https://vitejs.dev/guide/env-and-mode.html
61
+ host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'));
56
62
  const viteTask = yield (0, vite_1.viteConfigurationGenerator)(host, {
57
63
  uiFramework: 'react',
58
64
  project: options.projectName,
@@ -73,9 +79,11 @@ function applicationGenerator(host, schema) {
73
79
  tasks.push(lintTask);
74
80
  const cypressTask = yield (0, add_cypress_1.addCypress)(host, options);
75
81
  tasks.push(cypressTask);
76
- const jestTask = yield (0, add_jest_1.addJest)(host, options);
77
- tasks.push(jestTask);
78
- (0, update_jest_config_1.updateSpecConfig)(host, options);
82
+ if (options.unitTestRunner === 'jest') {
83
+ const jestTask = yield (0, add_jest_1.addJest)(host, options);
84
+ tasks.push(jestTask);
85
+ (0, update_jest_config_1.updateSpecConfig)(host, options);
86
+ }
79
87
  const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(host, options.styledModule);
80
88
  tasks.push(styledTask);
81
89
  const routingTask = (0, add_routing_1.addRouting)(host, options);
package/src/generators/application/application.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"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"}
package/src/generators/application/lib/add-cypress.js CHANGED
@@ -8,7 +8,7 @@ function addCypress(host, options) {
8
8
  if (options.e2eTestRunner !== 'cypress') {
9
9
  return () => { };
10
10
  }
11
- return yield (0, cypress_1.cypressProjectGenerator)(host, Object.assign(Object.assign({}, options), { name: options.e2eProjectName, directory: options.directory, project: options.projectName }));
11
+ return yield (0, cypress_1.cypressProjectGenerator)(host, Object.assign(Object.assign({}, options), { name: options.e2eProjectName, directory: options.directory, project: options.projectName, rootProject: options.rootProject }));
12
12
  });
13
13
  }
14
14
  exports.addCypress = addCypress;
package/src/generators/application/lib/add-cypress.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AAIxD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,MAAM,IAAA,iCAAuB,EAAC,IAAI,kCACpC,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,cAAc,EAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,IAC5B,CAAC;IACL,CAAC;CAAA;AAXD,gCAWC"}
1
+ {"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AAIxD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,MAAM,IAAA,iCAAuB,EAAC,IAAI,kCACpC,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,cAAc,EAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,WAAW,EAAE,OAAO,CAAC,WAAW,IAChC,CAAC;IACL,CAAC;CAAA;AAZD,gCAYC"}
package/src/generators/application/lib/normalize-options.js CHANGED
@@ -33,22 +33,21 @@ function normalizeOptions(host, options) {
33
33
  ? null
34
34
  : options.style;
35
35
  (0, assertion_1.assertValidStyle)(options.style);
36
- if (options.bundler === 'vite') {
37
- options.unitTestRunner = 'vitest';
38
- }
39
- options.routing = (_a = options.routing) !== null && _a !== void 0 ? _a : false;
40
- options.strict = (_b = options.strict) !== null && _b !== void 0 ? _b : true;
41
- options.classComponent = (_c = options.classComponent) !== null && _c !== void 0 ? _c : false;
42
- options.unitTestRunner = (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : 'jest';
43
- options.e2eTestRunner = (_e = options.e2eTestRunner) !== null && _e !== void 0 ? _e : 'cypress';
44
- options.compiler = (_f = options.compiler) !== null && _f !== void 0 ? _f : 'babel';
45
- options.bundler = (_g = options.bundler) !== null && _g !== void 0 ? _g : 'webpack';
46
- (_h = options.devServerPort) !== null && _h !== void 0 ? _h : (options.devServerPort = (0, find_free_port_1.findFreePort)(host));
47
- return Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, appProjectRoot,
36
+ const normalized = Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, appProjectRoot,
48
37
  e2eProjectName,
49
38
  parsedTags,
50
39
  fileName,
51
40
  styledModule, hasStyles: options.style !== 'none' });
41
+ normalized.routing = (_a = normalized.routing) !== null && _a !== void 0 ? _a : false;
42
+ normalized.strict = (_b = normalized.strict) !== null && _b !== void 0 ? _b : true;
43
+ normalized.classComponent = (_c = normalized.classComponent) !== null && _c !== void 0 ? _c : false;
44
+ normalized.compiler = (_d = normalized.compiler) !== null && _d !== void 0 ? _d : 'babel';
45
+ normalized.bundler = (_e = normalized.bundler) !== null && _e !== void 0 ? _e : 'webpack';
46
+ normalized.unitTestRunner =
47
+ (_f = normalized.unitTestRunner) !== null && _f !== void 0 ? _f : (normalized.bundler === 'vite' ? 'vitest' : 'jest');
48
+ normalized.e2eTestRunner = (_g = normalized.e2eTestRunner) !== null && _g !== void 0 ? _g : 'cypress';
49
+ (_h = normalized.devServerPort) !== null && _h !== void 0 ? _h : (normalized.devServerPort = (0, find_free_port_1.findFreePort)(host));
50
+ return normalized;
52
51
  }
53
52
  exports.normalizeOptions = normalizeOptions;
54
53
  //# sourceMappingURL=normalize-options.js.map
package/src/generators/application/lib/normalize-options.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"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"}
package/src/generators/application/lib/set-defaults.js CHANGED
@@ -14,7 +14,7 @@ function setDefaults(host, options) {
14
14
  workspace.generators['@nrwl/react'] =
15
15
  workspace.generators['@nrwl/react'] || {};
16
16
  const prev = Object.assign({}, workspace.generators['@nrwl/react']);
17
- workspace.generators = Object.assign(Object.assign({}, workspace.generators), { '@nrwl/react': Object.assign(Object.assign({}, prev), { application: Object.assign({ style: options.style, unitTestRunner: options.unitTestRunner, linter: options.linter }, prev.application), component: Object.assign({ style: options.style }, prev.component), library: Object.assign({ style: options.style, unitTestRunner: options.unitTestRunner, linter: options.linter }, prev.library) }) });
17
+ workspace.generators = Object.assign(Object.assign({}, workspace.generators), { '@nrwl/react': Object.assign(Object.assign({}, prev), { application: Object.assign({ style: options.style, linter: options.linter, bundler: options.bundler }, prev.application), component: Object.assign({ style: options.style }, prev.component), library: Object.assign({ style: options.style, linter: options.linter }, prev.library) }) });
18
18
  (0, devkit_1.updateWorkspaceConfiguration)(host, workspace);
19
19
  }
20
20
  exports.setDefaults = setDefaults;
package/src/generators/application/lib/set-defaults.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAGtB,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAI,OAAO,CAAC,iBAAiB,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC5D,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;KAChD;IAED,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE5C,MAAM,IAAI,qBAAQ,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAE,CAAC;IAExD,SAAS,CAAC,UAAU,mCACf,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,IAAI,KACP,WAAW,kBACT,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,WAAW,GAErB,SAAS,kBACP,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,IAAI,CAAC,SAAS,GAEnB,OAAO,kBACL,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,OAAO,OAGpB,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAzCD,kCAyCC"}
1
+ {"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAGtB,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAI,OAAO,CAAC,iBAAiB,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,OAAO,CAAC,kBAAkB,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE;QAC5D,SAAS,CAAC,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;KAChD;IAED,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC;QACjC,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE5C,MAAM,IAAI,qBAAQ,SAAS,CAAC,UAAU,CAAC,aAAa,CAAC,CAAE,CAAC;IAExD,SAAS,CAAC,UAAU,mCACf,SAAS,CAAC,UAAU,KACvB,aAAa,kCACR,IAAI,KACP,WAAW,kBACT,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,OAAO,EAAE,OAAO,CAAC,OAAO,IACrB,IAAI,CAAC,WAAW,GAErB,SAAS,kBACP,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,IAAI,CAAC,SAAS,GAEnB,OAAO,kBACL,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,IACnB,IAAI,CAAC,OAAO,OAGpB,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAxCD,kCAwCC"}
package/src/generators/application/schema.d.ts CHANGED
@@ -7,7 +7,7 @@ export interface Schema {
7
7
  skipFormat: boolean;
8
8
  directory?: string;
9
9
  tags?: string;
10
- unitTestRunner: 'jest' | 'vitest' | 'none';
10
+ unitTestRunner?: 'jest' | 'vitest' | 'none';
11
11
  inSourceTests?: boolean;
12
12
  /**
13
13
  * @deprecated
@@ -41,4 +41,5 @@ export interface NormalizedSchema extends Schema {
41
41
  fileName: string;
42
42
  styledModule: null | SupportedStyles;
43
43
  hasStyles: boolean;
44
+ unitTestRunner: 'jest' | 'vitest' | 'none';
44
45
  }
package/src/generators/application/schema.json CHANGED
@@ -183,8 +183,9 @@
183
183
  },
184
184
  "bundler": {
185
185
  "description": "The bundler to use.",
186
+ "type": "string",
186
187
  "enum": ["vite", "webpack"],
187
- "x-prompt": "Which bundler do you want to use?",
188
+ "x-prompt": "Which bundler do you want to use to build the application?",
188
189
  "default": "webpack"
189
190
  }
190
191
  },
package/src/generators/init/schema.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  export interface InitSchema {
2
2
  unitTestRunner?: 'jest' | 'vitest' | 'none';
3
3
  e2eTestRunner?: 'cypress' | 'none';
4
+ skipBabelConfig?: boolean;
4
5
  skipFormat?: boolean;
5
6
  skipPackageJson?: boolean;
6
7
  js?: boolean;
package/src/generators/init/schema.json CHANGED
@@ -28,6 +28,11 @@
28
28
  "type": "boolean",
29
29
  "default": false
30
30
  },
31
+ "skipBabelConfig": {
32
+ "description": "Do not generate a root babel.config.json (if babel is not needed).",
33
+ "type": "boolean",
34
+ "default": false
35
+ },
31
36
  "js": {
32
37
  "type": "boolean",
33
38
  "default": false,
package/src/generators/library/files/common/package.json__tmpl__ ADDED
@@ -0,0 +1,12 @@
1
+ {
2
+ "name": "<%= name %>",
3
+ "version": "0.0.1",
4
+ "main": "./index.js",
5
+ "module": "./index.mjs",
6
+ "exports": {
7
+ ".": {
8
+ "import": "./index.mjs",
9
+ "require": "./index.js"
10
+ }
11
+ }
12
+ }
package/src/generators/library/files/vite/index.html__tmpl__ ADDED
@@ -0,0 +1,15 @@
1
+ <!DOCTYPE html>
2
+ <html lang="en">
3
+ <head>
4
+ <meta charset="utf-8" />
5
+ <title><%= className %> Demo</title>
6
+ <base href="/" />
7
+
8
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
9
+ <link rel="icon" type="image/x-icon" href="favicon.ico" />
10
+ </head>
11
+ <body>
12
+ <div id="root"></div>
13
+ <script type="module" src="./src/demo.tsx"></script>
14
+ </body>
15
+ </html>
package/src/generators/library/files/vite/package.json__tmpl__ ADDED
@@ -0,0 +1,12 @@
1
+ {
2
+ "name": "<%= name %>",
3
+ "version": "0.0.1",
4
+ "main": "./index.js",
5
+ "types": "./index.d.ts",
6
+ "exports": {
7
+ ".": {
8
+ "import": "./index.mjs",
9
+ "require": "./index.js"
10
+ }
11
+ }
12
+ }
package/src/generators/library/files/vite/src/demo.tsx__tmpl__ ADDED
@@ -0,0 +1,19 @@
1
+ /*
2
+ * This a a demo file that can be helpful when developing components by serving and interacting with them in the browser.
3
+ */
4
+ <% if (component) { %>
5
+ import * as ReactDOM from 'react-dom/client';
6
+ import { <%= className %> } from './index';
7
+
8
+ const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
9
+ root.render(
10
+ <<%= className %> />
11
+ );
12
+ <% } else { %>
13
+ import * as ReactDOM from 'react-dom/client';
14
+
15
+ const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
16
+ root.render(
17
+ <h1><%= className %> Demo</h1>
18
+ );
19
+ <% } %>
package/src/generators/library/lib/normalize-options.d.ts ADDED
@@ -0,0 +1,4 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ import { NormalizedSchema } from '../library';
3
+ import { Schema } from '../schema';
4
+ export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
package/src/generators/library/lib/normalize-options.js ADDED
@@ -0,0 +1,45 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.normalizeOptions = void 0;
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const assertion_1 = require("../../../utils/assertion");
6
+ function normalizeOptions(host, options) {
7
+ var _a, _b, _c;
8
+ const name = (0, devkit_1.names)(options.name).fileName;
9
+ const projectDirectory = options.directory
10
+ ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
11
+ : name;
12
+ const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
13
+ const fileName = projectName;
14
+ const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
15
+ const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
16
+ const parsedTags = options.tags
17
+ ? options.tags.split(',').map((s) => s.trim())
18
+ : [];
19
+ const importPath = options.importPath || (0, devkit_1.getImportPath)(npmScope, projectDirectory);
20
+ const normalized = Object.assign(Object.assign({}, options), { compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'babel', bundler: (_b = options.bundler) !== null && _b !== void 0 ? _b : 'rollup', fileName, routePath: `/${name}`, name: projectName, projectRoot,
21
+ projectDirectory,
22
+ parsedTags,
23
+ importPath });
24
+ // Libraries with a bundler or is publishable must also be buildable.
25
+ normalized.buildable = Boolean(options.bundler || options.buildable || options.publishable);
26
+ normalized.unitTestRunner =
27
+ (_c = normalized.unitTestRunner) !== null && _c !== void 0 ? _c : (normalized.bundler === 'vite' ? 'vitest' : 'jest');
28
+ if (options.appProject) {
29
+ const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
30
+ if (appProjectConfig.projectType !== 'application') {
31
+ throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
32
+ }
33
+ try {
34
+ normalized.appMain = appProjectConfig.targets.build.options.main;
35
+ normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
36
+ }
37
+ catch (e) {
38
+ throw new Error(`Could not locate project main for ${options.appProject}`);
39
+ }
40
+ }
41
+ (0, assertion_1.assertValidStyle)(normalized.style);
42
+ return normalized;
43
+ }
44
+ exports.normalizeOptions = normalizeOptions;
45
+ //# sourceMappingURL=normalize-options.js.map
package/src/generators/library/lib/normalize-options.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AACtB,wDAA4D;AAI5D,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,WAAW,CAAC;IAC7B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAA,sBAAa,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAElE,MAAM,UAAU,GAAG,gCACd,OAAO,KACV,QAAQ,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO,EACrC,OAAO,EAAE,MAAA,OAAO,CAAC,OAAO,mCAAI,QAAQ,EACpC,QAAQ,EACR,SAAS,EAAE,IAAI,IAAI,EAAE,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW;QACX,gBAAgB;QAChB,UAAU;QACV,UAAU,GACS,CAAC;IAEtB,qEAAqE;IACrE,UAAU,CAAC,SAAS,GAAG,OAAO,CAC5B,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,WAAW,CAC5D,CAAC;IAEF,UAAU,CAAC,cAAc;QACvB,MAAA,UAAU,CAAC,cAAc,mCACzB,CAAC,UAAU,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAEtD,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,gBAAgB,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEnE,IAAI,gBAAgB,CAAC,WAAW,KAAK,aAAa,EAAE;YAClD,MAAM,IAAI,KAAK,CACb,sDAAsD,gBAAgB,CAAC,WAAW,GAAG,CACtF,CAAC;SACH;QAED,IAAI;YACF,UAAU,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACjE,UAAU,CAAC,aAAa,GAAG,IAAA,sBAAa,EAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;SACvE;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CACb,qCAAqC,OAAO,CAAC,UAAU,EAAE,CAC1D,CAAC;SACH;KACF;IAED,IAAA,4BAAgB,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAEnC,OAAO,UAAU,CAAC;AACpB,CAAC;AAjED,4CAiEC"}
package/src/generators/library/library.d.ts CHANGED
@@ -9,6 +9,7 @@ export interface NormalizedSchema extends Schema {
9
9
  parsedTags: string[];
10
10
  appMain?: string;
11
11
  appSourceRoot?: string;
12
+ unitTestRunner: 'jest' | 'vitest' | 'none';
12
13
  }
13
14
  export declare function libraryGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
14
15
  export default libraryGenerator;
package/src/generators/library/library.js CHANGED
@@ -10,7 +10,6 @@ const linter_1 = require("@nrwl/linter");
10
10
  const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
11
11
  const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
12
12
  const ts = require("typescript");
13
- const assertion_1 = require("../../utils/assertion");
14
13
  const ast_utils_1 = require("../../utils/ast-utils");
15
14
  const lint_1 = require("../../utils/lint");
16
15
  const versions_2 = require("../../utils/versions");
@@ -18,17 +17,18 @@ const component_1 = require("../component/component");
18
17
  const init_1 = require("../init/init");
19
18
  const jest_utils_1 = require("../../utils/jest-utils");
20
19
  const vite_1 = require("@nrwl/vite");
20
+ const normalize_options_1 = require("./lib/normalize-options");
21
21
  function libraryGenerator(host, schema) {
22
22
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
23
23
  const tasks = [];
24
- const options = normalizeOptions(host, schema);
24
+ const options = (0, normalize_options_1.normalizeOptions)(host, schema);
25
25
  if (options.publishable === true && !schema.importPath) {
26
26
  throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
27
27
  }
28
28
  if (!options.component) {
29
29
  options.style = 'none';
30
30
  }
31
- const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { e2eTestRunner: 'none', skipFormat: true }));
31
+ const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { e2eTestRunner: 'none', skipFormat: true, skipBabelConfig: options.bundler === 'vite' }));
32
32
  tasks.push(initTask);
33
33
  addProject(host, options);
34
34
  const lintTask = yield addLinting(host, options);
@@ -37,6 +37,17 @@ function libraryGenerator(host, schema) {
37
37
  if (!options.skipTsConfig) {
38
38
  updateBaseTsConfig(host, options);
39
39
  }
40
+ if (options.buildable && options.bundler === 'vite') {
41
+ const viteTask = yield (0, vite_1.viteConfigurationGenerator)(host, {
42
+ uiFramework: 'react',
43
+ project: options.name,
44
+ newProject: true,
45
+ includeLib: true,
46
+ inSourceTests: options.inSourceTests,
47
+ includeVitest: true,
48
+ });
49
+ tasks.push(viteTask);
50
+ }
40
51
  if (options.unitTestRunner === 'jest') {
41
52
  const jestTask = yield (0, jest_1.jestProjectGenerator)(host, Object.assign(Object.assign({}, options), { project: options.name, setupFile: 'none', supportTsx: true, skipSerializers: true, compiler: options.compiler }));
42
53
  tasks.push(jestTask);
@@ -46,7 +57,9 @@ function libraryGenerator(host, schema) {
46
57
  host.write(jestConfigPath, updatedContent);
47
58
  }
48
59
  }
49
- else if (options.unitTestRunner === 'vitest') {
60
+ else if (options.unitTestRunner === 'vitest' &&
61
+ options.bundler !== 'vite' // tests are already configured if bundler is vite
62
+ ) {
50
63
  const vitestTask = yield (0, vite_1.vitestGenerator)(host, {
51
64
  uiFramework: 'react',
52
65
  project: options.name,
@@ -180,7 +193,14 @@ function updateBaseTsConfig(host, options) {
180
193
  });
181
194
  }
182
195
  function createFiles(host, options) {
183
- (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/lib'), options.projectRoot, Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, options.projectRoot) }));
196
+ const substitutions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, options.projectRoot) });
197
+ (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/common'), options.projectRoot, substitutions);
198
+ if (options.bundler === 'vite') {
199
+ (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/vite'), options.projectRoot, substitutions);
200
+ if (host.exists((0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'))) {
201
+ host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'));
202
+ }
203
+ }
184
204
  if (!options.publishable && !options.buildable) {
185
205
  host.delete(`${options.projectRoot}/package.json`);
186
206
  }
@@ -236,39 +256,6 @@ function readComponent(host, path) {
236
256
  const source = ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
237
257
  return { content, source };
238
258
  }
239
- function normalizeOptions(host, options) {
240
- const name = (0, devkit_1.names)(options.name).fileName;
241
- const projectDirectory = options.directory
242
- ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
243
- : name;
244
- const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
245
- const fileName = projectName;
246
- const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
247
- const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, projectDirectory);
248
- const parsedTags = options.tags
249
- ? options.tags.split(',').map((s) => s.trim())
250
- : [];
251
- const importPath = options.importPath || (0, path_1.getImportPath)(npmScope, projectDirectory);
252
- const normalized = Object.assign(Object.assign({}, options), { fileName, routePath: `/${name}`, name: projectName, projectRoot,
253
- projectDirectory,
254
- parsedTags,
255
- importPath });
256
- if (options.appProject) {
257
- const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
258
- if (appProjectConfig.projectType !== 'application') {
259
- throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
260
- }
261
- try {
262
- normalized.appMain = appProjectConfig.targets.build.options.main;
263
- normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
264
- }
265
- catch (e) {
266
- throw new Error(`Could not locate project main for ${options.appProject}`);
267
- }
268
- }
269
- (0, assertion_1.assertValidStyle)(normalized.style);
270
- return normalized;
271
- }
272
259
  function updateLibPackageNpmScope(host, options) {
273
260
  return (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
274
261
  json.name = options.importPath;
package/src/generators/library/library.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,yCAiBsB;AACtB,4CAAkD;AAClD,qCAAkD;AAClD,0DAA6D;AAC7D,yCAA4D;AAC5D,2FAAqF;AACrF,yEAGkD;AAClD,iCAAiC;AACjC,qDAAyD;AACzD,qDAK+B;AAC/B,2CAG0B;AAC1B,mDAK8B;AAC9B,sDAAwD;AACxD,uCAAgC;AAEhC,uDAAiE;AACjE,qCAA6C;AAY7C,SAAsB,gBAAgB,CAAC,IAAU,EAAE,MAAc;;QAC/D,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,OAAO,CAAC,WAAW,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtD,MAAM,IAAI,KAAK,CACb,oJAAoJ,CACrJ,CAAC;SACH;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YACtB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;SACxB;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,cAAI,EAAC,IAAI,kCAC3B,OAAO,KACV,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1B,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;YACzB,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC3C,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,IAAI,EACrB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,IAAI,EACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAC1B,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CACjD,CAAC;YACF,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;gBAC/D,MAAM,cAAc,GAAG,IAAA,oCAAuB,EAC5C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CACnC,CAAC;gBACF,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;aAC5C;SACF;aAAM,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;YAC9C,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAe,EAAC,IAAI,EAAE;gBAC7C,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,aAAa,EAAE,OAAO,CAAC,aAAa;aACrC,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACxB;QAED,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,MAAM,aAAa,GAAG,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;gBACnD,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,SAAS,EACP,OAAO,CAAC,cAAc,KAAK,MAAM;oBACjC,CAAC,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC;gBACxE,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAC3B;QAED,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE;YAC5C,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA4B,EACpD,IAAI,EACJ;gBACE,KAAK,EAAE,uBAAY;gBACnB,WAAW,EAAE,0BAAe;aAC7B,EACD,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,yBAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAClE,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AArGD,4CAqGC;AAED,SAAe,UAAU,CAAC,IAAU,EAAE,OAAyB;;QAC7D,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;gBAChD,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,aAAa,EAAE;oBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC;iBAC5D;gBACD,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,uBAAuB,CAAC;gBACnE,UAAU,EAAE,IAAI;gBAChB,eAAe,EAAE,OAAO,CAAC,eAAe;aACzC,CAAC,CAAC;YAEH,MAAM,eAAe,GAAG,IAAA,4BAAqB,EAC3C,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,uBAAuB,CAChC,CAAC;YAEF,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,gBAAgB,CAAC,EACxD,GAAG,EAAE,CAAC,eAAe,CACtB,CAAC;YAEF,IAAI,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;gBAC5B,WAAW,GAAG,MAAM,IAAA,qCAA4B,EAC9C,IAAI,EACJ,8BAAuB,CAAC,YAAY,EACpC,8BAAuB,CAAC,eAAe,CACxC,CAAC;aACH;YAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;SAChD;aAAM;YACL,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,OAAyB;;IACvD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAE3C,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE;QAC5C,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,EAAE;YACvC,QAAQ,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;SAC7C;aAAM;YACL,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SACpC;QAED,OAAO,CAAC,KAAK,GAAG;YACd,QAAQ,EAAE,kBAAkB;YAC5B,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACP,UAAU,EAAE,QAAQ,OAAO,IAAI,OAAO,CAAC,gBAAgB,EAAE;gBACzD,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACpD,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe;gBAC9C,SAAS,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC;gBAClE,QAAQ;gBACR,YAAY,EAAE,mCAAmC;gBACjD,QAAQ,EAAE,MAAA,OAAO,CAAC,QAAQ,mCAAI,OAAO;gBACrC,MAAM,EAAE;oBACN;wBACE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,YAAY;wBACxC,KAAK,EAAE,GAAG;wBACV,MAAM,EAAE,GAAG;qBACZ;iBACF;aACF;SACF,CAAC;KACH;IAED,IAAA,gCAAuB,EACrB,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ;QACE,IAAI,EAAE,OAAO,CAAC,WAAW;QACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;QACzD,WAAW,EAAE,SAAS;QACtB,IAAI,EAAE,OAAO,CAAC,UAAU;QACxB,OAAO;KACR,EACD,OAAO,CAAC,gBAAgB,CACzB,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,OAAyB;IAC3D,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,EACvD,CAAC,IAAI,EAAE,EAAE;QACP,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,eAAe,mCACf,IAAI,CAAC,eAAe,KACvB,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,IAAI,EACxB,kCAAkC,EAAE,IAAI,EACxC,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAyB;IAC/D,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,sCAAyB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;QAC/B,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE7B,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,qDAAqD,OAAO,CAAC,UAAU,uCAAuC,CAC/G,CAAC;SACH;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAE7C,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;YAC5B,OAAO,CACL,OAAO,EACP,IAAA,0BAAiB,EAAC,OAAO,EAAE,GAAG,OAAO,CAAC,gBAAgB,eAAe,CAAC,CACvE;SACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAyB;IACxD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,aAAa,CAAC,EAC3C,OAAO,CAAC,WAAW,gDAEd,OAAO,GACP,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KACtB,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,gBAAgB,EAAE,IAAA,0CAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,WAAW,CACpB,IAEJ,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC,CAAC;KACpD;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;IAED,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,OAAyB;IAC5D,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QAC9C,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjE,MAAM,mBAAmB,GAAG,IAAA,mCAAuB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEnE,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,mCAAmC,OAAO,CAAC,OAAO,6DAA6D,CAChH,CAAC;KACH;IAED,MAAM,gBAAgB,GAAG,IAAA,0BAAiB,EACxC,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,OAAO,EAAE,GAAG,mBAAmB,MAAM,CAAC,CAC/C,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,qCAA4B,EAC7C,IAAI,EACJ,EAAE,kBAAkB,EAAE,gCAAqB,EAAE,EAC7C,EAAE,yBAAyB,EAAE,qCAA0B,EAAE,CAC1D,CAAC;IAEF,yBAAyB;IACzB,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAC1D,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,OAAO,EACP,IAAA,4BAAgB,EAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAC1C,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KACtC;IAED,sBAAsB;IACtB;QACE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAC1D,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxC,MAAM,wBAAwB,GAAG,gBAAgB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAC5E,IAAI,CAAC,wBAAwB,EAAE;YAC7B,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,gBAAgB,EAChB,IAAA,4BAAgB,EAAC,gBAAgB,EAAE,eAAe,CAAC,CACpD,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;SACvC;KACF;IAED,iBAAiB;IACjB;QACE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAC1D,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,gBAAgB,EAChB,IAAA,oBAAQ,EAAC,gBAAgB,EAAE,eAAe,EAAE;YAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,aAAa,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS;YAC5C,UAAU,EAAE,IAAA,oBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC;SAC9D,CAAC,CACH,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;KACvC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,aAAa,CACpB,IAAU,EACV,IAAY;IAEZ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;KACxC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzC,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAChC,IAAI,EACJ,OAAO,EACP,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,WAAW,CAAC;IAC7B,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,UAAU,GACd,OAAO,CAAC,UAAU,IAAI,IAAA,oBAAa,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAElE,MAAM,UAAU,mCACX,OAAO,KACV,QAAQ,EACR,SAAS,EAAE,IAAI,IAAI,EAAE,EACrB,IAAI,EAAE,WAAW,EACjB,WAAW;QACX,gBAAgB;QAChB,UAAU;QACV,UAAU,GACX,CAAC;IAEF,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,gBAAgB,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEnE,IAAI,gBAAgB,CAAC,WAAW,KAAK,aAAa,EAAE;YAClD,MAAM,IAAI,KAAK,CACb,sDAAsD,gBAAgB,CAAC,WAAW,GAAG,CACtF,CAAC;SACH;QAED,IAAI;YACF,UAAU,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YACjE,UAAU,CAAC,aAAa,GAAG,IAAA,sBAAa,EAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;SACvE;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CACb,qCAAqC,OAAO,CAAC,UAAU,EAAE,CAC1D,CAAC;SACH;KACF;IAED,IAAA,4BAAgB,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAEnC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAU,EAAE,OAAyB;IACrE,OAAO,IAAA,mBAAU,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;QACtE,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,OAAO,CAAC,OAAyB,EAAE,IAAY;IACtD,OAAO,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,kBAAe,gBAAgB,CAAC;AACnB,QAAA,gBAAgB,GAAG,IAAA,2BAAkB,EAAC,gBAAgB,CAAC,CAAC"}
1
+ {"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"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"}
package/src/generators/library/schema.d.ts CHANGED
@@ -2,27 +2,28 @@ import { Linter } from '@nrwl/linter';
2
2
  import { SupportedStyles } from '../../../typings/style';
3
3
 
4
4
  export interface Schema {
5
- name: string;
6
- directory?: string;
7
- style: SupportedStyles;
8
- skipTsConfig: boolean;
9
- skipFormat: boolean;
10
- tags?: string;
11
- pascalCaseFiles?: boolean;
12
- routing?: boolean;
13
5
  appProject?: string;
14
- unitTestRunner: 'jest' | 'vitest' | 'none';
15
- inSourceTests?: boolean;
16
- linter: Linter;
17
- component?: boolean;
18
- publishable?: boolean;
19
6
  buildable?: boolean;
7
+ bundler?: 'rollup' | 'vite';
8
+ compiler?: 'babel' | 'swc';
9
+ component?: boolean;
10
+ directory?: string;
11
+ globalCss?: boolean;
20
12
  importPath?: string;
13
+ inSourceTests?: boolean;
21
14
  js?: boolean;
22
- globalCss?: boolean;
23
- strict?: boolean;
15
+ linter: Linter;
16
+ name: string;
17
+ pascalCaseFiles?: boolean;
18
+ publishable?: boolean;
19
+ routing?: boolean;
24
20
  setParserOptionsProject?: boolean;
25
- standaloneConfig?: boolean;
26
- compiler?: 'babel' | 'swc';
21
+ skipFormat?: boolean;
27
22
  skipPackageJson?: boolean;
23
+ skipTsConfig?: boolean;
24
+ standaloneConfig?: boolean;
25
+ strict?: boolean;
26
+ style: SupportedStyles;
27
+ tags?: string;
28
+ unitTestRunner?: 'jest' | 'vitest' | 'none';
28
29
  }
package/src/generators/library/schema.json CHANGED
@@ -81,8 +81,7 @@
81
81
  "unitTestRunner": {
82
82
  "type": "string",
83
83
  "enum": ["jest", "vitest", "none"],
84
- "description": "Test runner to use for unit tests.",
85
- "default": "jest"
84
+ "description": "Test runner to use for unit tests."
86
85
  },
87
86
  "inSourceTests": {
88
87
  "type": "boolean",
@@ -126,7 +125,7 @@
126
125
  "buildable": {
127
126
  "type": "boolean",
128
127
  "default": false,
129
- "description": "Generate a buildable library."
128
+ "description": "Generate a buildable library. If a bundler is set then the library is buildable by default."
130
129
  },
131
130
  "importPath": {
132
131
  "type": "string",
@@ -161,11 +160,17 @@
161
160
  "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
162
161
  "type": "boolean"
163
162
  },
163
+ "bundler": {
164
+ "type": "string",
165
+ "description": "The bundler to use.",
166
+ "enum": ["vite", "rollup"],
167
+ "x-prompt": "Which bundler would you like to use to build the library?"
168
+ },
164
169
  "compiler": {
165
170
  "type": "string",
166
171
  "enum": ["babel", "swc"],
167
172
  "default": "babel",
168
- "description": "Which compiler to use."
173
+ "description": "Which compiler to use. Does not apply if bundler is set to Vite."
169
174
  },
170
175
  "skipPackageJson": {
171
176
  "description": "Do not add dependencies to `package.json`.",
package/src/generators/storybook-configuration/configuration.js CHANGED
@@ -8,9 +8,8 @@ const storybook_1 = require("@nrwl/storybook");
8
8
  const project_name_1 = require("@nrwl/cypress/src/utils/project-name");
9
9
  function generateStories(host, schema) {
10
10
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
11
- const libConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
12
- const libRoot = libConfig.root;
13
- const cypressProject = (0, project_name_1.getE2eProjectName)(schema.name, libRoot, schema.cypressDirectory);
11
+ const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
12
+ const cypressProject = (0, project_name_1.getE2eProjectName)(schema.name, projectConfig.root, schema.cypressDirectory);
14
13
  yield (0, stories_1.default)(host, {
15
14
  project: schema.name,
16
15
  generateCypressSpecs: schema.configureCypress && schema.generateCypressSpecs,
@@ -21,7 +20,18 @@ function generateStories(host, schema) {
21
20
  });
22
21
  }
23
22
  function storybookConfigurationGenerator(host, schema) {
23
+ var _a;
24
24
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
25
+ let bundler = schema.bundler;
26
+ const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
27
+ if (projectConfig.projectType === 'application' &&
28
+ ((_a = projectConfig.targets['build']) === null || _a === void 0 ? void 0 : _a.executor) === '@nrwl/vite:build') {
29
+ bundler = 'vite';
30
+ if (schema.bundler !== 'vite') {
31
+ devkit_1.logger.info(`The project ${schema.name} is set up to use Vite. So
32
+ Storybook will be configured to use Vite as well.`);
33
+ }
34
+ }
25
35
  const installTask = yield (0, storybook_1.configurationGenerator)(host, {
26
36
  name: schema.name,
27
37
  uiFramework: '@storybook/react',
@@ -31,6 +41,7 @@ function storybookConfigurationGenerator(host, schema) {
31
41
  cypressDirectory: schema.cypressDirectory,
32
42
  standaloneConfig: schema.standaloneConfig,
33
43
  tsConfiguration: schema.tsConfiguration,
44
+ bundler,
34
45
  });
35
46
  if (schema.generateStories) {
36
47
  yield generateStories(host, schema);
package/src/generators/storybook-configuration/configuration.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,yCAIsB;AACtB,+CAAyD;AACzD,uEAAyE;AAEzE,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,MAAM,SAAS,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC;QAC/B,MAAM,cAAc,GAAG,IAAA,gCAAiB,EACtC,MAAM,CAAC,IAAI,EACX,OAAO,EACP,MAAM,CAAC,gBAAgB,CACxB,CAAC;QACF,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,oBAAoB,EAClB,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,oBAAoB;YACxD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,cAAc;YACd,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;QAEhC,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;YACrD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,kBAAkB;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AApBD,0EAoBC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
1
+ {"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/storybook-configuration/configuration.ts"],"names":[],"mappings":";;;;AACA,gDAAkD;AAClD,yCAKsB;AACtB,+CAAyD;AACzD,uEAAyE;AAEzE,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,IAAA,gCAAiB,EACtC,MAAM,CAAC,IAAI,EACX,aAAa,CAAC,IAAI,EAClB,MAAM,CAAC,gBAAgB,CACxB,CAAC;QACF,MAAM,IAAA,iBAAgB,EAAC,IAAI,EAAE;YAC3B,OAAO,EAAE,MAAM,CAAC,IAAI;YACpB,oBAAoB,EAClB,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,oBAAoB;YACxD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,cAAc;YACd,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC7B,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAElE,IACE,aAAa,CAAC,WAAW,KAAK,aAAa;YAC3C,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,kBAAkB,EAC/D;YACA,OAAO,GAAG,MAAM,CAAC;YACjB,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,EAAE;gBAC7B,eAAM,CAAC,IAAI,CACT,eAAe,MAAM,CAAC,IAAI;wDACsB,CACjD,CAAC;aACH;SACF;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,kCAAsB,EAAC,IAAI,EAAE;YACrD,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,WAAW,EAAE,kBAAkB;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,OAAO,WAAW,CAAC;;CACpB;AArCD,0EAqCC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
package/src/generators/storybook-configuration/schema.d.ts CHANGED
@@ -11,5 +11,6 @@ export interface StorybookConfigureSchema {
11
11
  cypressDirectory?: string;
12
12
  standaloneConfig?: boolean;
13
13
  ignorePaths?: string[];
14
+ bundler?: 'webpack' | 'vite';
14
15
  configureTestRunner?: boolean;
15
16
  }
package/src/generators/storybook-configuration/schema.json CHANGED
@@ -76,8 +76,13 @@
76
76
  },
77
77
  "configureTestRunner": {
78
78
  "type": "boolean",
79
- "description": "Add a Storybook Test-Runner target.",
80
- "x-prompt": "Add a Storybook Test-Runner target?"
79
+ "description": "Add a Storybook Test-Runner target."
80
+ },
81
+ "bundler": {
82
+ "description": "The Storybook builder to use.",
83
+ "enum": ["vite", "webpack"],
84
+ "x-prompt": "Which Storybook builder do you want to use?",
85
+ "default": "webpack"
81
86
  }
82
87
  },
83
88
  "required": ["name"],
package/src/utils/lint.d.ts CHANGED
@@ -8,4 +8,27 @@ export declare const extraEslintDependencies: {
8
8
  'eslint-plugin-react-hooks': string;
9
9
  };
10
10
  };
11
+ export declare const extendReactEslintJson: (json: Linter.Config) => {
12
+ ignorePatterns?: string | string[];
13
+ root?: boolean;
14
+ $schema?: string;
15
+ env?: {
16
+ [name: string]: boolean;
17
+ };
18
+ globals?: {
19
+ [name: string]: boolean | "readonly" | "readable" | "writable" | "writeable";
20
+ };
21
+ noInlineConfig?: boolean;
22
+ overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
23
+ parser?: string;
24
+ parserOptions?: Linter.ParserOptions;
25
+ plugins?: string[];
26
+ processor?: string;
27
+ reportUnusedDisableDirectives?: boolean;
28
+ settings?: {
29
+ [name: string]: any;
30
+ };
31
+ rules?: Partial<Linter.RulesRecord>;
32
+ extends: string[];
33
+ };
11
34
  export declare const createReactEslintJson: (projectRoot: string, setParserOptionsProject: boolean) => Linter.Config;
package/src/utils/lint.js CHANGED
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createReactEslintJson = exports.extraEslintDependencies = void 0;
3
+ exports.createReactEslintJson = exports.extendReactEslintJson = exports.extraEslintDependencies = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const devkit_1 = require("@nrwl/devkit");
5
6
  const versions_1 = require("./versions");
6
7
  exports.extraEslintDependencies = {
@@ -12,6 +13,11 @@ exports.extraEslintDependencies = {
12
13
  'eslint-plugin-react-hooks': versions_1.eslintPluginReactHooksVersion,
13
14
  },
14
15
  };
16
+ const extendReactEslintJson = (json) => {
17
+ const { extends: pluginExtends } = json, config = tslib_1.__rest(json, ["extends"]);
18
+ return Object.assign({ extends: ['plugin:@nrwl/nx/react', ...(pluginExtends || [])] }, config);
19
+ };
20
+ exports.extendReactEslintJson = extendReactEslintJson;
15
21
  const createReactEslintJson = (projectRoot, setParserOptionsProject) => ({
16
22
  extends: [
17
23
  'plugin:@nrwl/nx/react',
package/src/utils/lint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/lint.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAE9C,yCAKoB;AAEP,QAAA,uBAAuB,GAAG;IACrC,YAAY,EAAE,EAAE;IAChB,eAAe,EAAE;QACf,sBAAsB,EAAE,oCAAyB;QACjD,wBAAwB,EAAE,qCAA0B;QACpD,qBAAqB,EAAE,mCAAwB;QAC/C,2BAA2B,EAAE,wCAA6B;KAC3D;CACF,CAAC;AAEK,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,uBAAgC,EACjB,EAAE,CAAC,CAAC;IACnB,OAAO,EAAE;QACP,uBAAuB;QACvB,GAAG,IAAA,uBAAc,EAAC,WAAW,CAAC,gBAAgB;KAC/C;IACD,cAAc,EAAE,CAAC,OAAO,CAAC;IACzB,SAAS,EAAE;QACT;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;YACzC;;;;;;;;;;;;eAYG;YACH,aAAa,EAAE,CAAC,uBAAuB;gBACrC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC;oBACE,OAAO,EAAE,CAAC,GAAG,WAAW,mBAAmB,CAAC;iBAC7C;YACL;;;eAGG;YACH,KAAK,EAAE,EAAE;SACV;QACD;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACxB,KAAK,EAAE,EAAE;SACV;QACD;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACxB,KAAK,EAAE,EAAE;SACV;KACF;CACF,CAAC,CAAC;AA7CU,QAAA,qBAAqB,yBA6C/B"}
1
+ {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../../../../packages/react/src/utils/lint.ts"],"names":[],"mappings":";;;;AAAA,yCAA8C;AAE9C,yCAKoB;AAEP,QAAA,uBAAuB,GAAG;IACrC,YAAY,EAAE,EAAE;IAChB,eAAe,EAAE;QACf,sBAAsB,EAAE,oCAAyB;QACjD,wBAAwB,EAAE,qCAA0B;QACpD,qBAAqB,EAAE,mCAAwB;QAC/C,2BAA2B,EAAE,wCAA6B;KAC3D;CACF,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAmB,EAAE,EAAE;IAC3D,MAAM,EAAE,OAAO,EAAE,aAAa,KAAgB,IAAI,EAAf,MAAM,kBAAK,IAAI,EAA5C,WAAqC,CAAO,CAAC;IAEnD,uBACE,OAAO,EAAE,CAAC,uBAAuB,EAAE,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IACzD,MAAM,EACT;AACJ,CAAC,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAEK,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,uBAAgC,EACjB,EAAE,CAAC,CAAC;IACnB,OAAO,EAAE;QACP,uBAAuB;QACvB,GAAG,IAAA,uBAAc,EAAC,WAAW,CAAC,gBAAgB;KAC/C;IACD,cAAc,EAAE,CAAC,OAAO,CAAC;IACzB,SAAS,EAAE;QACT;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC;YACzC;;;;;;;;;;;;eAYG;YACH,aAAa,EAAE,CAAC,uBAAuB;gBACrC,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC;oBACE,OAAO,EAAE,CAAC,GAAG,WAAW,mBAAmB,CAAC;iBAC7C;YACL;;;eAGG;YACH,KAAK,EAAE,EAAE;SACV;QACD;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACxB,KAAK,EAAE,EAAE;SACV;QACD;YACE,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YACxB,KAAK,EAAE,EAAE;SACV;KACF;CACF,CAAC,CAAC;AA7CU,QAAA,qBAAqB,yBA6C/B"}
package/src/generators/library/files/lib/package.json__tmpl__ DELETED
@@ -1,4 +0,0 @@
1
- {
2
- "name": "<%= name %>",
3
- "version": "0.0.1"
4
- }