@nrwl/react 15.2.1 → 15.3.0-beta.0

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 (77) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/generators.json +14 -0
  3. package/migrations.json +69 -0
  4. package/module-federation.d.ts +2 -0
  5. package/module-federation.js +4 -1
  6. package/module-federation.js.map +1 -1
  7. package/package.json +12 -11
  8. package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +4 -3
  9. package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
  10. package/src/generators/application/application.js +27 -2
  11. package/src/generators/application/application.js.map +1 -1
  12. package/src/generators/application/files/common-vite/index.html +15 -0
  13. package/src/generators/application/files/common-vite/public/.gitkeep +0 -0
  14. package/src/generators/application/files/common-vite/src/app/__fileName__.spec.tsx__tmpl__ +26 -0
  15. package/src/generators/application/files/common-vite/src/app/nx-welcome.tsx +820 -0
  16. package/src/generators/application/files/common-vite/src/assets/.gitkeep +0 -0
  17. package/src/generators/application/files/common-vite/src/environments/environment.prod.ts__tmpl__ +3 -0
  18. package/src/generators/application/files/common-vite/src/environments/environment.ts__tmpl__ +6 -0
  19. package/src/generators/application/files/common-vite/src/favicon.ico +0 -0
  20. package/src/generators/application/files/common-vite/src/main.tsx__tmpl__ +10 -0
  21. package/src/generators/application/files/common-vite/src/polyfills.ts__tmpl__ +7 -0
  22. package/src/generators/application/files/common-vite/tsconfig.app.json__tmpl__ +14 -0
  23. package/src/generators/application/files/common-vite/tsconfig.json__tmpl__ +29 -0
  24. package/src/generators/application/lib/add-project.js +7 -4
  25. package/src/generators/application/lib/add-project.js.map +1 -1
  26. package/src/generators/application/lib/create-application-files.js +14 -2
  27. package/src/generators/application/lib/create-application-files.js.map +1 -1
  28. package/src/generators/application/lib/normalize-options.js +6 -2
  29. package/src/generators/application/lib/normalize-options.js.map +1 -1
  30. package/src/generators/application/lib/update-jest-config.d.ts +1 -1
  31. package/src/generators/application/lib/update-jest-config.js +7 -4
  32. package/src/generators/application/lib/update-jest-config.js.map +1 -1
  33. package/src/generators/application/schema.d.ts +3 -1
  34. package/src/generators/application/schema.json +14 -2
  35. package/src/generators/cypress-component-configuration/lib/update-configs.js +4 -1
  36. package/src/generators/cypress-component-configuration/lib/update-configs.js.map +1 -1
  37. package/src/generators/host/host.js +3 -1
  38. package/src/generators/host/host.js.map +1 -1
  39. package/src/generators/host/schema.d.ts +1 -1
  40. package/src/generators/init/schema.d.ts +1 -1
  41. package/src/generators/library/library.js +11 -1
  42. package/src/generators/library/library.js.map +1 -1
  43. package/src/generators/library/schema.d.ts +2 -1
  44. package/src/generators/library/schema.json +6 -1
  45. package/src/generators/remote/remote.js +3 -1
  46. package/src/generators/remote/remote.js.map +1 -1
  47. package/src/generators/remote/schema.d.ts +1 -1
  48. package/src/generators/setup-ssr/files/server.ts__tmpl__ +24 -0
  49. package/src/generators/setup-ssr/files/src/main.server.tsx__tmpl__ +47 -0
  50. package/src/generators/setup-ssr/files/tsconfig.server.json__tmpl__ +14 -0
  51. package/src/generators/setup-ssr/schema.d.ts +6 -0
  52. package/src/generators/setup-ssr/schema.json +36 -0
  53. package/src/generators/setup-ssr/setup-ssr.d.ts +5 -0
  54. package/src/generators/setup-ssr/setup-ssr.js +127 -0
  55. package/src/generators/setup-ssr/setup-ssr.js.map +1 -0
  56. package/src/migrations/update-13-0-0/webpack5-changes-utils.js +3 -3
  57. package/src/migrations/update-13-0-0/webpack5-changes-utils.js.map +1 -1
  58. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js +3 -3
  59. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js.map +1 -1
  60. package/src/module-federation/ast-utils.js +3 -3
  61. package/src/module-federation/ast-utils.js.map +1 -1
  62. package/src/module-federation/utils.d.ts +10 -0
  63. package/src/module-federation/utils.js +34 -0
  64. package/src/module-federation/utils.js.map +1 -0
  65. package/src/module-federation/with-module-federation-ssr.d.ts +2 -0
  66. package/src/module-federation/with-module-federation-ssr.js +48 -0
  67. package/src/module-federation/with-module-federation-ssr.js.map +1 -0
  68. package/src/module-federation/with-module-federation.js +2 -22
  69. package/src/module-federation/with-module-federation.js.map +1 -1
  70. package/src/utils/ast-utils.js +28 -28
  71. package/src/utils/ast-utils.js.map +1 -1
  72. package/src/utils/versions.d.ts +18 -15
  73. package/src/utils/versions.js +19 -16
  74. package/src/utils/versions.js.map +1 -1
  75. package/src/utils/async-iterator.d.ts +0 -5
  76. package/src/utils/async-iterator.js +0 -76
  77. package/src/utils/async-iterator.js.map +0 -1
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.2.1](https://github.com/nrwl/nx/compare/15.2.0...15.2.1) (2022-11-19)
6
+ # [15.3.0-beta.0](https://github.com/nrwl/nx/compare/15.2.0...15.3.0-beta.0) (2022-11-24)
7
7
 
8
8
  **Note:** Version bump only for package @nrwl/react
package/generators.json CHANGED
@@ -95,6 +95,13 @@
95
95
  "schema": "./src/generators/setup-tailwind/schema.json",
96
96
  "description": "Set up Tailwind configuration for a project.",
97
97
  "hidden": false
98
+ },
99
+
100
+ "setup-ssr": {
101
+ "factory": "./src/generators/setup-ssr/setup-ssr#setupSsrSchematic",
102
+ "schema": "./src/generators/setup-ssr/schema.json",
103
+ "description": "Set up SSR configuration for a project.",
104
+ "hidden": false
98
105
  }
99
106
  },
100
107
  "generators": {
@@ -204,6 +211,13 @@
204
211
  "schema": "./src/generators/setup-tailwind/schema.json",
205
212
  "description": "Set up Tailwind configuration for a project.",
206
213
  "hidden": false
214
+ },
215
+
216
+ "setup-ssr": {
217
+ "factory": "./src/generators/setup-ssr/setup-ssr#setupSsrGenerator",
218
+ "schema": "./src/generators/setup-ssr/schema.json",
219
+ "description": "Set up SSR configuration for a project.",
220
+ "hidden": false
207
221
  }
208
222
  }
209
223
  }
package/migrations.json CHANGED
@@ -699,6 +699,75 @@
699
699
  "alwaysAddToPackageJson": false
700
700
  }
701
701
  }
702
+ },
703
+ "15.2.2-beta.0": {
704
+ "version": "15.2.2-beta.0",
705
+ "packages": {
706
+ "@types/react": {
707
+ "version": "18.0.25",
708
+ "alwaysAddToPackageJson": false
709
+ },
710
+ "@types/react-dom": {
711
+ "version": "18.0.9",
712
+ "alwaysAddToPackageJson": false
713
+ },
714
+ "@types/node": {
715
+ "version": "18.11.9",
716
+ "alwaysAddToPackageJson": false
717
+ },
718
+ "styled-components": {
719
+ "version": "5.3.6",
720
+ "alwaysAddToPackageJson": false
721
+ },
722
+ "@emotion/styled": {
723
+ "version": "11.10.5",
724
+ "alwaysAddToPackageJson": false
725
+ },
726
+ "@emotion/react": {
727
+ "version": "11.10.5",
728
+ "alwaysAddToPackageJson": false
729
+ },
730
+ "@emotion/babel-plugin": {
731
+ "version": "11.10.5",
732
+ "alwaysAddToPackageJson": false
733
+ },
734
+ "styled-jsx": {
735
+ "version": "5.1.0",
736
+ "alwaysAddToPackageJson": false
737
+ },
738
+ "react-router-dom": {
739
+ "version": "6.4.3",
740
+ "alwaysAddToPackageJson": false
741
+ },
742
+ "@reduxjs/toolkit": {
743
+ "version": "1.9.0",
744
+ "alwaysAddToPackageJson": false
745
+ },
746
+ "react-redux": {
747
+ "version": "8.0.5",
748
+ "alwaysAddToPackageJson": false
749
+ },
750
+ "eslint-plugin-react": {
751
+ "version": "7.31.11",
752
+ "alwaysAddToPackageJson": false
753
+ },
754
+ "postcss": {
755
+ "version": "8.4.19",
756
+ "alwaysAddToPackageJson": false
757
+ },
758
+ "tailwindcss": {
759
+ "version": "3.2.4",
760
+ "alwaysAddToPackageJson": false
761
+ },
762
+ "autoprefixer": {
763
+ "version": "10.4.13",
764
+ "alwaysAddToPackageJson": false
765
+ },
766
+ "@types/express": {
767
+ "version": "4.17.14",
768
+ "alwaysAddToPackageJson": false
769
+ }
770
+ }
702
771
  }
703
772
  }
704
773
  }
@@ -1,2 +1,4 @@
1
1
  import { withModuleFederation } from './src/module-federation/with-module-federation';
2
+ import { withModuleFederationForSSR } from './src/module-federation/with-module-federation-ssr';
2
3
  export { withModuleFederation };
4
+ export { withModuleFederationForSSR };
@@ -1,10 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.withModuleFederation = void 0;
3
+ exports.withModuleFederationForSSR = exports.withModuleFederation = void 0;
4
4
  const with_module_federation_1 = require("./src/module-federation/with-module-federation");
5
5
  Object.defineProperty(exports, "withModuleFederation", { enumerable: true, get: function () { return with_module_federation_1.withModuleFederation; } });
6
+ const with_module_federation_ssr_1 = require("./src/module-federation/with-module-federation-ssr");
7
+ Object.defineProperty(exports, "withModuleFederationForSSR", { enumerable: true, get: function () { return with_module_federation_ssr_1.withModuleFederationForSSR; } });
6
8
  // Support for older generated code: `const withModuleFederation = require('@nrwl/react/module-federation')`
7
9
  module.exports = with_module_federation_1.withModuleFederation;
8
10
  // Allow newer generated code to work: `const { withModuleFederation } = require(...)`;
9
11
  module.exports.withModuleFederation = with_module_federation_1.withModuleFederation;
12
+ module.exports.withModuleFederationForSSR = with_module_federation_ssr_1.withModuleFederationForSSR;
10
13
  //# sourceMappingURL=module-federation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"module-federation.js","sourceRoot":"","sources":["../../../packages/react/module-federation.ts"],"names":[],"mappings":";;;AAAA,2FAAsF;AAE7E,qGAFA,6CAAoB,OAEA;AAE7B,4GAA4G;AAC5G,MAAM,CAAC,OAAO,GAAG,6CAAoB,CAAC;AACtC,uFAAuF;AACvF,MAAM,CAAC,OAAO,CAAC,oBAAoB,GAAG,6CAAoB,CAAC"}
1
+ {"version":3,"file":"module-federation.js","sourceRoot":"","sources":["../../../packages/react/module-federation.ts"],"names":[],"mappings":";;;AAAA,2FAAsF;AAG7E,qGAHA,6CAAoB,OAGA;AAF7B,mGAAgG;AAGvF,2GAHA,uDAA0B,OAGA;AAEnC,4GAA4G;AAC5G,MAAM,CAAC,OAAO,GAAG,6CAAoB,CAAC;AAEtC,uFAAuF;AACvF,MAAM,CAAC,OAAO,CAAC,oBAAoB,GAAG,6CAAoB,CAAC;AAC3D,MAAM,CAAC,OAAO,CAAC,0BAA0B,GAAG,uDAA0B,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/react",
3
- "version": "15.2.1",
3
+ "version": "15.3.0-beta.0",
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,15 +33,16 @@
33
33
  "dependencies": {
34
34
  "@babel/core": "^7.15.0",
35
35
  "@babel/preset-react": "^7.14.5",
36
- "@nrwl/cypress": "15.2.1",
37
- "@nrwl/devkit": "15.2.1",
38
- "@nrwl/jest": "15.2.1",
39
- "@nrwl/js": "15.2.1",
40
- "@nrwl/linter": "15.2.1",
41
- "@nrwl/storybook": "15.2.1",
42
- "@nrwl/web": "15.2.1",
43
- "@nrwl/webpack": "15.2.1",
44
- "@nrwl/workspace": "15.2.1",
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",
45
46
  "@phenomnomnominal/tsquery": "4.1.1",
46
47
  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
47
48
  "@svgr/webpack": "^6.1.2",
@@ -61,5 +62,5 @@
61
62
  "access": "public"
62
63
  },
63
64
  "types": "./index.d.ts",
64
- "gitHead": "87b2b5c085b665e784e9effcdbfe1d6497e9d78a"
65
+ "gitHead": "61f6e2d7287beaac1993e32f3fe18703d2c63e41"
65
66
  }
@@ -5,7 +5,8 @@ const devkit_1 = require("@nrwl/devkit");
5
5
  const dev_server_impl_1 = require("@nrwl/webpack/src/executors/dev-server/dev-server.impl");
6
6
  const path_1 = require("path");
7
7
  const chalk = require("chalk");
8
- const async_iterator_1 = require("../../utils/async-iterator");
8
+ const combine_async_iteratable_iterators_1 = require("@nrwl/js/src/utils/async-iterable/combine-async-iteratable-iterators");
9
+ const tap_async_iteratable_1 = require("@nrwl/js/src/utils/async-iterable/tap-async-iteratable");
9
10
  function moduleFederationDevServer(options, context) {
10
11
  var _a, _b;
11
12
  return tslib_1.__asyncGenerator(this, arguments, function* moduleFederationDevServer_1() {
@@ -30,7 +31,7 @@ function moduleFederationDevServer(options, context) {
30
31
  for (const app of knownRemotes) {
31
32
  const [appName] = Array.isArray(app) ? app : [app];
32
33
  const isDev = devServeApps.includes(appName);
33
- iter = (0, async_iterator_1.combineAsyncIterators)(iter, yield tslib_1.__await((0, devkit_1.runExecutor)({
34
+ iter = (0, combine_async_iteratable_iterators_1.combineAsyncIterableIterators)(iter, yield tslib_1.__await((0, devkit_1.runExecutor)({
34
35
  project: appName,
35
36
  target: isDev ? 'serve' : 'serve-static',
36
37
  configuration: context.configurationName,
@@ -39,7 +40,7 @@ function moduleFederationDevServer(options, context) {
39
40
  }, context)));
40
41
  }
41
42
  let numAwaiting = knownRemotes.length + 1; // remotes + host
42
- return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterator_1.tapAsyncIterator)(iter, (x) => {
43
+ return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, tap_async_iteratable_1.tapAsyncIterator)(iter, (x) => {
43
44
  var _a, _b;
44
45
  numAwaiting--;
45
46
  if (numAwaiting === 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AACpE,4FAAuF;AAEvF,+BAA4B;AAC5B,+BAA+B;AAC/B,+DAGoC;AAOpC,SAA+B,yBAAyB,CACtD,OAAyC,EACzC,OAAwB;;;QAExB,IAAI,IAAI,GAAG,IAAA,yBAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;QAEF,IAAI,sBAA2B,CAAC;QAChC,IAAI;YACF,sBAAsB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;SAC9D;QAAC,WAAM;YACN,kCAAkC;YAClC,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,uDAAuD,CACpG,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,CAAC,MAAA,sBAAsB,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAC7B,CAAC;QAEF,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,UAAU;YACtC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;gBACnC,CAAC,CAAC,OAAO,CAAC,UAAU;gBACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACnD,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,GAAG,IAAA,sCAAqB,EAC1B,IAAI,EACJ,sBAAM,IAAA,oBAAW,EACf;gBACE,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;gBACxC,aAAa,EAAE,OAAO,CAAC,iBAAiB;aACzC,EACD;gBACE,KAAK,EAAE,KAAK;aACb,EACD,OAAO,CACR,CAAA,CACF,CAAC;SACH;QAED,IAAI,WAAW,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,iBAAiB;QAC5D,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,iCAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;;YACzC,WAAW,EAAE,CAAC;YACd,IAAI,WAAW,KAAK,CAAC,EAAE;gBACrB,eAAM,CAAC,IAAI,CACT,KAAK,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,IAC/D,MAAA,OAAO,CAAC,IAAI,mCAAI,IAClB,EAAE,CACH,CAAC;aACH;QACH,CAAC,CAAC,CAAA,CAAA,CAAA,EAAC;;CACJ;AAhED,4CAgEC"}
1
+ {"version":3,"file":"module-federation-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAoE;AACpE,4FAAuF;AAEvF,+BAA4B;AAC5B,+BAA+B;AAC/B,6HAAqH;AACrH,iGAA0F;AAO1F,SAA+B,yBAAyB,CACtD,OAAyC,EACzC,OAAwB;;;QAExB,IAAI,IAAI,GAAG,IAAA,yBAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,0BAA0B,GAAG,IAAA,WAAI,EACrC,OAAO,CAAC,IAAI,EACZ,CAAC,CAAC,IAAI,EACN,6BAA6B,CAC9B,CAAC;QAEF,IAAI,sBAA2B,CAAC;QAChC,IAAI;YACF,sBAAsB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;SAC9D;QAAC,WAAM;YACN,kCAAkC;YAClC,MAAM,IAAI,KAAK,CACb,kBAAkB,0BAA0B,uDAAuD,CACpG,CAAC;SACH;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAA,OAAO,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC;QACzD,MAAM,YAAY,GAAG,CAAC,MAAA,sBAAsB,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,MAAM,CAChE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAC7B,CAAC;QAEF,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,UAAU;YACtC,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;gBACnC,CAAC,CAAC,OAAO,CAAC,UAAU;gBACpB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEzB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;YAC9B,MAAM,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACnD,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,GAAG,IAAA,kEAA6B,EAClC,IAAI,EACJ,sBAAM,IAAA,oBAAW,EACf;gBACE,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;gBACxC,aAAa,EAAE,OAAO,CAAC,iBAAiB;aACzC,EACD;gBACE,KAAK,EAAE,KAAK;aACb,EACD,OAAO,CACR,CAAA,CACF,CAAC;SACH;QAED,IAAI,WAAW,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,iBAAiB;QAC5D,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,uCAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE;;YACzC,WAAW,EAAE,CAAC;YACd,IAAI,WAAW,KAAK,CAAC,EAAE;gBACrB,eAAM,CAAC,IAAI,CACT,KAAK,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,MAAA,OAAO,CAAC,IAAI,mCAAI,WAAW,IAC/D,MAAA,OAAO,CAAC,IAAI,mCAAI,IAClB,EAAE,CACH,CAAC;aACH;QACH,CAAC,CAAC,CAAA,CAAA,CAAA,EAAC;;CACJ;AAhED,4CAgEC"}
@@ -18,6 +18,7 @@ const init_1 = require("../init/init");
18
18
  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
+ const vite_1 = require("@nrwl/vite");
21
22
  function addLinting(host, options) {
22
23
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
23
24
  const tasks = [];
@@ -45,21 +46,45 @@ function addLinting(host, options) {
45
46
  }
46
47
  function applicationGenerator(host, schema) {
47
48
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
49
+ const tasks = [];
48
50
  const options = (0, normalize_options_1.normalizeOptions)(host, schema);
49
51
  const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { skipFormat: true }));
52
+ tasks.push(initTask);
50
53
  (0, create_application_files_1.createApplicationFiles)(host, options);
51
54
  (0, add_project_1.addProject)(host, options);
55
+ if (options.bundler === 'vite') {
56
+ const viteTask = yield (0, vite_1.viteConfigurationGenerator)(host, {
57
+ uiFramework: 'react',
58
+ project: options.projectName,
59
+ newProject: true,
60
+ includeVitest: true,
61
+ });
62
+ tasks.push(viteTask);
63
+ }
64
+ if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
65
+ const vitestTask = yield (0, vite_1.vitestGenerator)(host, {
66
+ uiFramework: 'react',
67
+ project: options.projectName,
68
+ inSourceTests: options.inSourceTests,
69
+ });
70
+ tasks.push(vitestTask);
71
+ }
52
72
  const lintTask = yield addLinting(host, options);
73
+ tasks.push(lintTask);
53
74
  const cypressTask = yield (0, add_cypress_1.addCypress)(host, options);
75
+ tasks.push(cypressTask);
54
76
  const jestTask = yield (0, add_jest_1.addJest)(host, options);
55
- (0, update_jest_config_1.updateJestConfig)(host, options);
77
+ tasks.push(jestTask);
78
+ (0, update_jest_config_1.updateSpecConfig)(host, options);
56
79
  const styledTask = (0, add_styled_dependencies_1.addStyledModuleDependencies)(host, options.styledModule);
80
+ tasks.push(styledTask);
57
81
  const routingTask = (0, add_routing_1.addRouting)(host, options);
82
+ tasks.push(routingTask);
58
83
  (0, set_defaults_1.setDefaults)(host, options);
59
84
  if (!options.skipFormat) {
60
85
  yield (0, devkit_1.formatFiles)(host);
61
86
  }
62
- return (0, run_tasks_in_serial_1.runTasksInSerial)(initTask, lintTask, cypressTask, jestTask, styledTask, routingTask);
87
+ return (0, run_tasks_in_serial_1.runTasksInSerial)(...tasks);
63
88
  });
64
89
  }
65
90
  exports.applicationGenerator = applicationGenerator;
@@ -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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"}
@@ -0,0 +1,15 @@
1
+ <!DOCTYPE html>
2
+ <html lang="en">
3
+ <head>
4
+ <meta charset="utf-8" />
5
+ <title><%= className %></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/main.tsx"></script>
14
+ </body>
15
+ </html>
@@ -0,0 +1,26 @@
1
+ import { render } from '@testing-library/react';
2
+ <% if (routing) { %>
3
+ import { BrowserRouter } from 'react-router-dom';
4
+ <% } %>
5
+
6
+ import App from './<%= fileName %>';
7
+
8
+ describe('App', () => {
9
+ it('should render successfully', () => {
10
+ <% if (routing) { %>
11
+ const { baseElement } = render(<BrowserRouter><App /></BrowserRouter>);
12
+ <% } else { %>
13
+ const { baseElement } = render(<App />);
14
+ <% } %>
15
+ expect(baseElement).toBeTruthy();
16
+ });
17
+
18
+ it('should have a greeting as the title', () => {
19
+ <% if (routing) { %>
20
+ const { getByText } = render(<BrowserRouter><App /></BrowserRouter>);
21
+ <% } else { %>
22
+ const { getByText } = render(<App />);
23
+ <% } %>
24
+ expect(getByText(/Welcome <%= projectName %>/gi)).toBeTruthy();
25
+ });
26
+ });