@nrwl/react 13.10.3 → 14.0.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 (116) hide show
  1. package/README.md +1 -1
  2. package/executors.json +8 -8
  3. package/generators.json +8 -24
  4. package/index.d.ts +1 -2
  5. package/index.js +3 -5
  6. package/index.js.map +1 -1
  7. package/migrations.json +63 -0
  8. package/module-federation.d.ts +3 -3
  9. package/module-federation.js +3 -3
  10. package/module-federation.js.map +1 -1
  11. package/package.json +9 -9
  12. package/plugins/jest.js +22 -1
  13. package/plugins/jest.js.map +1 -1
  14. package/src/executors/{mfe-dev-server → module-federation-dev-server}/compat.d.ts +0 -0
  15. package/src/executors/module-federation-dev-server/compat.js +6 -0
  16. package/src/executors/module-federation-dev-server/compat.js.map +1 -0
  17. package/src/executors/{mfe-dev-server/mfe-dev-server.impl.d.ts → module-federation-dev-server/module-federation-dev-server.impl.d.ts} +3 -3
  18. package/src/executors/{mfe-dev-server/mfe-dev-server.impl.js → module-federation-dev-server/module-federation-dev-server.impl.js} +22 -21
  19. package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -0
  20. package/src/executors/{mfe-dev-server → module-federation-dev-server}/schema.json +8 -8
  21. package/src/generators/application/files/common/src/main.tsx__tmpl__ +2 -2
  22. package/src/generators/application/lib/add-project.js +10 -0
  23. package/src/generators/application/lib/add-project.js.map +1 -1
  24. package/src/generators/component/files/__fileName__.tsx__tmpl__ +2 -2
  25. package/src/generators/hook/files/{__fileName__.spec.ts__tmpl__ → __fileName__.spec.tsx__tmpl__} +17 -15
  26. package/src/generators/hook/hook.js +1 -0
  27. package/src/generators/hook/hook.js.map +1 -1
  28. package/src/generators/{mfe-host → host}/files/common/src/app/__fileName__.tsx__tmpl__ +5 -5
  29. package/src/generators/{mfe-host/files/mfe/mfe.config.js__tmpl__ → host/files/module-federation/module-federation.config.js__tmpl__} +0 -0
  30. package/src/generators/{mfe-host/files/mfe → host/files/module-federation}/src/main.ts__tmpl__ +0 -0
  31. package/src/generators/{mfe-host/files/mfe → host/files/module-federation}/src/remotes.d.ts__tmpl__ +0 -0
  32. package/src/generators/{mfe-host/files/mfe → host/files/module-federation}/webpack.config.js__tmpl__ +2 -2
  33. package/src/generators/{mfe-host/files/mfe → host/files/module-federation}/webpack.config.prod.js__tmpl__ +2 -2
  34. package/src/generators/host/host.d.ts +4 -0
  35. package/src/generators/{mfe-host/mfe-host.js → host/host.js} +14 -14
  36. package/src/generators/host/host.js.map +1 -0
  37. package/src/generators/host/lib/add-module-federation-files.d.ts +5 -0
  38. package/src/generators/{mfe-host/lib/add-mfe-files.js → host/lib/add-module-federation-files.js} +5 -5
  39. package/src/generators/host/lib/add-module-federation-files.js.map +1 -0
  40. package/src/generators/host/lib/update-module-federation-e2e-project.d.ts +3 -0
  41. package/src/generators/{mfe-host/lib/update-mfe-e2e-project.js → host/lib/update-module-federation-e2e-project.js} +4 -4
  42. package/src/generators/host/lib/update-module-federation-e2e-project.js.map +1 -0
  43. package/src/generators/{mfe-host → host}/schema.d.ts +0 -0
  44. package/src/generators/{mfe-host → host}/schema.json +1 -1
  45. package/src/generators/init/init.js +1 -1
  46. package/src/generators/init/init.js.map +1 -1
  47. package/src/generators/init/schema.json +1 -1
  48. package/src/generators/library/schema.json +1 -1
  49. package/src/generators/{mfe-remote/files/mfe/mfe.config.js__tmpl__ → remote/files/module-federation/module-federation.config.js__tmpl__} +0 -0
  50. package/src/generators/{mfe-remote/files/mfe → remote/files/module-federation}/src/main.ts__tmpl__ +0 -0
  51. package/src/generators/{mfe-remote/files/mfe → remote/files/module-federation}/src/remote-entry.ts__tmpl__ +0 -0
  52. package/src/generators/{mfe-remote/files/mfe → remote/files/module-federation}/webpack.config.js__tmpl__ +2 -2
  53. package/src/generators/{mfe-remote/files/mfe → remote/files/module-federation}/webpack.config.prod.js__tmpl__ +0 -0
  54. package/src/generators/{mfe-remote → remote}/lib/update-host-with-remote.d.ts +0 -0
  55. package/src/generators/{mfe-remote → remote}/lib/update-host-with-remote.js +13 -13
  56. package/src/generators/remote/lib/update-host-with-remote.js.map +1 -0
  57. package/src/generators/remote/remote.d.ts +6 -0
  58. package/src/generators/{mfe-remote/mfe-remote.js → remote/remote.js} +11 -11
  59. package/src/generators/remote/remote.js.map +1 -0
  60. package/src/generators/{mfe-remote → remote}/schema.d.ts +0 -0
  61. package/src/generators/{mfe-remote → remote}/schema.json +1 -1
  62. package/src/migrations/update-14-0-0/add-default-development-configurations.d.ts +3 -0
  63. package/src/migrations/update-14-0-0/add-default-development-configurations.js +38 -0
  64. package/src/migrations/update-14-0-0/add-default-development-configurations.js.map +1 -0
  65. package/src/migrations/update-14-0-0/replace-testing-library-react-hook.d.ts +3 -0
  66. package/src/migrations/update-14-0-0/replace-testing-library-react-hook.js +27 -0
  67. package/src/migrations/update-14-0-0/replace-testing-library-react-hook.js.map +1 -0
  68. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.d.ts +5 -0
  69. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js +69 -0
  70. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js.map +1 -0
  71. package/src/{mfe/mfe-ast-utils.d.ts → module-federation/ast-utils.d.ts} +1 -1
  72. package/src/{mfe/mfe-ast-utils.js → module-federation/ast-utils.js} +5 -5
  73. package/src/module-federation/ast-utils.js.map +1 -0
  74. package/src/module-federation/load-config.d.ts +3 -0
  75. package/src/module-federation/load-config.js +17 -0
  76. package/src/module-federation/load-config.js.map +1 -0
  77. package/src/module-federation/models.d.ts +18 -0
  78. package/src/module-federation/models.js +3 -0
  79. package/src/module-federation/models.js.map +1 -0
  80. package/src/{mfe → module-federation}/webpack-utils.d.ts +1 -6
  81. package/src/{mfe → module-federation}/webpack-utils.js +2 -2
  82. package/src/module-federation/webpack-utils.js.map +1 -0
  83. package/src/module-federation/with-module-federation.d.ts +2 -0
  84. package/src/{mfe → module-federation}/with-module-federation.js +1 -1
  85. package/src/module-federation/with-module-federation.js.map +1 -0
  86. package/src/rules/{update-mfe-project.d.ts → update-module-federation-project.d.ts} +1 -1
  87. package/src/rules/update-module-federation-project.js +32 -0
  88. package/src/rules/update-module-federation-project.js.map +1 -0
  89. package/src/utils/ast-utils.js +5 -7
  90. package/src/utils/ast-utils.js.map +1 -1
  91. package/src/utils/versions.d.ts +6 -6
  92. package/src/utils/versions.js +8 -8
  93. package/src/utils/versions.js.map +1 -1
  94. package/src/executors/mfe-dev-server/compat.js +0 -6
  95. package/src/executors/mfe-dev-server/compat.js.map +0 -1
  96. package/src/executors/mfe-dev-server/mfe-dev-server.impl.js.map +0 -1
  97. package/src/generators/mfe-host/lib/add-mfe-files.d.ts +0 -5
  98. package/src/generators/mfe-host/lib/add-mfe-files.js.map +0 -1
  99. package/src/generators/mfe-host/lib/update-mfe-e2e-project.d.ts +0 -3
  100. package/src/generators/mfe-host/lib/update-mfe-e2e-project.js.map +0 -1
  101. package/src/generators/mfe-host/mfe-host.d.ts +0 -4
  102. package/src/generators/mfe-host/mfe-host.js.map +0 -1
  103. package/src/generators/mfe-remote/lib/update-host-with-remote.js.map +0 -1
  104. package/src/generators/mfe-remote/mfe-remote.d.ts +0 -6
  105. package/src/generators/mfe-remote/mfe-remote.js.map +0 -1
  106. package/src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6.d.ts +0 -5
  107. package/src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6.js +0 -16
  108. package/src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6.js.map +0 -1
  109. package/src/generators/storybook-migrate-defaults-5-to-6/schema.d.ts +0 -5
  110. package/src/generators/storybook-migrate-defaults-5-to-6/schema.json +0 -29
  111. package/src/mfe/mfe-ast-utils.js.map +0 -1
  112. package/src/mfe/webpack-utils.js.map +0 -1
  113. package/src/mfe/with-module-federation.d.ts +0 -14
  114. package/src/mfe/with-module-federation.js.map +0 -1
  115. package/src/rules/update-mfe-project.js +0 -14
  116. package/src/rules/update-mfe-project.js.map +0 -1
package/README.md CHANGED
@@ -79,6 +79,6 @@ A few links to help you get started:
79
79
  - [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
80
80
  - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
81
81
 
82
- <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
82
+ <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
83
83
  width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
84
84
 
package/executors.json CHANGED
@@ -1,16 +1,16 @@
1
1
  {
2
2
  "builders": {
3
- "mfe-dev-server": {
4
- "implementation": "./src/executors/mfe-dev-server/compat",
5
- "schema": "./src/executors/mfe-dev-server/schema.json",
6
- "description": "Serve an MFE host or remote application."
3
+ "module-federation-dev-server": {
4
+ "implementation": "./src/executors/module-federation-dev-server/compat",
5
+ "schema": "./src/executors/module-federation-dev-server/schema.json",
6
+ "description": "Serve a host or remote application."
7
7
  }
8
8
  },
9
9
  "executors": {
10
- "mfe-dev-server": {
11
- "implementation": "./src/executors/mfe-dev-server/mfe-dev-server.impl",
12
- "schema": "./src/executors/mfe-dev-server/schema.json",
13
- "description": "Serve an MFE host or remote application."
10
+ "module-federation-dev-server": {
11
+ "implementation": "./src/executors/module-federation-dev-server/module-federation-dev-server.impl",
12
+ "schema": "./src/executors/module-federation-dev-server/schema.json",
13
+ "description": "Serve a host or remote application."
14
14
  }
15
15
  }
16
16
  }
package/generators.json CHANGED
@@ -48,13 +48,6 @@
48
48
  "hidden": false
49
49
  },
50
50
 
51
- "storybook-migrate-defaults-5-to-6": {
52
- "factory": "./src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6#storybookMigration5to6Schematic",
53
- "schema": "./src/generators/storybook-migrate-defaults-5-to-6/schema.json",
54
- "description": "Generate default Storybook configuration files using Storybook version >=6.x specs, for projects that already have Storybook instances and configurations of versions <6.x.",
55
- "hidden": false
56
- },
57
-
58
51
  "component-story": {
59
52
  "factory": "./src/generators/component-story/component-story#componentStorySchematic",
60
53
  "schema": "./src/generators/component-story/schema.json",
@@ -129,13 +122,6 @@
129
122
  "hidden": false
130
123
  },
131
124
 
132
- "storybook-migrate-defaults-5-to-6": {
133
- "factory": "./src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6#storybookMigration5to6Generator",
134
- "schema": "./src/generators/storybook-migrate-defaults-5-to-6/schema.json",
135
- "description": "Generate default Storybook configuration files using Storybook version `>=6.x` specs, for projects that already have Storybook instances and configurations of versions `<6.x`.",
136
- "hidden": false
137
- },
138
-
139
125
  "component-story": {
140
126
  "factory": "./src/generators/component-story/component-story#componentStoryGenerator",
141
127
  "schema": "./src/generators/component-story/schema.json",
@@ -164,18 +150,16 @@
164
150
  "aliases": "c"
165
151
  },
166
152
 
167
- "mfe-host": {
168
- "factory": "./src/generators/mfe-host/mfe-host#mfeHostGenerator",
169
- "schema": "./src/generators/mfe-host/schema.json",
170
- "description": "Generate a host react application",
171
- "aliases": "host"
153
+ "host": {
154
+ "factory": "./src/generators/host/host#hostGenerator",
155
+ "schema": "./src/generators/host/schema.json",
156
+ "description": "Generate a host react application"
172
157
  },
173
158
 
174
- "mfe-remote": {
175
- "factory": "./src/generators/mfe-remote/mfe-remote#mfeRemoteGenerator",
176
- "schema": "./src/generators/mfe-remote/schema.json",
177
- "description": "Generate a remote react application",
178
- "aliases": "remote"
159
+ "remote": {
160
+ "factory": "./src/generators/remote/remote#remoteGenerator",
161
+ "schema": "./src/generators/remote/schema.json",
162
+ "description": "Generate a remote react application"
179
163
  }
180
164
  }
181
165
  }
package/index.d.ts CHANGED
@@ -12,6 +12,5 @@ export { reactInitGenerator } from './src/generators/init/init';
12
12
  export { reduxGenerator } from './src/generators/redux/redux';
13
13
  export { storiesGenerator } from './src/generators/stories/stories';
14
14
  export { storybookConfigurationGenerator } from './src/generators/storybook-configuration/configuration';
15
- export { storybookMigration5to6Generator } from './src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6';
16
- export { mfeHostGenerator } from './src/generators/mfe-host/mfe-host';
15
+ export { hostGenerator } from './src/generators/host/host';
17
16
  export type { SupportedStyles } from './typings/style';
package/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.mfeHostGenerator = exports.storybookMigration5to6Generator = exports.storybookConfigurationGenerator = exports.storiesGenerator = exports.reduxGenerator = exports.reactInitGenerator = exports.libraryGenerator = exports.componentStoryGenerator = exports.componentCypressGenerator = exports.hookGenerator = exports.componentGenerator = exports.applicationGenerator = exports.reactVersion = exports.reactDomVersion = exports.assertValidStyle = exports.CSS_IN_JS_DEPENDENCIES = exports.createReactEslintJson = exports.extraEslintDependencies = void 0;
3
+ exports.hostGenerator = exports.storybookConfigurationGenerator = exports.storiesGenerator = exports.reduxGenerator = exports.reactInitGenerator = exports.libraryGenerator = exports.componentStoryGenerator = exports.componentCypressGenerator = exports.hookGenerator = exports.componentGenerator = exports.applicationGenerator = exports.reactVersion = exports.reactDomVersion = exports.assertValidStyle = exports.CSS_IN_JS_DEPENDENCIES = exports.createReactEslintJson = exports.extraEslintDependencies = void 0;
4
4
  var lint_1 = require("./src/utils/lint");
5
5
  Object.defineProperty(exports, "extraEslintDependencies", { enumerable: true, get: function () { return lint_1.extraEslintDependencies; } });
6
6
  Object.defineProperty(exports, "createReactEslintJson", { enumerable: true, get: function () { return lint_1.createReactEslintJson; } });
@@ -31,8 +31,6 @@ var stories_1 = require("./src/generators/stories/stories");
31
31
  Object.defineProperty(exports, "storiesGenerator", { enumerable: true, get: function () { return stories_1.storiesGenerator; } });
32
32
  var configuration_1 = require("./src/generators/storybook-configuration/configuration");
33
33
  Object.defineProperty(exports, "storybookConfigurationGenerator", { enumerable: true, get: function () { return configuration_1.storybookConfigurationGenerator; } });
34
- var migrate_defaults_5_to_6_1 = require("./src/generators/storybook-migrate-defaults-5-to-6/migrate-defaults-5-to-6");
35
- Object.defineProperty(exports, "storybookMigration5to6Generator", { enumerable: true, get: function () { return migrate_defaults_5_to_6_1.storybookMigration5to6Generator; } });
36
- var mfe_host_1 = require("./src/generators/mfe-host/mfe-host");
37
- Object.defineProperty(exports, "mfeHostGenerator", { enumerable: true, get: function () { return mfe_host_1.mfeHostGenerator; } });
34
+ var host_1 = require("./src/generators/host/host");
35
+ Object.defineProperty(exports, "hostGenerator", { enumerable: true, get: function () { return host_1.hostGenerator; } });
38
36
  //# sourceMappingURL=index.js.map
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/react/index.ts"],"names":[],"mappings":";;;AAAA,yCAG0B;AAFxB,+GAAA,uBAAuB,OAAA;AACvB,6GAAA,qBAAqB,OAAA;AAEvB,6CAA4D;AAAnD,gHAAA,sBAAsB,OAAA;AAC/B,mDAAyD;AAAhD,6GAAA,gBAAgB,OAAA;AACzB,iDAAqE;AAA5D,2GAAA,eAAe,OAAA;AAAE,wGAAA,YAAY,OAAA;AACtC,wEAAgF;AAAvE,mHAAA,oBAAoB,OAAA;AAC7B,kEAA0E;AAAjE,+GAAA,kBAAkB,OAAA;AAC3B,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yGAA2G;AAAlG,mIAAA,yBAAyB,OAAA;AAClC,oFAA2F;AAAlF,0HAAA,uBAAuB,OAAA;AAChC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAAgE;AAAvD,0GAAA,kBAAkB,OAAA;AAC3B,sDAA8D;AAArD,uGAAA,cAAc,OAAA;AACvB,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,wFAAyG;AAAhG,gIAAA,+BAA+B,OAAA;AACxC,sHAA6H;AAApH,0IAAA,+BAA+B,OAAA;AACxC,+DAAsE;AAA7D,4GAAA,gBAAgB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/react/index.ts"],"names":[],"mappings":";;;AAAA,yCAG0B;AAFxB,+GAAA,uBAAuB,OAAA;AACvB,6GAAA,qBAAqB,OAAA;AAEvB,6CAA4D;AAAnD,gHAAA,sBAAsB,OAAA;AAC/B,mDAAyD;AAAhD,6GAAA,gBAAgB,OAAA;AACzB,iDAAqE;AAA5D,2GAAA,eAAe,OAAA;AAAE,wGAAA,YAAY,OAAA;AACtC,wEAAgF;AAAvE,mHAAA,oBAAoB,OAAA;AAC7B,kEAA0E;AAAjE,+GAAA,kBAAkB,OAAA;AAC3B,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AACtB,yGAA2G;AAAlG,mIAAA,yBAAyB,OAAA;AAClC,oFAA2F;AAAlF,0HAAA,uBAAuB,OAAA;AAChC,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,mDAAgE;AAAvD,0GAAA,kBAAkB,OAAA;AAC3B,sDAA8D;AAArD,uGAAA,cAAc,OAAA;AACvB,4DAAoE;AAA3D,2GAAA,gBAAgB,OAAA;AACzB,wFAAyG;AAAhG,gIAAA,+BAA+B,OAAA;AACxC,mDAA2D;AAAlD,qGAAA,aAAa,OAAA"}
package/migrations.json CHANGED
@@ -35,6 +35,24 @@
35
35
  "version": "13.10.0-beta.0",
36
36
  "description": "Update to React 18",
37
37
  "factory": "./src/migrations/update-13-10-0/update-13-10-0"
38
+ },
39
+ "update-react-dom-render-14.0.0": {
40
+ "cli": "nx",
41
+ "version": "14.0.0-beta.0",
42
+ "description": "Update to React DOM render call to React 18 API.",
43
+ "factory": "./src/migrations/update-14-0-0/update-react-dom-render-for-v18"
44
+ },
45
+ "replace-testing-library-react-hook-14.0.0": {
46
+ "cli": "nx",
47
+ "version": "14.0.0-beta.0",
48
+ "description": "Replace deprecated '@testing-library/react-hook' package with `renderHook` from '@testing-library/react'.",
49
+ "factory": "./src/migrations/update-14-0-0/replace-testing-library-react-hook"
50
+ },
51
+ "add-default-development-configurations-14.0.0": {
52
+ "cli": "nx",
53
+ "version": "14.0.0-beta.0",
54
+ "description": "Add a default development configuration for build and serve targets.",
55
+ "factory": "./src/migrations/update-14-0-0/add-default-development-configurations"
38
56
  }
39
57
  },
40
58
  "packageJsonUpdates": {
@@ -324,6 +342,51 @@
324
342
  "alwaysAddToPackageJson": false
325
343
  }
326
344
  }
345
+ },
346
+ "14.0.0": {
347
+ "version": "14.0.0-beta.1",
348
+ "packages": {
349
+ "react": {
350
+ "version": "18.0.0",
351
+ "alwaysAddToPackageJson": false
352
+ },
353
+ "react-dom": {
354
+ "version": "18.0.0",
355
+ "alwaysAddToPackageJson": false
356
+ },
357
+ "react-is": {
358
+ "version": "18.0.0",
359
+ "alwaysAddToPackageJson": false
360
+ },
361
+ "react-test-renderer": {
362
+ "version": "18.0.0",
363
+ "alwaysAddToPackageJson": false
364
+ },
365
+ "@types/react": {
366
+ "version": "18.0.1",
367
+ "alwaysAddToPackageJson": false
368
+ },
369
+ "@emotion/babel-plugin": {
370
+ "version": "11.9.2",
371
+ "alwaysAddToPackageJson": false
372
+ },
373
+ "react-router-dom": {
374
+ "version": "6.3.0",
375
+ "alwaysAddToPackageJson": false
376
+ },
377
+ "@types/react-dom": {
378
+ "version": "18.0.0",
379
+ "alwaysAddToPackageJson": false
380
+ },
381
+ "@testing-library/react": {
382
+ "version": "13.1.1",
383
+ "alwaysAddToPackageJson": false
384
+ },
385
+ "react-redux": {
386
+ "version": "8.0.0",
387
+ "alwaysAddToPackageJson": false
388
+ }
389
+ }
327
390
  }
328
391
  }
329
392
  }
@@ -1,4 +1,4 @@
1
- import { withModuleFederation } from './src/mfe/with-module-federation';
2
- export * from './src/mfe/webpack-utils';
3
- export * from './src/mfe/with-module-federation';
1
+ import { withModuleFederation } from './src/module-federation/with-module-federation';
2
+ export * from './src/module-federation/webpack-utils';
3
+ export * from './src/module-federation/with-module-federation';
4
4
  export { withModuleFederation as default };
@@ -2,9 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.default = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const with_module_federation_1 = require("./src/mfe/with-module-federation");
5
+ const with_module_federation_1 = require("./src/module-federation/with-module-federation");
6
6
  Object.defineProperty(exports, "default", { enumerable: true, get: function () { return with_module_federation_1.withModuleFederation; } });
7
- tslib_1.__exportStar(require("./src/mfe/webpack-utils"), exports);
8
- tslib_1.__exportStar(require("./src/mfe/with-module-federation"), exports);
7
+ tslib_1.__exportStar(require("./src/module-federation/webpack-utils"), exports);
8
+ tslib_1.__exportStar(require("./src/module-federation/with-module-federation"), exports);
9
9
  module.exports = with_module_federation_1.withModuleFederation;
10
10
  //# sourceMappingURL=module-federation.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"module-federation.js","sourceRoot":"","sources":["../../../packages/react/module-federation.ts"],"names":[],"mappings":";;;;AAAA,6EAAwE;AAIvC,wFAJxB,6CAAoB,OAIW;AAFxC,kEAAwC;AACxC,2EAAiD;AAGjD,MAAM,CAAC,OAAO,GAAG,6CAAoB,CAAC"}
1
+ {"version":3,"file":"module-federation.js","sourceRoot":"","sources":["../../../packages/react/module-federation.ts"],"names":[],"mappings":";;;;AAAA,2FAAsF;AAIrD,wFAJxB,6CAAoB,OAIW;AAFxC,gFAAsD;AACtD,yFAA+D;AAG/D,MAAM,CAAC,OAAO,GAAG,6CAAoB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/react",
3
- "version": "13.10.3",
3
+ "version": "14.0.0-beta.2",
4
4
  "description": "The React plugin contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -32,14 +32,14 @@
32
32
  "dependencies": {
33
33
  "@babel/core": "^7.15.0",
34
34
  "@babel/preset-react": "^7.14.5",
35
- "@nrwl/cypress": "13.10.3",
36
- "@nrwl/devkit": "13.10.3",
37
- "@nrwl/jest": "13.10.3",
38
- "@nrwl/js": "13.10.3",
39
- "@nrwl/linter": "13.10.3",
40
- "@nrwl/storybook": "13.10.3",
41
- "@nrwl/web": "13.10.3",
42
- "@nrwl/workspace": "13.10.3",
35
+ "@nrwl/cypress": "14.0.0-beta.2",
36
+ "@nrwl/devkit": "14.0.0-beta.2",
37
+ "@nrwl/jest": "14.0.0-beta.2",
38
+ "@nrwl/js": "14.0.0-beta.2",
39
+ "@nrwl/linter": "14.0.0-beta.2",
40
+ "@nrwl/storybook": "14.0.0-beta.2",
41
+ "@nrwl/web": "14.0.0-beta.2",
42
+ "@nrwl/workspace": "14.0.0-beta.2",
43
43
  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
44
44
  "@svgr/webpack": "^6.1.2",
45
45
  "chalk": "4.1.0",
package/plugins/jest.js CHANGED
@@ -2,8 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const path = require("path");
4
4
  const devkit_1 = require("@nrwl/devkit");
5
+ const JS_SOURCE_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs'];
5
6
  module.exports = {
6
- process(src, filename) {
7
+ process(src, filename, options) {
7
8
  const assetFilename = JSON.stringify(path.basename(filename));
8
9
  if (filename.match(/\.svg$/)) {
9
10
  // Based on how SVGR generates a component name:
@@ -27,7 +28,27 @@ module.exports = {
27
28
  }),
28
29
  };`;
29
30
  }
31
+ if (JS_SOURCE_EXTENSIONS.includes(path.extname(filename))) {
32
+ const transformer = getJsTransform();
33
+ if (transformer)
34
+ return transformer.process(src, filename, options);
35
+ }
36
+ // Fallback for unknown extensions
30
37
  return `module.exports = ${assetFilename};`;
31
38
  },
32
39
  };
40
+ function getJsTransform() {
41
+ try {
42
+ return require('babel-jest').default;
43
+ }
44
+ catch (_a) {
45
+ // ignored
46
+ }
47
+ try {
48
+ return require('@swc/jest').createTransformer();
49
+ }
50
+ catch (_b) {
51
+ // ignored
52
+ }
53
+ }
33
54
  //# sourceMappingURL=jest.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jest.js","sourceRoot":"","sources":["../../../../packages/react/plugins/jest.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,yCAAqC;AAErC,MAAM,CAAC,OAAO,GAAG;IACf,OAAO,CAAC,GAAG,EAAE,QAAQ;QACnB,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE9D,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAC5B,gDAAgD;YAChD,kHAAkH;YAClH,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC;YACtE,MAAM,aAAa,GAAG,MAAM,kBAAkB,EAAE,CAAC;YACjD,OAAO;;;mBAGM,aAAa;oDACoB,aAAa;;;;;;;0BAOvC,aAAa;;;;SAI9B,CAAC;SACL;QAED,OAAO,oBAAoB,aAAa,GAAG,CAAC;IAC9C,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"jest.js","sourceRoot":"","sources":["../../../../packages/react/plugins/jest.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,yCAAqC;AAErC,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAE5E,MAAM,CAAC,OAAO,GAAG;IACf,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO;QAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE9D,IAAI,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAC5B,gDAAgD;YAChD,kHAAkH;YAClH,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC;YACtE,MAAM,aAAa,GAAG,MAAM,kBAAkB,EAAE,CAAC;YACjD,OAAO;;;mBAGM,aAAa;oDACoB,aAAa;;;;;;;0BAOvC,aAAa;;;;SAI9B,CAAC;SACL;QAED,IAAI,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE;YACzD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;YACrC,IAAI,WAAW;gBAAE,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SACrE;QAED,kCAAkC;QAClC,OAAO,oBAAoB,aAAa,GAAG,CAAC;IAC9C,CAAC;CACF,CAAC;AAEF,SAAS,cAAc;IACrB,IAAI;QACF,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;KACtC;IAAC,WAAM;QACN,UAAU;KACX;IAED,IAAI;QACF,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,iBAAiB,EAAE,CAAC;KACjD;IAAC,WAAM;QACN,UAAU;KACX;AACH,CAAC"}
@@ -0,0 +1,6 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const devkit_1 = require("@nrwl/devkit");
4
+ const module_federation_dev_server_impl_1 = require("./module-federation-dev-server.impl");
5
+ exports.default = (0, devkit_1.convertNxExecutor)(module_federation_dev_server_impl_1.default);
6
+ //# sourceMappingURL=compat.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/react/src/executors/module-federation-dev-server/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,2FAA4D;AAE5D,kBAAe,IAAA,0BAAiB,EAAC,2CAAS,CAAC,CAAC"}
@@ -1,9 +1,9 @@
1
1
  import { ExecutorContext } from '@nrwl/devkit';
2
2
  import { WebDevServerOptions } from '@nrwl/web/src/executors/dev-server/dev-server.impl';
3
- declare type MFEDevServerOptions = WebDevServerOptions & {
4
- apps?: string[];
3
+ declare type ModuleFederationDevServerOptions = WebDevServerOptions & {
4
+ devRemotes?: string | string[];
5
5
  };
6
- export default function mfeDevServer(options: MFEDevServerOptions, context: ExecutorContext): AsyncGenerator<{
6
+ export default function moduleFederationDevServer(options: ModuleFederationDevServerOptions, context: ExecutorContext): AsyncGenerator<{
7
7
  baseUrl: string;
8
8
  emittedFiles: import("../../../../../build/packages/web/src/utils/run-webpack").EmittedFile[];
9
9
  success: boolean;
@@ -4,39 +4,40 @@ const tslib_1 = require("tslib");
4
4
  const devkit_1 = require("@nrwl/devkit");
5
5
  const dev_server_impl_1 = require("@nrwl/web/src/executors/dev-server/dev-server.impl");
6
6
  const path_1 = require("path");
7
- function mfeDevServer(options, context) {
8
- var _a, _b;
9
- return tslib_1.__asyncGenerator(this, arguments, function* mfeDevServer_1() {
7
+ function moduleFederationDevServer(options, context) {
8
+ var _a;
9
+ return tslib_1.__asyncGenerator(this, arguments, function* moduleFederationDevServer_1() {
10
10
  let iter = (0, dev_server_impl_1.default)(options, context);
11
11
  const p = context.workspace.projects[context.projectName];
12
- const mfeConfigPath = (0, path_1.join)(context.root, p.root, 'mfe.config.js');
13
- let mfeConfig;
12
+ const moduleFederationConfigPath = (0, path_1.join)(context.root, p.root, 'module-federation.config.js');
13
+ let moduleFederationConfig;
14
14
  try {
15
- mfeConfig = require(mfeConfigPath);
15
+ moduleFederationConfig = require(moduleFederationConfigPath);
16
16
  }
17
- catch (_c) {
17
+ catch (_b) {
18
18
  // TODO(jack): Add a link to guide
19
- throw new Error(`Could not load ${mfeConfigPath}. Was this project generated with "@nrwl/react:mfe-host"?`);
19
+ throw new Error(`Could not load ${moduleFederationConfigPath}. Was this project generated with "@nrwl/react:host"?`);
20
20
  }
21
- // Remotes can be specified with a custom location
22
- // e.g.
23
- // ```
24
- // remotes: ['app1', 'http://example.com']
25
- // ```
26
- // This shouldn't happen for local dev, but we support it regardless.
27
- let apps = (_b = (_a = options.apps) !== null && _a !== void 0 ? _a : mfeConfig.remotes) !== null && _b !== void 0 ? _b : [];
28
- apps = apps.map((a) => (Array.isArray(a) ? a[0] : a));
29
- for (const app of apps) {
21
+ const knownRemotes = (_a = moduleFederationConfig.remotes) !== null && _a !== void 0 ? _a : [];
22
+ const devServeApps = !options.devRemotes
23
+ ? []
24
+ : Array.isArray(options.devRemotes)
25
+ ? options.devRemotes
26
+ : [options.devRemotes];
27
+ for (const app of knownRemotes) {
28
+ const isDev = devServeApps.includes(app);
30
29
  iter = combineAsyncIterators(iter, yield tslib_1.__await((0, devkit_1.runExecutor)({
31
30
  project: app,
32
- target: 'serve',
31
+ target: isDev ? 'serve' : 'serve-static',
33
32
  configuration: context.configurationName,
34
- }, {}, context)));
33
+ }, {
34
+ watch: isDev,
35
+ }, context)));
35
36
  }
36
37
  return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(iter))));
37
38
  });
38
39
  }
39
- exports.default = mfeDevServer;
40
+ exports.default = moduleFederationDevServer;
40
41
  // TODO(jack): Extract this helper
41
42
  function getNextAsyncIteratorFactory(options) {
42
43
  return (asyncIterator, index) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -83,4 +84,4 @@ function combineAsyncIterators(...iterators) {
83
84
  }
84
85
  });
85
86
  }
86
- //# sourceMappingURL=mfe-dev-server.impl.js.map
87
+ //# sourceMappingURL=module-federation-dev-server.impl.js.map
@@ -0,0 +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,yCAA4D;AAC5D,wFAE4D;AAC5D,+BAA4B;AAM5B,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,YAAY,GAAG,MAAA,sBAAsB,CAAC,OAAO,mCAAI,EAAE,CAAC;QAE1D,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,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,GAAG,qBAAqB,CAC1B,IAAI,EACJ,sBAAM,IAAA,oBAAW,EACf;gBACE,OAAO,EAAE,GAAG;gBACZ,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,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAI,CAAA,CAAA,CAAA,EAAC;;CACpB;AAlDD,4CAkDC;AAED,kCAAkC;AAClC,SAAS,2BAA2B,CAAC,OAAO;IAC1C,OAAO,CAAO,aAAa,EAAE,KAAK,EAAE,EAAE;QACpC,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;YAE5C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;SAC5B;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,OAAO,CAAC,aAAa,EAAE;gBACzB,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACnC;YACD,IAAI,OAAO,CAAC,UAAU,KAAK,KAAK,EAAE;gBAChC,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aAC5B;YAED,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;SAC5C;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AAED,SAAgB,qBAAqB,CACnC,GAAG,SAA2D;;QAE9D,IAAI,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;QAC1B,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE;YACtC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC/B;aAAM;YACL,SAAS,CAAC,KAAK,EAAE,CAAC;SACnB;QAED,MAAM,yBAAyB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;QAEvE,IAAI;YACF,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAClC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,yBAAyB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CACtE,CAAC;YAEF,GAAG;gBACD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,sBAAM,OAAO,CAAC,IAAI,CAC5C,oBAAoB,CAAC,MAAM,EAAE,CAC9B,CAAA,CAAC;gBACF,IAAI,QAAQ,CAAC,IAAI,EAAE;oBACjB,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;iBACpC;qBAAM;oBACL,4BAAM,QAAQ,CAAC,KAAK,CAAA,CAAC;oBACrB,oBAAoB,CAAC,GAAG,CACtB,KAAK,EACL,yBAAyB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CACnD,CAAC;iBACH;aACF,QAAQ,oBAAoB,CAAC,IAAI,GAAG,CAAC,EAAE;SACzC;gBAAS;YACR,sBAAM,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA,CAAC;SAC9D;IACH,CAAC;CAAA"}
@@ -1,9 +1,16 @@
1
1
  {
2
- "title": "Web Dev Server",
2
+ "title": "Module Federation Dev Server",
3
3
  "description": "Serve a web application.",
4
4
  "cli": "nx",
5
5
  "type": "object",
6
6
  "properties": {
7
+ "devRemotes": {
8
+ "type": "array",
9
+ "items": {
10
+ "type": "string"
11
+ },
12
+ "description": "List of remote applications to run in development mode (i.e. using serve target)."
13
+ },
7
14
  "buildTarget": {
8
15
  "type": "string",
9
16
  "description": "Target which builds the application."
@@ -70,13 +77,6 @@
70
77
  "baseHref": {
71
78
  "type": "string",
72
79
  "description": "Base url for the application being built."
73
- },
74
- "apps": {
75
- "type": "array",
76
- "items": {
77
- "type": "string"
78
- },
79
- "description": "List of remote applications to serve in addition to the host application."
80
80
  }
81
81
  }
82
82
  }
@@ -1,10 +1,10 @@
1
1
  <% if (strict) { %>import { StrictMode } from 'react';<% } %>
2
- import * as ReactDOMClient from 'react-dom/client';
2
+ import * as ReactDOM from 'react-dom/client';
3
3
  <% if (routing) { %>import { BrowserRouter } from 'react-router-dom';<% } %>
4
4
 
5
5
  import App from './app/<%= fileName %>';
6
6
 
7
- const root = ReactDOMClient.createRoot(document.getElementById('root') as HTMLElement);
7
+ const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
8
8
  root.render(
9
9
  <% if (strict) { %><StrictMode><% } %><% if (routing) { %><BrowserRouter><% } %><App /><% if (routing) { %></BrowserRouter><% } %><% if (strict) { %></StrictMode><% } %>
10
10
  );
@@ -48,6 +48,12 @@ function createBuildTarget(options) {
48
48
  webpackConfig: '@nrwl/react/plugins/webpack',
49
49
  },
50
50
  configurations: {
51
+ development: {
52
+ extractLicenses: false,
53
+ optimization: false,
54
+ sourceMap: true,
55
+ vendorChunk: true,
56
+ },
51
57
  production: {
52
58
  fileReplacements: [
53
59
  {
@@ -68,11 +74,15 @@ function createBuildTarget(options) {
68
74
  function createServeTarget(options) {
69
75
  return {
70
76
  executor: '@nrwl/web:dev-server',
77
+ defaultConfiguration: 'development',
71
78
  options: {
72
79
  buildTarget: `${options.projectName}:build`,
73
80
  hmr: true,
74
81
  },
75
82
  configurations: {
83
+ development: {
84
+ buildTarget: `${options.projectName}:build:development`,
85
+ },
76
86
  production: {
77
87
  buildTarget: `${options.projectName}:build:production`,
78
88
  hmr: false,
@@ -1 +1 @@
1
- {"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"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"}
@@ -43,7 +43,7 @@ export class <%= className %> extends Component<<%= className %>Props> {
43
43
  <ul>
44
44
  <li><Link to="/"><%= name %> root</Link></li>
45
45
  </ul>
46
- <Route path="/" render={() => <div>This is the <%= name %> root route.</div>} />
46
+ <Route path="/" element={<div>This is the <%= name %> root route.</div>} />
47
47
  <% } %>
48
48
  </<%= wrapper %>>
49
49
  );
@@ -59,7 +59,7 @@ export function <%= className %>(props: <%= className %>Props) {
59
59
  <ul>
60
60
  <li><Link to="/"><%= name %> root</Link></li>
61
61
  </ul>
62
- <Route path="/" render={() => <div>This is the <%= name %> root route.</div>} />
62
+ <Route path="/" element={<div>This is the <%= name %> root route.</div>} />
63
63
  <% } %>
64
64
  </<%= wrapper %>>
65
65
  );
@@ -1,16 +1,18 @@
1
- import { act, renderHook } from '@testing-library/react-hooks';
2
- import <%= hookName %> from './<%= fileName %>';
3
-
4
- describe('<%= hookName %>', () => {
5
- it('should render successfully', () => {
6
- const { result } = renderHook(() => <%= hookName %>());
7
-
8
- expect(result.current.count).toBe(0);
9
-
10
- act(() => {
11
- result.current.increment()
12
- });
13
-
14
- expect(result.current.count).toBe(1);
15
- });
1
+ import { act, renderHook } from '@testing-library/react';
2
+ import * as React from 'react';
3
+
4
+ import <%= hookName %> from './<%= fileName %>';
5
+
6
+ describe('<%= hookName %>', () => {
7
+ it('should render successfully', () => {
8
+ const { result } = renderHook(() => <%= hookName %>());
9
+
10
+ expect(result.current.count).toBe(0);
11
+
12
+ act(() => {
13
+ result.current.increment()
14
+ });
15
+
16
+ expect(result.current.count).toBe(1);
17
+ });
16
18
  });
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.hookSchematic = exports.hookGenerator = void 0;
4
4
  const tslib_1 = require("tslib");
5
+ // TODO(jack): Remove inline renderHook function when RTL releases with its own version
5
6
  const ts = require("typescript");
6
7
  const devkit_1 = require("@nrwl/devkit");
7
8
  const ast_utils_1 = require("../../utils/ast-utils");
@@ -1 +1 @@
1
- {"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/hook/hook.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hook.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/hook/hook.ts"],"names":[],"mappings":"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"}