@nx/react 16.0.0-beta.2 → 16.0.0-beta.4

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 (97) hide show
  1. package/generators.json +1 -1
  2. package/package.json +7 -6
  3. package/plugins/component-testing/index.js +2 -2
  4. package/plugins/component-testing/index.js.map +1 -1
  5. package/plugins/component-testing/webpack-fallback.js +1 -1
  6. package/plugins/component-testing/webpack-fallback.js.map +1 -1
  7. package/plugins/storybook/index.js +1 -1
  8. package/plugins/storybook/index.js.map +1 -1
  9. package/plugins/webpack.d.ts +1 -1
  10. package/plugins/webpack.js +1 -1
  11. package/plugins/webpack.js.map +1 -1
  12. package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +1 -1
  13. package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +1 -1
  14. package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js +1 -1
  15. package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js.map +1 -1
  16. package/src/generators/application/application.js +16 -2
  17. package/src/generators/application/application.js.map +1 -1
  18. package/src/generators/application/files/base-rspack/src/app/__fileName__.spec.tsx__tmpl__ +10 -0
  19. package/src/generators/application/files/base-rspack/src/assets/.gitkeep +0 -0
  20. package/src/generators/application/files/base-rspack/src/favicon.ico +0 -0
  21. package/src/generators/application/files/base-rspack/src/index.html +14 -0
  22. package/src/generators/application/files/base-rspack/src/main.tsx__tmpl__ +10 -0
  23. package/src/generators/application/files/base-rspack/tsconfig.app.json__tmpl__ +14 -0
  24. package/src/generators/application/files/base-vite/tsconfig.app.json__tmpl__ +3 -3
  25. package/src/generators/application/files/base-webpack/.babelrc__tmpl__ +1 -1
  26. package/src/generators/application/files/base-webpack/tsconfig.app.json__tmpl__ +3 -3
  27. package/src/generators/application/files/base-webpack/webpack.config.js__tmpl__ +2 -2
  28. package/src/generators/application/files/nx-welcome/src/app/nx-welcome.tsx +2 -2
  29. package/src/generators/application/lib/add-cypress.js +3 -3
  30. package/src/generators/application/lib/add-cypress.js.map +1 -1
  31. package/src/generators/application/lib/add-project.d.ts +1 -0
  32. package/src/generators/application/lib/add-project.js +4 -3
  33. package/src/generators/application/lib/add-project.js.map +1 -1
  34. package/src/generators/application/lib/create-application-files.js +11 -3
  35. package/src/generators/application/lib/create-application-files.js.map +1 -1
  36. package/src/generators/application/lib/install-common-dependencies.js +1 -1
  37. package/src/generators/application/lib/install-common-dependencies.js.map +1 -1
  38. package/src/generators/application/lib/set-defaults.js +3 -3
  39. package/src/generators/application/lib/set-defaults.js.map +1 -1
  40. package/src/generators/application/lib/update-jest-config.js +3 -3
  41. package/src/generators/application/lib/update-jest-config.js.map +1 -1
  42. package/src/generators/application/schema.d.ts +1 -1
  43. package/src/generators/application/schema.json +1 -1
  44. package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ +1 -1
  45. package/src/generators/cypress-component-configuration/lib/add-files.js +8 -4
  46. package/src/generators/cypress-component-configuration/lib/add-files.js.map +1 -1
  47. package/src/generators/cypress-component-configuration/lib/update-configs.js +2 -0
  48. package/src/generators/cypress-component-configuration/lib/update-configs.js.map +1 -1
  49. package/src/generators/host/files/module-federation/webpack.config.js__tmpl__ +3 -3
  50. package/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__ +3 -3
  51. package/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__ +1 -1
  52. package/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__ +3 -3
  53. package/src/generators/host/lib/setup-ssr-for-host.js +1 -2
  54. package/src/generators/host/lib/setup-ssr-for-host.js.map +1 -1
  55. package/src/generators/init/init.js +4 -4
  56. package/src/generators/init/init.js.map +1 -1
  57. package/src/generators/library/files/common/.babelrc__tmpl__ +1 -1
  58. package/src/generators/library/files/common/tsconfig.lib.json__tmpl__ +3 -3
  59. package/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ +3 -3
  60. package/src/generators/library/lib/add-rollup-build-target.js +3 -3
  61. package/src/generators/library/lib/add-rollup-build-target.js.map +1 -1
  62. package/src/generators/library/lib/install-common-dependencies.d.ts +2 -2
  63. package/src/generators/library/lib/install-common-dependencies.js +10 -3
  64. package/src/generators/library/lib/install-common-dependencies.js.map +1 -1
  65. package/src/generators/library/lib/set-defaults.js +3 -3
  66. package/src/generators/library/lib/set-defaults.js.map +1 -1
  67. package/src/generators/remote/files/module-federation/webpack.config.js__tmpl__ +3 -3
  68. package/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__ +1 -1
  69. package/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__ +3 -3
  70. package/src/generators/remote/lib/update-host-with-remote.js +3 -3
  71. package/src/generators/remote/lib/update-host-with-remote.js.map +1 -1
  72. package/src/generators/setup-ssr/setup-ssr.js +3 -3
  73. package/src/generators/setup-ssr/setup-ssr.js.map +1 -1
  74. package/src/generators/setup-tailwind/files/tailwind.config.js__tmpl__ +1 -1
  75. package/src/generators/setup-tailwind/lib/update-project.js +5 -4
  76. package/src/generators/setup-tailwind/lib/update-project.js.map +1 -1
  77. package/src/generators/storybook-configuration/configuration.js +4 -2
  78. package/src/generators/storybook-configuration/configuration.js.map +1 -1
  79. package/src/migrations/update-13-0-0/webpack5-changes-utils.js +3 -3
  80. package/src/migrations/update-13-0-0/webpack5-changes-utils.js.map +1 -1
  81. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js +3 -3
  82. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js.map +1 -1
  83. package/src/module-federation/ast-utils.js +3 -3
  84. package/src/module-federation/ast-utils.js.map +1 -1
  85. package/src/module-federation/load-config.js +1 -1
  86. package/src/module-federation/load-config.js.map +1 -1
  87. package/src/rules/update-module-federation-project.js +3 -3
  88. package/src/rules/update-module-federation-project.js.map +1 -1
  89. package/src/utils/ast-utils.js +28 -28
  90. package/src/utils/ast-utils.js.map +1 -1
  91. package/src/utils/jest-utils.js +2 -2
  92. package/src/utils/jest-utils.js.map +1 -1
  93. package/src/utils/lint.js +2 -2
  94. package/src/utils/lint.js.map +1 -1
  95. package/src/utils/versions.d.ts +1 -1
  96. package/src/utils/versions.js +3 -2
  97. package/src/utils/versions.js.map +1 -1
package/src/generators/application/schema.d.ts CHANGED
@@ -28,7 +28,7 @@ export interface Schema {
28
28
  devServerPort?: number;
29
29
  skipPackageJson?: boolean;
30
30
  rootProject?: boolean;
31
- bundler?: 'webpack' | 'vite';
31
+ bundler?: 'webpack' | 'vite' | 'rspack';
32
32
  minimal?: boolean;
33
33
  }
34
34
 
package/src/generators/application/schema.json CHANGED
@@ -180,7 +180,7 @@
180
180
  "bundler": {
181
181
  "description": "The bundler to use.",
182
182
  "type": "string",
183
- "enum": ["vite", "webpack"],
183
+ "enum": ["vite", "webpack", "rspack"],
184
184
  "x-prompt": "Which bundler do you want to use to build the application?",
185
185
  "default": "webpack",
186
186
  "x-priority": "important"
package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__ CHANGED
@@ -1,5 +1,5 @@
1
1
  import { defineConfig } from 'cypress';
2
- import { nxComponentTestingPreset } from '@nrwl/react/plugins/component-testing';
2
+ import { nxComponentTestingPreset } from '@nx/react/plugins/component-testing';
3
3
 
4
4
  export default defineConfig({
5
5
  component: nxComponentTestingPreset(__filename, {
package/src/generators/cypress-component-configuration/lib/add-files.js CHANGED
@@ -28,7 +28,7 @@ function addFiles(tree, projectConfig, options, found) {
28
28
  });
29
29
  if (options.bundler === 'webpack' ||
30
30
  (!options.bundler && actualBundler === 'webpack')) {
31
- (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/webpack': versions_1.nxVersion });
31
+ (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });
32
32
  }
33
33
  if (options.generateTests) {
34
34
  const filePaths = [];
@@ -48,14 +48,18 @@ function addFiles(tree, projectConfig, options, found) {
48
48
  }
49
49
  exports.addFiles = addFiles;
50
50
  function getBundler(found, tree) {
51
- var _a, _b, _c;
51
+ var _a, _b, _c, _d, _e;
52
52
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
53
53
  if (found.target && ((_a = found.config) === null || _a === void 0 ? void 0 : _a.executor)) {
54
- return found.config.executor === '@nrwl/vite:build' ? 'vite' : 'webpack';
54
+ return found.config.executor === '@nx/vite:build' ||
55
+ found.config.executor === '@nrwl/vite:build'
56
+ ? 'vite'
57
+ : 'webpack';
55
58
  }
56
59
  const { target, project } = (0, devkit_1.parseTargetString)(found.target, yield (0, devkit_1.createProjectGraphAsync)());
57
60
  const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
58
- return ((_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b[target]) === null || _c === void 0 ? void 0 : _c.executor) === '@nrwl/vite:build'
61
+ return ((_c = (_b = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _b === void 0 ? void 0 : _b[target]) === null || _c === void 0 ? void 0 : _c.executor) === '@nx/vite:build' ||
62
+ ((_e = (_d = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _d === void 0 ? void 0 : _d[target]) === null || _e === void 0 ? void 0 : _e.executor) === '@nrwl/vite:build'
59
63
  ? 'vite'
60
64
  : 'webpack';
61
65
  });
package/src/generators/cypress-component-configuration/lib/add-files.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/add-files.ts"],"names":[],"mappings":"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"}
package/src/generators/cypress-component-configuration/lib/update-configs.js CHANGED
@@ -10,6 +10,8 @@ function updateProjectConfig(tree, options) {
10
10
  project: options.project,
11
11
  buildTarget: options.buildTarget,
12
12
  validExecutorNames: new Set([
13
+ '@nx/webpack:webpack',
14
+ '@nx/vite:build',
13
15
  '@nrwl/webpack:webpack',
14
16
  '@nrwl/vite:build',
15
17
  ]),
package/src/generators/cypress-component-configuration/lib/update-configs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AAQpB,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,eAAe,EAAE,GAAG,2CAC1B,2CAA2C,EAC5C,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS;gBAClC,uBAAuB;gBACvB,kBAAkB;aACnB,CAAC;SACH,CAAC,CAAC;QAEH,gBAAgB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC;QAEhC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,mCAC1C,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,KAClD,eAAe,EAAE,KAAK,CAAC,MAAM,EAC7B,SAAS,EAAE,IAAI,GAChB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEjE,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AA3BD,kDA2BC;AAED,SAAS,gBAAgB,CAAC,MAAe;IACvC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,0IAA0I,CAC3I,CAAC;KACH;AACH,CAAC"}
1
+ {"version":3,"file":"update-configs.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/cypress-component-configuration/lib/update-configs.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AAQpB,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAA4C;;QAE5C,MAAM,EAAE,eAAe,EAAE,GAAG,2CAC1B,2CAA2C,EAC5C,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE;YACxC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,kBAAkB,EAAE,IAAI,GAAG,CAAS;gBAClC,qBAAqB;gBACrB,gBAAgB;gBAChB,uBAAuB;gBACvB,kBAAkB;aACnB,CAAC;SACH,CAAC,CAAC;QAEH,gBAAgB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC;QAEhC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,mCAC1C,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,KAClD,eAAe,EAAE,KAAK,CAAC,MAAM,EAC7B,SAAS,EAAE,IAAI,GAChB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEjE,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AA7BD,kDA6BC;AAED,SAAS,gBAAgB,CAAC,MAAe;IACvC,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,0IAA0I,CAC3I,CAAC;KACH;AACH,CAAC"}
package/src/generators/host/files/module-federation/webpack.config.js__tmpl__ CHANGED
@@ -1,6 +1,6 @@
1
- const { composePlugins, withNx } = require('@nrwl/webpack');
2
- const { withReact } = require('@nrwl/react');
3
- const { withModuleFederation } = require('@nrwl/react/module-federation');
1
+ const { composePlugins, withNx } = require('@nx/webpack');
2
+ const { withReact } = require('@nx/react');
3
+ const { withModuleFederation } = require('@nx/react/module-federation');
4
4
 
5
5
  const baseConfig = require('./module-federation.config');
6
6
 
package/src/generators/host/files/module-federation/webpack.config.prod.js__tmpl__ CHANGED
@@ -1,6 +1,6 @@
1
- const { composePlugins, withNx } = require('@nrwl/webpack');
2
- const { withReact } = require('@nrwl/react');
3
- const { withModuleFederation } = require('@nrwl/react/module-federation');
1
+ const { composePlugins, withNx } = require('@nx/webpack');
2
+ const { withReact } = require('@nx/react');
3
+ const { withModuleFederation } = require('@nx/react/module-federation');
4
4
 
5
5
  const baseConfig = require('./module-federation.config');
6
6
 
package/src/generators/host/files/module-federation-ssr/module-federation.server.config.js__tmpl__ CHANGED
@@ -1,7 +1,7 @@
1
1
  // @ts-check
2
2
 
3
3
  /**
4
- * @type {import('@nrwl/devkit').ModuleFederationConfig}
4
+ * @type {import('@nx/devkit').ModuleFederationConfig}
5
5
  **/
6
6
  const moduleFederationConfig = {
7
7
  name: '<%= projectName %>',
package/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__ CHANGED
@@ -1,6 +1,6 @@
1
- const { composePlugins, withNx } = require('@nrwl/webpack');
2
- const { withReact } = require('@nrwl/react');
3
- const { withModuleFederationForSSR } = require('@nrwl/react/module-federation');
1
+ const { composePlugins, withNx } = require('@nx/webpack');
2
+ const { withReact } = require('@nx/react');
3
+ const { withModuleFederationForSSR } = require('@nx/react/module-federation');
4
4
 
5
5
  const baseConfig = require('./module-federation.config');
6
6
 
package/src/generators/host/lib/setup-ssr-for-host.js CHANGED
@@ -9,8 +9,7 @@ function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
9
9
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
10
10
  const tasks = [];
11
11
  let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
12
- project.targets.serve.executor =
13
- '@nrwl/react:module-federation-ssr-dev-server';
12
+ project.targets.serve.executor = '@nx/react:module-federation-ssr-dev-server';
14
13
  (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
15
14
  (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/module-federation-ssr'), project.root, Object.assign(Object.assign({}, options), { remotes: defaultRemoteManifest.map(({ name, port }) => {
16
15
  const remote = (0, normalize_options_1.normalizeProjectName)(Object.assign(Object.assign({}, options), { name }));
package/src/generators/host/lib/setup-ssr-for-host.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setup-ssr-for-host.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/setup-ssr-for-host.ts"],"names":[],"mappings":";;;;AACA,uCAQoB;AAGpB,sDAAsE;AACtE,+EAA+E;AAE/E,SAAsB,eAAe,CACnC,IAAU,EACV,OAAe,EACf,OAAe,EACf,qBAAuD;;QAEvD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ;YAC5B,8CAA8C,CAAC;QACjD,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gCAAgC,CAAC,EAC9D,OAAO,CAAC,IAAI,kCAEP,OAAO,KACV,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;gBACpD,MAAM,MAAM,GAAG,IAAA,wCAAoB,kCAAM,OAAO,KAAE,IAAI,IAAG,CAAC;gBAC1D,uCACK,IAAA,cAAK,EAAC,MAAM,CAAC,KAChB,IAAI,IACJ;YACJ,CAAC,CAAC,EACF,OAAO,EACP,IAAI,EAAE,EAAE,EACR,sBAAsB,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,IAEnE,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,yBAAyB,EAAE,sCAA2B;SACvD,EACD,EAAE,CACH,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAzCD,0CAyCC"}
1
+ {"version":3,"file":"setup-ssr-for-host.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/setup-ssr-for-host.ts"],"names":[],"mappings":";;;;AACA,uCAQoB;AAGpB,sDAAsE;AACtE,+EAA+E;AAE/E,SAAsB,eAAe,CACnC,IAAU,EACV,OAAe,EACf,OAAe,EACf,qBAAuD;;QAEvD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,4CAA4C,CAAC;QAC9E,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,gCAAgC,CAAC,EAC9D,OAAO,CAAC,IAAI,kCAEP,OAAO,KACV,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;gBACpD,MAAM,MAAM,GAAG,IAAA,wCAAoB,kCAAM,OAAO,KAAE,IAAI,IAAG,CAAC;gBAC1D,uCACK,IAAA,cAAK,EAAC,MAAM,CAAC,KAChB,IAAI,IACJ;YACJ,CAAC,CAAC,EACF,OAAO,EACP,IAAI,EAAE,EAAE,EACR,sBAAsB,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,IAEnE,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,yBAAyB,EAAE,sCAA2B;SACvD,EACD,EAAE,CACH,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAxCD,0CAwCC"}
package/src/generators/init/init.js CHANGED
@@ -8,12 +8,12 @@ const versions_1 = require("../../utils/versions");
8
8
  function setDefault(host) {
9
9
  const workspace = (0, devkit_1.readNxJson)(host);
10
10
  workspace.generators = workspace.generators || {};
11
- const reactGenerators = workspace.generators['@nrwl/react'] || {};
12
- const generators = Object.assign(Object.assign({}, workspace.generators), { '@nrwl/react': Object.assign(Object.assign({}, reactGenerators), { application: Object.assign(Object.assign({}, reactGenerators.application), { babel: true }) }) });
11
+ const reactGenerators = workspace.generators['@nx/react'] || {};
12
+ const generators = Object.assign(Object.assign({}, workspace.generators), { '@nx/react': Object.assign(Object.assign({}, reactGenerators), { application: Object.assign(Object.assign({}, reactGenerators.application), { babel: true }) }) });
13
13
  (0, devkit_1.updateNxJson)(host, Object.assign(Object.assign({}, workspace), { generators }));
14
14
  }
15
15
  function updateDependencies(host, schema) {
16
- (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nrwl/react'], []);
16
+ (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react'], []);
17
17
  const dependencies = {
18
18
  react: versions_1.reactVersion,
19
19
  'react-dom': versions_1.reactDomVersion,
@@ -22,7 +22,7 @@ function updateDependencies(host, schema) {
22
22
  dependencies['tslib'] = versions_1.tsLibVersion;
23
23
  }
24
24
  return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, {
25
- '@nrwl/react': versions_1.nxVersion,
25
+ '@nx/react': versions_1.nxVersion,
26
26
  '@types/node': versions_1.typesNodeVersion,
27
27
  '@types/react': versions_1.typesReactVersion,
28
28
  '@types/react-dom': versions_1.typesReactDomVersion,
package/src/generators/init/init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/init/init.ts"],"names":[],"mappings":"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"}
package/src/generators/library/files/common/.babelrc__tmpl__ CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "presets": [
3
3
  [
4
- "@nrwl/react/babel", {
4
+ "@nx/react/babel", {
5
5
  "runtime": "automatic",
6
6
  "useBuiltIns": "usage"
7
7
  <% if (style === '@emotion/styled') { %>,"importSource": "@emotion/react"<% } %>
package/src/generators/library/files/common/tsconfig.lib.json__tmpl__ CHANGED
@@ -5,9 +5,9 @@
5
5
  "types": ["node"]
6
6
  },
7
7
  "files": [<% if (style === 'styled-jsx') { %>
8
- "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
9
- "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
10
- "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
8
+ "<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
9
+ "<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
10
+ "<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
11
11
  ],
12
12
  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
13
13
  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
package/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ CHANGED
@@ -5,9 +5,9 @@
5
5
  "types": ["node"]
6
6
  },
7
7
  "files": [<% if (style === 'styled-jsx') { %>
8
- "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/styled-jsx.d.ts",<% } %>
9
- "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/cssmodule.d.ts",
10
- "<%= offsetFromRoot %>node_modules/@nrwl/react/typings/image.d.ts"
8
+ "<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
9
+ "<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
10
+ "<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
11
11
  ],
12
12
  "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx"],
13
13
  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
package/src/generators/library/lib/add-rollup-build-target.js CHANGED
@@ -9,7 +9,7 @@ function addRollupBuildTarget(host, options) {
9
9
  var _a;
10
10
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
11
11
  const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
12
- // These are used in `@nrwl/react/plugins/bundle-rollup`
12
+ // These are used in `@nx/react/plugins/bundle-rollup`
13
13
  (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
14
14
  '@rollup/plugin-url': versions_1.rollupPluginUrlVersion,
15
15
  '@svgr/rollup': versions_1.svgrRollupVersion,
@@ -24,7 +24,7 @@ function addRollupBuildTarget(host, options) {
24
24
  external.push('react/jsx-runtime');
25
25
  }
26
26
  targets.build = {
27
- executor: '@nrwl/rollup:rollup',
27
+ executor: '@nx/rollup:rollup',
28
28
  outputs: ['{options.outputPath}'],
29
29
  options: {
30
30
  outputPath: libsDir !== '.'
@@ -34,7 +34,7 @@ function addRollupBuildTarget(host, options) {
34
34
  project: `${options.projectRoot}/package.json`,
35
35
  entryFile: (0, maybe_js_1.maybeJs)(options, `${options.projectRoot}/src/index.ts`),
36
36
  external,
37
- rollupConfig: `@nrwl/react/plugins/bundle-rollup`,
37
+ rollupConfig: `@nx/react/plugins/bundle-rollup`,
38
38
  compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'babel',
39
39
  assets: [
40
40
  {
package/src/generators/library/lib/add-rollup-build-target.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-rollup-build-target.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/add-rollup-build-target.ts"],"names":[],"mappings":";;;;AACA,uCAOoB;AAEpB,yCAAqC;AAErC,sDAIiC;AAEjC,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAyB;;;QAEzB,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,sBAAa,EAC3C,YAAY,EACZ,oBAAS,CACV,CAAC;QAEF,wDAAwD;QACxD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,oBAAoB,EAAE,iCAAsB;YAC5C,cAAc,EAAE,4BAAiB;SAClC,CACF,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEjE,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,qBAAqB;YAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACP,UAAU,EACR,OAAO,KAAK,GAAG;oBACb,CAAC,CAAC,QAAQ,OAAO,IAAI,OAAO,CAAC,gBAAgB,EAAE;oBAC/C,CAAC,CAAC,QAAQ,OAAO,CAAC,gBAAgB,EAAE;gBACxC,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACpD,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe;gBAC9C,SAAS,EAAE,IAAA,kBAAO,EAAC,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;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC7C,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;YACzD,WAAW,EAAE,SAAS;YACtB,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,mBAAmB,CAAC,IAAI,kCAAO,OAAO,KAAE,UAAU,EAAE,IAAI,IAAG,CAAC;;CACpE;AA/DD,oDA+DC"}
1
+ {"version":3,"file":"add-rollup-build-target.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/add-rollup-build-target.ts"],"names":[],"mappings":";;;;AACA,uCAOoB;AAEpB,yCAAqC;AAErC,sDAIiC;AAEjC,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAyB;;;QAEzB,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,sBAAa,EAC3C,YAAY,EACZ,oBAAS,CACV,CAAC;QAEF,sDAAsD;QACtD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;YACE,oBAAoB,EAAE,iCAAsB;YAC5C,cAAc,EAAE,4BAAiB;SAClC,CACF,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEjE,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,mBAAmB;YAC7B,OAAO,EAAE,CAAC,sBAAsB,CAAC;YACjC,OAAO,EAAE;gBACP,UAAU,EACR,OAAO,KAAK,GAAG;oBACb,CAAC,CAAC,QAAQ,OAAO,IAAI,OAAO,CAAC,gBAAgB,EAAE;oBAC/C,CAAC,CAAC,QAAQ,OAAO,CAAC,gBAAgB,EAAE;gBACxC,QAAQ,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACpD,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe;gBAC9C,SAAS,EAAE,IAAA,kBAAO,EAAC,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC;gBAClE,QAAQ;gBACR,YAAY,EAAE,iCAAiC;gBAC/C,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;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC7C,IAAI,EAAE,OAAO,CAAC,WAAW;YACzB,UAAU,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;YACzD,WAAW,EAAE,SAAS;YACtB,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,mBAAmB,CAAC,IAAI,kCAAO,OAAO,KAAE,UAAU,EAAE,IAAI,IAAG,CAAC;;CACpE;AA/DD,oDA+DC"}
package/src/generators/library/lib/install-common-dependencies.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- import { Tree } from '@nx/devkit';
1
+ import { GeneratorCallback, Tree } from '@nx/devkit';
2
2
  import { NormalizedSchema } from '../schema';
3
- export declare function installCommonDependencies(host: Tree, options: NormalizedSchema): import("@nx/devkit").GeneratorCallback;
3
+ export declare function installCommonDependencies(host: Tree, options: NormalizedSchema): GeneratorCallback;
package/src/generators/library/lib/install-common-dependencies.js CHANGED
@@ -2,11 +2,13 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.installCommonDependencies = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
+ const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
5
6
  const versions_1 = require("../../../utils/versions");
6
7
  function installCommonDependencies(host, options) {
7
- const devDependencies = options.compiler === 'swc' ? { '@swc/core': versions_1.swcCoreVersion } : {};
8
+ const tasks = [];
9
+ const devDependencies = {};
8
10
  // Vite requires style preprocessors to be installed manually.
9
- // `@nrwl/webpack` installs them automatically for now.
11
+ // `@nx/webpack` installs them automatically for now.
10
12
  // TODO(jack): Once we clean up webpack we can remove this check
11
13
  if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
12
14
  switch (options.style) {
@@ -21,10 +23,15 @@ function installCommonDependencies(host, options) {
21
23
  break;
22
24
  }
23
25
  }
24
- return (0, devkit_1.addDependenciesToPackageJson)(host, {
26
+ const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
25
27
  react: versions_1.reactVersion,
26
28
  'react-dom': versions_1.reactDomVersion,
27
29
  }, devDependencies);
30
+ tasks.push(baseInstallTask);
31
+ if (options.compiler === 'swc') {
32
+ tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));
33
+ }
34
+ return (0, devkit_1.runTasksInSerial)(...tasks);
28
35
  }
29
36
  exports.installCommonDependencies = installCommonDependencies;
30
37
  //# sourceMappingURL=install-common-dependencies.js.map
package/src/generators/library/lib/install-common-dependencies.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"install-common-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/install-common-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAAgE;AAChE,sDAOiC;AAGjC,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,MAAM,eAAe,GACnB,OAAO,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,yBAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEpE,8DAA8D;IAC9D,uDAAuD;IACvD,gEAAgE;IAChE,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;QACrE,QAAQ,OAAO,CAAC,KAAK,EAAE;YACrB,KAAK,MAAM;gBACT,eAAe,CAAC,MAAM,CAAC,GAAG,sBAAW,CAAC;gBACtC,MAAM;YACR,KAAK,MAAM;gBACT,eAAe,CAAC,MAAM,CAAC,GAAG,sBAAW,CAAC;gBACtC,MAAM;YACR,KAAK,MAAM,EAAE,sDAAsD;gBACjE,eAAe,CAAC,QAAQ,CAAC,GAAG,wBAAa,CAAC;gBAC1C,MAAM;SACT;KACF;IAED,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;KAC7B,EACD,eAAe,CAChB,CAAC;AACJ,CAAC;AAhCD,8DAgCC"}
1
+ {"version":3,"file":"install-common-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/install-common-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AACpB,oFAA+E;AAC/E,sDAMiC;AAGjC,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,MAAM,KAAK,GAAwB,EAAE,CAAC;IACtC,MAAM,eAAe,GAAG,EAAE,CAAC;IAE3B,8DAA8D;IAC9D,qDAAqD;IACrD,gEAAgE;IAChE,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;QACrE,QAAQ,OAAO,CAAC,KAAK,EAAE;YACrB,KAAK,MAAM;gBACT,eAAe,CAAC,MAAM,CAAC,GAAG,sBAAW,CAAC;gBACtC,MAAM;YACR,KAAK,MAAM;gBACT,eAAe,CAAC,MAAM,CAAC,GAAG,sBAAW,CAAC;gBACtC,MAAM;YACR,KAAK,MAAM,EAAE,sDAAsD;gBACjE,eAAe,CAAC,QAAQ,CAAC,GAAG,wBAAa,CAAC;gBAC1C,MAAM;SACT;KACF;IAED,MAAM,eAAe,GAAG,IAAA,qCAA4B,EAClD,IAAI,EACJ;QACE,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;KAC7B,EACD,eAAe,CAChB,CAAC;IACF,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAE5B,IAAI,OAAO,CAAC,QAAQ,KAAK,KAAK,EAAE;QAC9B,KAAK,CAAC,IAAI,CAAC,IAAA,yCAAkB,EAAC,IAAI,CAAC,CAAC,CAAC;KACtC;IAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;AACpC,CAAC;AAvCD,8DAuCC"}
package/src/generators/library/lib/set-defaults.js CHANGED
@@ -6,10 +6,10 @@ function setDefaults(host, options) {
6
6
  var _a, _b;
7
7
  const nxJson = (0, devkit_1.readNxJson)(host);
8
8
  nxJson.generators = nxJson.generators || {};
9
- nxJson.generators['@nrwl/react'] = nxJson.generators['@nrwl/react'] || {};
10
- const prev = Object.assign({}, nxJson.generators['@nrwl/react']);
9
+ nxJson.generators['@nx/react'] = nxJson.generators['@nx/react'] || {};
10
+ const prev = Object.assign({}, nxJson.generators['@nx/react']);
11
11
  const libDefaults = Object.assign(Object.assign({}, prev.library), { unitTestRunner: (_b = (_a = prev.library) === null || _a === void 0 ? void 0 : _a.unitTestRunner) !== null && _b !== void 0 ? _b : options.unitTestRunner });
12
- nxJson.generators = Object.assign(Object.assign({}, nxJson.generators), { '@nrwl/react': Object.assign(Object.assign({}, prev), { library: libDefaults }) });
12
+ nxJson.generators = Object.assign(Object.assign({}, nxJson.generators), { '@nx/react': Object.assign(Object.assign({}, prev), { library: libDefaults }) });
13
13
  (0, devkit_1.updateNxJson)(host, nxJson);
14
14
  }
15
15
  exports.setDefaults = setDefaults;
package/src/generators/library/lib/set-defaults.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,uCAA4D;AAG5D,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;;IAC/D,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IAE1E,MAAM,IAAI,qBAAQ,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAE,CAAC;IAErD,MAAM,WAAW,mCACZ,IAAI,CAAC,OAAO,KACf,cAAc,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,cAAc,mCAAI,OAAO,CAAC,cAAc,GACvE,CAAC;IAEF,MAAM,CAAC,UAAU,mCACZ,MAAM,CAAC,UAAU,KACpB,aAAa,kCACR,IAAI,KACP,OAAO,EAAE,WAAW,MAEvB,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAtBD,kCAsBC"}
1
+ {"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,uCAA4D;AAG5D,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;;IAC/D,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAEtE,MAAM,IAAI,qBAAQ,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAE,CAAC;IAEnD,MAAM,WAAW,mCACZ,IAAI,CAAC,OAAO,KACf,cAAc,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,cAAc,mCAAI,OAAO,CAAC,cAAc,GACvE,CAAC;IAEF,MAAM,CAAC,UAAU,mCACZ,MAAM,CAAC,UAAU,KACpB,WAAW,kCACN,IAAI,KACP,OAAO,EAAE,WAAW,MAEvB,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAtBD,kCAsBC"}
package/src/generators/remote/files/module-federation/webpack.config.js__tmpl__ CHANGED
@@ -1,6 +1,6 @@
1
- const { composePlugins, withNx } = require('@nrwl/webpack');
2
- const { withReact } = require('@nrwl/react');
3
- const { withModuleFederation } = require('@nrwl/react/module-federation');
1
+ const { composePlugins, withNx } = require('@nx/webpack');
2
+ const { withReact } = require('@nx/react');
3
+ const { withModuleFederation } = require('@nx/react/module-federation');
4
4
 
5
5
  const baseConfig = require('./module-federation.config');
6
6
 
package/src/generators/remote/files/module-federation-ssr/server.ts__tmpl__ CHANGED
@@ -34,7 +34,7 @@ const server = app.listen(port, () => {
34
34
  console.log(`Express server listening on http://localhost:${port}`);
35
35
 
36
36
  /**
37
- * DO NOT REMOVE IF USING @nrwl/react:module-federation-dev-ssr executor
37
+ * DO NOT REMOVE IF USING @nx/react:module-federation-dev-ssr executor
38
38
  * to serve your Host application with this Remote application.
39
39
  * This message allows Nx to determine when the Remote is ready to be
40
40
  * consumed by the Host.
package/src/generators/remote/files/module-federation-ssr/webpack.server.config.js__tmpl__ CHANGED
@@ -1,6 +1,6 @@
1
- const { composePlugins, withNx } = require('@nrwl/webpack');
2
- const { withReact } = require('@nrwl/react');
3
- const { withModuleFederationForSSR } = require('@nrwl/react/module-federation');
1
+ const { composePlugins, withNx } = require('@nx/webpack');
2
+ const { withReact } = require('@nx/react');
3
+ const { withModuleFederationForSSR } = require('@nx/react/module-federation');
4
4
 
5
5
  const baseConfig = require("./module-federation.server.config");
6
6
 
package/src/generators/remote/lib/update-host-with-remote.js CHANGED
@@ -22,7 +22,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
22
22
  }
23
23
  else {
24
24
  // TODO(jack): Point to the nx.dev guide when ready.
25
- devkit_1.logger.warn(`Could not find configuration at ${moduleFederationConfigPath}. Did you generate this project with "@nrwl/react:host"?`);
25
+ devkit_1.logger.warn(`Could not find configuration at ${moduleFederationConfigPath}. Did you generate this project with "@nx/react:host"?`);
26
26
  }
27
27
  if (host.exists(remoteDefsPath)) {
28
28
  let sourceCode = host.read(remoteDefsPath).toString();
@@ -30,7 +30,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
30
30
  host.write(remoteDefsPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, ast_utils_1.addRemoteDefinition)(source, remoteName)));
31
31
  }
32
32
  else {
33
- devkit_1.logger.warn(`Could not find remote definitions at ${remoteDefsPath}. Did you generate this project with "@nrwl/react:host"?`);
33
+ devkit_1.logger.warn(`Could not find remote definitions at ${remoteDefsPath}. Did you generate this project with "@nx/react:host"?`);
34
34
  }
35
35
  if (host.exists(appComponentPath)) {
36
36
  let sourceCode = host.read(appComponentPath).toString();
@@ -38,7 +38,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
38
38
  host.write(appComponentPath, (0, devkit_1.applyChangesToString)(sourceCode, (0, ast_utils_1.addRemoteRoute)(source, (0, devkit_1.names)(remoteName))));
39
39
  }
40
40
  else {
41
- devkit_1.logger.warn(`Could not find app component at ${appComponentPath}. Did you generate this project with "@nrwl/react:host"?`);
41
+ devkit_1.logger.warn(`Could not find app component at ${appComponentPath}. Did you generate this project with "@nx/react:host"?`);
42
42
  }
43
43
  }
44
44
  exports.updateHostWithRemote = updateHostWithRemote;
package/src/generators/remote/lib/update-host-with-remote.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-host-with-remote.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/remote/lib/update-host-with-remote.ts"],"names":[],"mappings":";;;AAAA,uCAOoB;AACpB,oEAI8C;AAC9C,qFAAiF;AAEjF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,oBAAoB,CAClC,IAAU,EACV,QAAgB,EAChB,UAAkB;IAElB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,UAAU,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5D,MAAM,0BAA0B,GAAG,IAAA,0BAAiB,EAClD,UAAU,CAAC,IAAI,EACf,6BAA6B,CAC9B,CAAC;IACF,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,UAAU,CAAC,UAAU,EACrB,cAAc,CACf,CAAC;IACF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;IAE3E,IAAI,IAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,EAAE;QAC3C,6BAA6B;QAC7B,sDAAsD;QACtD,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACtC,0BAA0B,EAC1B,UAAU,EACV,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CACR,0BAA0B,EAC1B,IAAA,6BAAoB,EAAC,UAAU,EAAE,IAAA,6BAAiB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CACxE,CAAC;KACH;SAAM;QACL,oDAAoD;QACpD,eAAM,CAAC,IAAI,CACT,mCAAmC,0BAA0B,0DAA0D,CACxH,CAAC;KACH;IAED,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAC/B,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtD,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACtC,0BAA0B,EAC1B,UAAU,EACV,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CACR,cAAc,EACd,IAAA,6BAAoB,EAAC,UAAU,EAAE,IAAA,+BAAmB,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAC1E,CAAC;KACH;SAAM;QACL,eAAM,CAAC,IAAI,CACT,wCAAwC,cAAc,0DAA0D,CACjH,CAAC;KACH;IAED,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE;QACjC,IAAI,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxD,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACtC,0BAA0B,EAC1B,UAAU,EACV,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CACR,gBAAgB,EAChB,IAAA,6BAAoB,EAClB,UAAU,EACV,IAAA,0BAAc,EAAC,MAAM,EAAE,IAAA,cAAK,EAAC,UAAU,CAAC,CAAC,CAC1C,CACF,CAAC;KACH;SAAM;QACL,eAAM,CAAC,IAAI,CACT,mCAAmC,gBAAgB,0DAA0D,CAC9G,CAAC;KACH;AACH,CAAC;AA/ED,oDA+EC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,UAAkB;IAC1D,MAAM,SAAS,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IACvE,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;QAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC,EAAE;YACnD,OAAO,IAAA,0BAAiB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;SAC3C;KACF;AACH,CAAC"}
1
+ {"version":3,"file":"update-host-with-remote.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/remote/lib/update-host-with-remote.ts"],"names":[],"mappings":"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"}
package/src/generators/setup-ssr/setup-ssr.js CHANGED
@@ -53,7 +53,7 @@ function setupSsrGenerator(tree, options) {
53
53
  projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
54
54
  projectConfig.targets = Object.assign(Object.assign({}, projectConfig.targets), { server: {
55
55
  dependsOn: ['build'],
56
- executor: '@nrwl/webpack:webpack',
56
+ executor: '@nx/webpack:webpack',
57
57
  outputs: ['{options.outputPath}'],
58
58
  defaultConfiguration: 'production',
59
59
  options: {
@@ -83,7 +83,7 @@ function setupSsrGenerator(tree, options) {
83
83
  },
84
84
  },
85
85
  }, 'serve-browser': projectConfig.targets.serve, 'serve-server': {
86
- executor: '@nrwl/js:node',
86
+ executor: '@nx/js:node',
87
87
  defaultConfiguration: 'development',
88
88
  options: {
89
89
  buildTarget: `${options.project}:server:development`,
@@ -98,7 +98,7 @@ function setupSsrGenerator(tree, options) {
98
98
  },
99
99
  },
100
100
  }, serve: {
101
- executor: '@nrwl/webpack:ssr-dev-server',
101
+ executor: '@nx/webpack:ssr-dev-server',
102
102
  defaultConfiguration: 'development',
103
103
  options: {
104
104
  browserTarget: `${options.project}:build:development`,
package/src/generators/setup-ssr/setup-ssr.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"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"}
package/src/generators/setup-tailwind/files/tailwind.config.js__tmpl__ CHANGED
@@ -1,4 +1,4 @@
1
- const { createGlobPatternsForDependencies } = require('@nrwl/react/tailwind');
1
+ const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
2
2
  const { join } = require('path');
3
3
 
4
4
  /** @type {import('tailwindcss').Config} */
package/src/generators/setup-tailwind/lib/update-project.js CHANGED
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateProject = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  function updateProject(tree, config, options) {
6
- var _a, _b, _c;
7
- var _d;
8
- if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/webpack:webpack') {
9
- (_c = (_d = config.targets.build).options) !== null && _c !== void 0 ? _c : (_d.options = {});
6
+ var _a, _b, _c, _d, _e;
7
+ var _f;
8
+ if (((_b = (_a = config === null || config === void 0 ? void 0 : config.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) === '@nx/webpack:webpack' ||
9
+ ((_d = (_c = config === null || config === void 0 ? void 0 : config.targets) === null || _c === void 0 ? void 0 : _c.build) === null || _d === void 0 ? void 0 : _d.executor) === '@nrwl/webpack:webpack') {
10
+ (_e = (_f = config.targets.build).options) !== null && _e !== void 0 ? _e : (_f.options = {});
10
11
  config.targets.build.options.postcssConfig = (0, devkit_1.joinPathFragments)(config.root, 'postcss.config.js');
11
12
  (0, devkit_1.updateProjectConfiguration)(tree, options.project, config);
12
13
  }
package/src/generators/setup-tailwind/lib/update-project.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/setup-tailwind/lib/update-project.ts"],"names":[],"mappings":";;;AACA,uCAA2E;AAI3E,SAAgB,aAAa,CAC3B,IAAU,EACV,MAA4B,EAC5B,OAA6B;;;IAE7B,IAAI,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,uBAAuB,EAAE;QAChE,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,EAAC,OAAO,uCAAP,OAAO,GAAK,EAAE,EAAC;QACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,GAAG,IAAA,0BAAiB,EAC5D,MAAM,CAAC,IAAI,EACX,mBAAmB,CACpB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3D;AACH,CAAC;AAbD,sCAaC"}
1
+ {"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/setup-tailwind/lib/update-project.ts"],"names":[],"mappings":";;;AACA,uCAA2E;AAI3E,SAAgB,aAAa,CAC3B,IAAU,EACV,MAA4B,EAC5B,OAA6B;;;IAE7B,IACE,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,qBAAqB;QAC1D,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,KAAK,0CAAE,QAAQ,MAAK,uBAAuB,EAC5D;QACA,YAAA,MAAM,CAAC,OAAO,CAAC,KAAK,EAAC,OAAO,uCAAP,OAAO,GAAK,EAAE,EAAC;QACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,GAAG,IAAA,0BAAiB,EAC5D,MAAM,CAAC,IAAI,EACX,mBAAmB,CACpB,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC3D;AACH,CAAC;AAhBD,sCAgBC"}
package/src/generators/storybook-configuration/configuration.js CHANGED
@@ -22,13 +22,14 @@ function generateStories(host, schema) {
22
22
  });
23
23
  }
24
24
  function storybookConfigurationGenerator(host, schema) {
25
- var _a, _b;
25
+ var _a, _b, _c;
26
26
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
27
27
  const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
28
28
  let bundler = (_a = schema.bundler) !== null && _a !== void 0 ? _a : 'webpack';
29
29
  const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
30
30
  if (projectConfig.projectType === 'application' &&
31
- ((_b = projectConfig.targets['build']) === null || _b === void 0 ? void 0 : _b.executor) === '@nrwl/vite:build') {
31
+ (((_b = projectConfig.targets['build']) === null || _b === void 0 ? void 0 : _b.executor) === '@nx/vite:build' ||
32
+ ((_c = projectConfig.targets['build']) === null || _c === void 0 ? void 0 : _c.executor) === '@nrwl/vite:build')) {
32
33
  bundler = 'vite';
33
34
  if (schema.bundler !== 'vite') {
34
35
  devkit_1.logger.info(`The project ${schema.name} is set up to use Vite. So
@@ -55,6 +56,7 @@ function storybookConfigurationGenerator(host, schema) {
55
56
  if (schema.generateStories) {
56
57
  yield generateStories(host, schema);
57
58
  }
59
+ yield (0, devkit_1.formatFiles)(host);
58
60
  return installTask;
59
61
  });
60
62
  }
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,uCAMoB;AACpB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,IAAA,sBAAa,EAAC,aAAa,EAAE,oBAAS,CAAC,CAAC;QACxC,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAC5B,oCAAoC,EACrC,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,iBAAiB,CACtC,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;YAC/B,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAE9C,eAAe,EAAE,oBAAS,CAAC,CAAC;QAE9B,IAAI,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,SAAS,CAAC;QAC1C,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,sBAAsB,CAAC,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,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,OAAO;YACP,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;YACvD,qBAAqB,EACnB,OAAO,KAAK,MAAM;gBAChB,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,2BAA2B;YACjC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,OAAO,WAAW,CAAC;;CACpB;AAhDD,0EAgDC;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,uCAOoB;AACpB,mDAAiD;AAEjD,SAAe,eAAe,CAAC,IAAU,EAAE,MAAgC;;QACzE,IAAA,sBAAa,EAAC,aAAa,EAAE,oBAAS,CAAC,CAAC;QACxC,MAAM,EAAE,iBAAiB,EAAE,GAAG,2CAC5B,oCAAoC,EACrC,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,iBAAiB,CACtC,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;YAC/B,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAsB,+BAA+B,CACnD,IAAU,EACV,MAAgC;;;QAEhC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAE9C,eAAe,EAAE,oBAAS,CAAC,CAAC;QAE9B,IAAI,OAAO,GAAG,MAAA,MAAM,CAAC,OAAO,mCAAI,SAAS,CAAC;QAC1C,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAElE,IACE,aAAa,CAAC,WAAW,KAAK,aAAa;YAC3C,CAAC,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,gBAAgB;gBAC5D,CAAA,MAAA,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,0CAAE,QAAQ,MAAK,kBAAkB,CAAC,EAClE;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,sBAAsB,CAAC,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,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;YAC/C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;YACjD,OAAO;YACP,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;YACvD,qBAAqB,EACnB,OAAO,KAAK,MAAM;gBAChB,CAAC,CAAC,uBAAuB;gBACzB,CAAC,CAAC,2BAA2B;YACjC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,eAAe,EAAE;YAC1B,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACrC;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,WAAW,CAAC;;CACpB;AAnDD,0EAmDC;AAED,kBAAe,+BAA+B,CAAC;AAClC,QAAA,+BAA+B,GAAG,IAAA,2BAAkB,EAC/D,+BAA+B,CAChC,CAAC"}
package/src/migrations/update-13-0-0/webpack5-changes-utils.js CHANGED
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nx/devkit");
6
6
  const devkit_2 = require("@nx/devkit");
7
7
  const ts = require("typescript");
8
- const typescript_1 = require("nx/src/utils/typescript");
8
+ const js_1 = require("@nx/js");
9
9
  function migrateToWebPack5(tree) {
10
10
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
11
11
  allReactProjectsWithStorybookConfiguration(tree).forEach((project) => {
@@ -61,10 +61,10 @@ function editProjectMainJs(tree, projectMainJsFile, projectName) {
61
61
  const file = getTsSourceFile(tree, projectMainJsFile);
62
62
  const appFileContent = tree.read(projectMainJsFile, 'utf-8');
63
63
  newContents = appFileContent;
64
- moduleExportsFull = (0, typescript_1.findNodes)(file, [ts.SyntaxKind.ExpressionStatement]);
64
+ moduleExportsFull = (0, js_1.findNodes)(file, [ts.SyntaxKind.ExpressionStatement]);
65
65
  if (moduleExportsFull && moduleExportsFull[0]) {
66
66
  const moduleExports = moduleExportsFull[0];
67
- const listOfStatements = (0, typescript_1.findNodes)(moduleExports, [
67
+ const listOfStatements = (0, js_1.findNodes)(moduleExports, [
68
68
  ts.SyntaxKind.SyntaxList,
69
69
  ]);
70
70
  /**