@nrwl/react 15.7.0-alpha.0 → 15.7.0-alpha.1

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 (28) hide show
  1. package/migrations.json +6 -0
  2. package/package.json +5 -5
  3. package/plugins/storybook/index.js +2 -2
  4. package/plugins/storybook/index.js.map +1 -1
  5. package/src/generators/application/files/{base-vite → nx-welcome}/src/app/nx-welcome.tsx +0 -0
  6. package/src/generators/application/files/style-css-module/src/app/__fileName__.tsx__tmpl__ +9 -0
  7. package/src/generators/application/files/style-global-css/src/app/__fileName__.tsx__tmpl__ +9 -0
  8. package/src/generators/application/files/style-none/src/app/__fileName__.tsx__tmpl__ +9 -0
  9. package/src/generators/application/files/style-styled-jsx/src/app/__fileName__.tsx__tmpl__ +2 -1
  10. package/src/generators/application/files/style-styled-module/src/app/__fileName__.tsx__tmpl__ +9 -0
  11. package/src/generators/application/lib/create-application-files.js +3 -0
  12. package/src/generators/application/lib/create-application-files.js.map +1 -1
  13. package/src/generators/application/lib/normalize-options.js +2 -1
  14. package/src/generators/application/lib/normalize-options.js.map +1 -1
  15. package/src/generators/host/files/common/src/app/__fileName__.tsx__tmpl__ +4 -0
  16. package/src/generators/host/files/module-federation-ssr/webpack.server.config.js__tmpl__ +3 -3
  17. package/src/generators/host/schema.d.ts +1 -0
  18. package/src/generators/host/schema.json +5 -0
  19. package/src/migrations/update-15-6-3/webpack-config-setup.d.ts +2 -0
  20. package/src/migrations/update-15-6-3/webpack-config-setup.js +108 -0
  21. package/src/migrations/update-15-6-3/webpack-config-setup.js.map +1 -0
  22. package/src/module-federation/with-module-federation.d.ts +1 -1
  23. package/src/module-federation/with-module-federation.js +2 -2
  24. package/src/module-federation/with-module-federation.js.map +1 -1
  25. package/src/rules/update-module-federation-project.d.ts +2 -2
  26. package/src/rules/update-module-federation-project.js +2 -0
  27. package/src/rules/update-module-federation-project.js.map +1 -1
  28. package/src/generators/application/files/base-webpack/src/app/nx-welcome.tsx +0 -820
package/migrations.json CHANGED
@@ -77,6 +77,12 @@
77
77
  "version": "15.3.0-beta.0",
78
78
  "description": "Install new dependencies for React projects using Webpack or Rollup.",
79
79
  "factory": "./src/migrations/update-15-3-0/install-webpack-rollup-dependencies"
80
+ },
81
+ "react-webpack-config-setup": {
82
+ "cli": "nx",
83
+ "version": "15.6.3-beta.0",
84
+ "description": "Creates or updates webpack.config.js file with the new options for webpack.",
85
+ "factory": "./src/migrations/update-15-6-3/webpack-config-setup"
80
86
  }
81
87
  },
82
88
  "packageJsonUpdates": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/react",
3
- "version": "15.7.0-alpha.0",
3
+ "version": "15.7.0-alpha.1",
4
4
  "private": false,
5
5
  "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
6
6
  "repository": {
@@ -31,9 +31,9 @@
31
31
  "migrations": "./migrations.json"
32
32
  },
33
33
  "dependencies": {
34
- "@nrwl/devkit": "15.7.0-alpha.0",
35
- "@nrwl/linter": "15.7.0-alpha.0",
36
- "@nrwl/workspace": "15.7.0-alpha.0",
34
+ "@nrwl/devkit": "15.7.0-alpha.1",
35
+ "@nrwl/linter": "15.7.0-alpha.1",
36
+ "@nrwl/workspace": "15.7.0-alpha.1",
37
37
  "@phenomnomnominal/tsquery": "4.1.1",
38
38
  "chalk": "^4.1.0",
39
39
  "minimatch": "3.0.5"
@@ -42,5 +42,5 @@
42
42
  "access": "public"
43
43
  },
44
44
  "types": "./index.d.ts",
45
- "gitHead": "be7988a3428ba211fba66c0d071f9b486a5ef584"
45
+ "gitHead": "42d38047ff854942cc8832dda035e5cc7d0a2dc0"
46
46
  }
@@ -62,10 +62,10 @@ const webpack = (storybookWebpackConfig = {}, options) => tslib_1.__awaiter(void
62
62
  projectRoot: '', sourceRoot: '', fileReplacements: [], sourceMap: true, styles: (_a = options.styles) !== null && _a !== void 0 ? _a : [], optimization: {}, tsConfig: tsconfigPath, extractCss: storybookWebpackConfig.mode === 'production', target: 'web' });
63
63
  // ESM build for modern browsers.
64
64
  let baseWebpackConfig = {};
65
- const configure = (0, config_1.composePlugins)(withNx({ skipTypeChecking: true }), withWeb(), (0, with_react_1.withReact)());
65
+ const configure = (0, config_1.composePluginsSync)(withNx({ skipTypeChecking: true }), withWeb(), (0, with_react_1.withReact)());
66
66
  const finalConfig = configure(baseWebpackConfig, {
67
67
  options: builderOptions,
68
- context: {}, // The context is not used here.
68
+ context: { root: devkit_1.workspaceRoot }, // The context is not used here.
69
69
  });
70
70
  return Object.assign(Object.assign({}, storybookWebpackConfig), { module: Object.assign(Object.assign({}, storybookWebpackConfig.module), { rules: [
71
71
  ...storybookWebpackConfig.module.rules,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/react/plugins/storybook/index.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,9 @@ import { Component } from 'react';
3
3
  <% } %>
4
4
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
5
5
  import styles from './<%= fileName %>.module.<%= style %>';
6
+ <% if (!minimal) { %>
6
7
  import NxWelcome from "./nx-welcome";
8
+ <% } %>
7
9
 
8
10
  <% if (classComponent) { %>
9
11
  export class App extends Component {
@@ -13,7 +15,14 @@ export function App() {
13
15
  <% } %>
14
16
  return (
15
17
  <>
18
+ <% if (!minimal) { %>
16
19
  <NxWelcome title="<%= projectName %>"/>
20
+ <% } else { %>
21
+ <h1>
22
+ <span> Hello there, </span>
23
+ Welcome <%= projectName %> 👋
24
+ </h1>
25
+ <% } %>
17
26
  <div />
18
27
  </>);
19
28
  <% if (classComponent) { %>
@@ -2,7 +2,9 @@
2
2
  import { Component } from 'react';
3
3
  <% } %>
4
4
  import './<%= fileName %>.<%= style %>';
5
+ <% if (!minimal) { %>
5
6
  import NxWelcome from "./nx-welcome";
7
+ <% } %>
6
8
 
7
9
  <% if (classComponent) { %>
8
10
  export class App extends Component {
@@ -12,7 +14,14 @@ export function App() {
12
14
  <% } %>
13
15
  return (
14
16
  <>
17
+ <% if (!minimal) { %>
15
18
  <NxWelcome title="<%= projectName %>"/>
19
+ <% } else { %>
20
+ <h1>
21
+ <span> Hello there, </span>
22
+ Welcome <%= projectName %> 👋
23
+ </h1>
24
+ <% } %>
16
25
  <div />
17
26
  </>);
18
27
  <% if (classComponent) { %>
@@ -1,7 +1,9 @@
1
1
  <% if (classComponent) { %>
2
2
  import { Component } from 'react';
3
3
  <% } %>
4
+ <% if (!minimal) { %>
4
5
  import NxWelcome from "./nx-welcome";
6
+ <% } %>
5
7
 
6
8
  <% if (classComponent) { %>
7
9
  export class App extends Component {
@@ -11,7 +13,14 @@ export function App() {
11
13
  <% } %>
12
14
  return (
13
15
  <>
16
+ <% if (!minimal) { %>
14
17
  <NxWelcome title="<%= projectName %>"/>
18
+ <% } else { %>
19
+ <h1>
20
+ <span> Hello there, </span>
21
+ Welcome <%= projectName %> 👋
22
+ </h1>
23
+ <% } %>
15
24
  <div />
16
25
  </>);
17
26
  <% if (classComponent) { %>
@@ -1,7 +1,9 @@
1
1
  <% if (classComponent) { %>
2
2
  import { Component } from 'react';
3
3
  <% } %>
4
+ <% if (!minimal) { %>
4
5
  import NxWelcome from "./nx-welcome";
6
+ <% } %>
5
7
 
6
8
  <% if (classComponent) { %>
7
9
  export class App extends Component {
@@ -12,7 +14,6 @@ export function App() {
12
14
  return (
13
15
  <>
14
16
  <style jsx>{`/** your style here **/`}</style>
15
- <NxWelcome title="<%= projectName %>"/>
16
17
  </>
17
18
  );
18
19
 
@@ -2,7 +2,9 @@
2
2
  import { Component } from 'react';
3
3
  <% } %>
4
4
  import styled from '<%= styledModule %>';
5
+ <% if (!minimal) { %>
5
6
  import NxWelcome from "./nx-welcome";
7
+ <% } %>
6
8
 
7
9
  const StyledApp = styled.div`
8
10
  // Your style here
@@ -16,7 +18,14 @@ export function App() {
16
18
  <% } %>
17
19
  return (
18
20
  <StyledApp>
21
+ <% if (!minimal) { %>
19
22
  <NxWelcome title="<%= projectName %>"/>
23
+ <% } else { %>
24
+ <h1>
25
+ <span> Hello there, </span>
26
+ Welcome <%= projectName %> 👋
27
+ </h1>
28
+ <% } %>
20
29
  </StyledApp>
21
30
  );
22
31
  <% if (classComponent) { %>
@@ -34,6 +34,9 @@ function createApplicationFiles(host, options) {
34
34
  (options.unitTestRunner === 'vitest' && options.inSourceTests == true)) {
35
35
  host.delete(`${options.appProjectRoot}/src/app/${options.fileName}.spec.tsx`);
36
36
  }
37
+ if (!options.minimal) {
38
+ (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/nx-welcome'), options.appProjectRoot, templateVariables);
39
+ }
37
40
  (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, styleSolutionSpecificAppFiles), options.appProjectRoot, templateVariables);
38
41
  if (options.js) {
39
42
  (0, devkit_1.toJS)(host);
@@ -1 +1 @@
1
- {"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AACA,yCAAgF;AAChF,+BAA4B;AAC5B,yEAAyF;AACzF,sEAAiE;AACjE,4GAAoG;AACpG,mDAA8C;AAE9C,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,IAAI,6BAAqC,CAAC;IAC1C,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QAC1D,6BAA6B,GAAG,8BAA8B,CAAC;KAChE;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QACzC,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,EAAE;QACnC,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;SAAM,IAAI,OAAO,CAAC,SAAS,EAAE;QAC5B,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;SAAM;QACL,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;IAED,MAAM,0BAA0B,GAAG,IAAA,0CAA6B,EAC9D,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,CAAC;IACF,MAAM,QAAQ,GAAG,IAAA,2BAAW,EAAC,OAAO,CAAC,CAAC;IACtC,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,EACtD,QAAQ,EACR,mBAAmB,EAAE,IAAA,oEAA8B,EAAC,QAAQ,CAAC,GAC9D,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EACF,SAAS,EACT,OAAO,CAAC,OAAO,KAAK,MAAM;QACxB,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,uBAAuB,CAC5B,EACD,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IACE,OAAO,CAAC,cAAc,KAAK,MAAM;QACjC,CAAC,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC,EACtE;QACA,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,YAAY,OAAO,CAAC,QAAQ,WAAW,CACjE,CAAC;KACH;IACD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC9C,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;IAED,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,cAAc,EACtB,KAAK,EACL,OAAO,EACP,0BAA0B,CAC3B,CAAC;AACJ,CAAC;AAlED,wDAkEC"}
1
+ {"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AACA,yCAAgF;AAChF,+BAA4B;AAC5B,yEAAyF;AACzF,sEAAiE;AACjE,4GAAoG;AACpG,mDAA8C;AAE9C,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,IAAI,6BAAqC,CAAC;IAC1C,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QAC1D,6BAA6B,GAAG,8BAA8B,CAAC;KAChE;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QACzC,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,EAAE;QACnC,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;SAAM,IAAI,OAAO,CAAC,SAAS,EAAE;QAC5B,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;SAAM;QACL,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;IAED,MAAM,0BAA0B,GAAG,IAAA,0CAA6B,EAC9D,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,CAAC;IACF,MAAM,QAAQ,GAAG,IAAA,2BAAW,EAAC,OAAO,CAAC,CAAC;IACtC,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,EACtD,QAAQ,EACR,mBAAmB,EAAE,IAAA,oEAA8B,EAAC,QAAQ,CAAC,GAC9D,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EACF,SAAS,EACT,OAAO,CAAC,OAAO,KAAK,MAAM;QACxB,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,uBAAuB,CAC5B,EACD,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IACE,OAAO,CAAC,cAAc,KAAK,MAAM;QACjC,CAAC,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC,EACtE;QACA,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,YAAY,OAAO,CAAC,QAAQ,WAAW,CACjE,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,qBAAqB,CAAC,EACtC,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;KACH;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC9C,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;IAED,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,cAAc,EACtB,KAAK,EACL,OAAO,EACP,0BAA0B,CAC3B,CAAC;AACJ,CAAC;AA5ED,wDA4EC"}
@@ -16,7 +16,7 @@ function normalizeProjectName(options) {
16
16
  }
17
17
  exports.normalizeProjectName = normalizeProjectName;
18
18
  function normalizeOptions(host, options) {
19
- var _a, _b, _c, _d, _e, _f, _g, _h;
19
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
20
20
  const appDirectory = normalizeDirectory(options);
21
21
  const appProjectName = normalizeProjectName(options);
22
22
  const e2eProjectName = options.rootProject
@@ -53,6 +53,7 @@ function normalizeOptions(host, options) {
53
53
  normalized.e2eTestRunner = (_g = normalized.e2eTestRunner) !== null && _g !== void 0 ? _g : 'cypress';
54
54
  normalized.inSourceTests = normalized.minimal || normalized.inSourceTests;
55
55
  (_h = normalized.devServerPort) !== null && _h !== void 0 ? _h : (normalized.devServerPort = (0, find_free_port_1.findFreePort)(host));
56
+ normalized.minimal = (_j = normalized.minimal) !== null && _j !== void 0 ? _j : false;
56
57
  return normalized;
57
58
  }
58
59
  exports.normalizeOptions = normalizeOptions;
@@ -1 +1 @@
1
- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,7 @@
1
1
  import * as React from 'react';
2
+ <% if (!minimal) { %>
2
3
  import NxWelcome from "./nx-welcome";
4
+ <% } %>
3
5
  import { Link, Route, Routes } from 'react-router-dom';
4
6
 
5
7
  <% if (remotes.length > 0) { %>
@@ -17,7 +19,9 @@ export function App() {
17
19
  <% }); %>
18
20
  </ul>
19
21
  <Routes>
22
+ <% if (!minimal) { %>
20
23
  <Route path="/" element={<NxWelcome title="<%= projectName %>"/>} />
24
+ <% } %>
21
25
  <% remotes.forEach(function(r) { %>
22
26
  <Route path="/<%=r.fileName%>" element={<<%= r.className %>/>} />
23
27
  <% }); %>
@@ -1,6 +1,6 @@
1
- import { composePlugins, withNx } from '@nrwl/webpack';
2
- import { withReact } from '@nrwl/react';
3
- import { withModuleFederationForSSR } from '@nrwl/react/module-federation';
1
+ const { composePlugins, withNx } = require('@nrwl/webpack');
2
+ const { withReact } = require('@nrwl/react');
3
+ const { withModuleFederationForSSR } = require('@nrwl/react/module-federation');
4
4
 
5
5
  const baseConfig = require('./module-federation.config');
6
6
 
@@ -22,6 +22,7 @@ export interface Schema {
22
22
  style: SupportedStyles;
23
23
  tags?: string;
24
24
  unitTestRunner: 'jest' | 'vitest' | 'none';
25
+ minimal?: boolean;
25
26
  }
26
27
 
27
28
  export interface NormalizedSchema extends Schema {
@@ -162,6 +162,11 @@
162
162
  "description": "Whether to configure SSR for the host application",
163
163
  "type": "boolean",
164
164
  "default": false
165
+ },
166
+ "minimal": {
167
+ "description": "Generate a React app with a minimal setup. No nx starter template.",
168
+ "type": "boolean",
169
+ "default": false
165
170
  }
166
171
  },
167
172
  "required": ["name"],
@@ -0,0 +1,2 @@
1
+ import { Tree } from '@nrwl/devkit';
2
+ export default function (tree: Tree): Promise<void>;
@@ -0,0 +1,108 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const tslib_1 = require("tslib");
4
+ const devkit_1 = require("@nrwl/devkit");
5
+ const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
6
+ const path_1 = require("path");
7
+ function default_1(tree) {
8
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
+ // Since projects can have multiple configurations, we need to know if the default options
10
+ // need to be migrated or not. If so then the subsequent configurations with `webpackConfig` also need to be.
11
+ const defaultOptionsUpdated = new Set();
12
+ (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/webpack:webpack', (options, projectName, targetName, configurationName) => {
13
+ var _a;
14
+ const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
15
+ const defaultOptions = projectConfiguration.targets[targetName].options;
16
+ const defaultWasUpdated = defaultOptionsUpdated.has(projectName);
17
+ // If default was not updated (for different configurations), we don't do anything
18
+ // If isolatedConfig is set, we don't need to do anything
19
+ // If it is NOT React, we don't need to do anything
20
+ if (!defaultWasUpdated &&
21
+ ((defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions['isolatedConfig']) ||
22
+ !(((_a = defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions['main']) === null || _a === void 0 ? void 0 : _a.match(/main\.(t|j)sx$/)) ||
23
+ (defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions['webpackConfig']) === '@nrwl/react/plugins/webpack'))) {
24
+ return;
25
+ }
26
+ defaultOptionsUpdated.add(projectName);
27
+ // If this is not the default options (e.g. for development, production, or something custom),
28
+ // then skip it unless it specifically configures a webpackConfig file
29
+ if (configurationName && !(options === null || options === void 0 ? void 0 : options.webpackConfig)) {
30
+ return;
31
+ }
32
+ // If webpackConfig is set, update it with the new options
33
+ // If webpackConfig is not set, we need to create a new
34
+ // webpack.config.js file and set the path to it in the
35
+ // executor options
36
+ if ((options === null || options === void 0 ? void 0 : options['webpackConfig']) &&
37
+ options['webpackConfig'] !== '@nrwl/react/plugins/webpack') {
38
+ let oldName = options['webpackConfig'];
39
+ if (options['webpackConfig'].endsWith('.js')) {
40
+ oldName = options['webpackConfig'].replace('.js', '.old.js');
41
+ }
42
+ if (options['webpackConfig'].endsWith('.ts')) {
43
+ oldName = options['webpackConfig'].replace('.ts', '.old.ts');
44
+ }
45
+ renameFile(tree, options['webpackConfig'], oldName);
46
+ const justTheFileName = (0, path_1.basename)(oldName);
47
+ tree.write(options['webpackConfig'], `
48
+ const { composePlugins, withNx } = require('@nrwl/webpack');
49
+ const { withReact } = require('@nrwl/react');
50
+
51
+ // Nx plugins for webpack.
52
+ module.exports = composePlugins(withNx(), withReact(), (config, { options, context }) => {
53
+ // Note: This was added by an Nx migration.
54
+ // You should consider inlining the logic into this file.
55
+ // For more information on webpack config and Nx see:
56
+ // https://nx.dev/packages/webpack/documents/webpack-config-setup
57
+ return require('./${justTheFileName}')(config, context);
58
+ });
59
+ `);
60
+ options['isolatedConfig'] = true;
61
+ projectConfiguration.targets[targetName][configurationName !== null && configurationName !== void 0 ? configurationName : 'options'] = options;
62
+ (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
63
+ devkit_1.logger.info(`
64
+ ${options['webpackConfig']} has been renamed to ${oldName} and a new ${options['webpackConfig']}
65
+ has been created for your project ${projectName}.
66
+ You should consider inlining the logic from ${oldName} into ${options['webpackConfig']}.
67
+ You can read our guide on how to do this here:
68
+
69
+ https://nx.dev/packages/webpack/documents/webpack-config-setup
70
+ `);
71
+ }
72
+ else {
73
+ const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
74
+ if (!options) {
75
+ options = {};
76
+ }
77
+ options['webpackConfig'] = `${projectConfiguration.root}/webpack.config.js`;
78
+ options['isolatedConfig'] = true;
79
+ tree.write(options['webpackConfig'], `
80
+ const { composePlugins, withNx } = require('@nrwl/webpack');
81
+ const { withReact } = require('@nrwl/react');
82
+
83
+ // Nx plugins for webpack.
84
+ module.exports = composePlugins(withNx(), withReact(), (config, { options, context }) => {
85
+ // Update the webpack config as needed here.
86
+ // e.g. config.plugins.push(new MyPlugin())
87
+ // For more information on webpack config and Nx see:
88
+ // https://nx.dev/packages/webpack/documents/webpack-config-setup
89
+ return config;
90
+ });
91
+ `);
92
+ projectConfiguration.targets[targetName].options = options;
93
+ (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
94
+ }
95
+ });
96
+ yield (0, devkit_1.formatFiles)(tree);
97
+ });
98
+ }
99
+ exports.default = default_1;
100
+ function renameFile(tree, from, to) {
101
+ const buffer = tree.read(from);
102
+ if (!buffer) {
103
+ return;
104
+ }
105
+ tree.write(to, buffer);
106
+ tree.delete(from);
107
+ }
108
+ //# sourceMappingURL=webpack-config-setup.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"webpack-config-setup.js","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-15-6-3/webpack-config-setup.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,iGAA8F;AAC9F,+BAAgC;AAGhC,mBAA+B,IAAU;;QACvC,0FAA0F;QAC1F,6GAA6G;QAC7G,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;QAChD,IAAA,+CAAsB,EACpB,IAAI,EACJ,uBAAuB,EACvB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;;YACtD,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACzE,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YACxE,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEjE,kFAAkF;YAClF,yDAAyD;YACzD,mDAAmD;YACnD,IACE,CAAC,iBAAiB;gBAClB,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,gBAAgB,CAAC;oBACjC,CAAC,CACC,CAAA,MAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,MAAM,CAAC,0CAAE,KAAK,CAAC,gBAAgB,CAAC;wBACjD,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,eAAe,CAAC,MAAK,6BAA6B,CACpE,CAAC,EACJ;gBACA,OAAO;aACR;YACD,qBAAqB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEvC,8FAA8F;YAC9F,sEAAsE;YACtE,IAAI,iBAAiB,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAA,EAAE;gBAChD,OAAO;aACR;YAED,0DAA0D;YAC1D,uDAAuD;YACvD,uDAAuD;YACvD,mBAAmB;YAEnB,IACE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,eAAe,CAAC;gBAC1B,OAAO,CAAC,eAAe,CAAC,KAAK,6BAA6B,EAC1D;gBACA,IAAI,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;gBACvC,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAC5C,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;iBAC9D;gBACD,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAC5C,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;iBAC9D;gBAED,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,CAAC;gBAEpD,MAAM,eAAe,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,CAAC;gBAC1C,IAAI,CAAC,KAAK,CACR,OAAO,CAAC,eAAe,CAAC,EACxB;;;;;;;;;;kCAUwB,eAAe;;aAEpC,CACJ,CAAC;gBAEF,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;gBAEjC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CACtC,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,SAAS,CAC/B,GAAG,OAAO,CAAC;gBACZ,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;gBAEpE,eAAM,CAAC,IAAI,CACT;YACE,OAAO,CAAC,eAAe,CAAC,wBAAwB,OAAO,cAAc,OAAO,CAAC,eAAe,CAAC;8CAC3D,WAAW;wDACD,OAAO,SAAS,OAAO,CAAC,eAAe,CAAC;;;;WAIrF,CACF,CAAC;aACH;iBAAM;gBACL,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,WAAW,CACZ,CAAC;gBAEF,IAAI,CAAC,OAAO,EAAE;oBACZ,OAAO,GAAG,EAA4B,CAAC;iBACxC;gBAED,OAAO,CACL,eAAe,CAChB,GAAG,GAAG,oBAAoB,CAAC,IAAI,oBAAoB,CAAC;gBACrD,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;gBAEjC,IAAI,CAAC,KAAK,CACR,OAAO,CAAC,eAAe,CAAC,EACxB;;;;;;;;;;;;SAYD,CACA,CAAC;gBAEF,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;gBAC3D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;aACrE;QACH,CAAC,CACF,CAAC;QAEF,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA9HD,4BA8HC;AAED,SAAS,UAAU,CAAC,IAAU,EAAE,IAAY,EAAE,EAAU;IACtD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM,EAAE;QACX,OAAO;KACR;IACD,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC"}
@@ -1,2 +1,2 @@
1
1
  import { ModuleFederationConfig } from '@nrwl/devkit';
2
- export declare function withModuleFederation(options: ModuleFederationConfig): Promise<(config: any) => any>;
2
+ export declare function withModuleFederation(options: ModuleFederationConfig): Promise<(config: any, ctx: any) => any>;
@@ -21,8 +21,8 @@ function withModuleFederation(options) {
21
21
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
22
22
  const reactWebpackConfig = require('../../plugins/webpack');
23
23
  const { sharedDependencies, sharedLibraries, mappedRemotes } = yield (0, utils_1.getModuleFederationConfig)(options, determineRemoteUrl);
24
- return (config) => {
25
- config = reactWebpackConfig(config);
24
+ return (config, ctx) => {
25
+ config = reactWebpackConfig(config, ctx);
26
26
  config.output.uniqueName = options.name;
27
27
  config.output.publicPath = 'auto';
28
28
  config.optimization = {
@@ -1 +1 @@
1
- {"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;AACA,sEAAoF;AACpF,mCAAoD;AACpD,uFAAwF;AAExF,SAAS,kBAAkB,CAAC,MAAc;;IACxC,MAAM,mBAAmB,GAAG,IAAA,8CAA8B,EAAC,MAAM,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,0CAAE,KAAK,CAAC;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM;mJACsF,CAC9I,CAAC;KACH;IAED,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,kBAAkB,CAAC;IAC7D,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;IAC/C,OAAO,GACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAC3C,IAAI,IAAI,iBAAiB,CAAC;AAC5B,CAAC;AAED,SAAsB,oBAAoB,CAAC,OAA+B;;QACxE,MAAM,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAE/D,OAAO,CAAC,MAAM,EAAE,EAAE;YAChB,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;YACpC,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC;YAElC,MAAM,CAAC,YAAY,GAAG;gBACpB,YAAY,EAAE,KAAK;aACpB,CAAC;YAEF,MAAM,CAAC,WAAW,mCACb,MAAM,CAAC,WAAW,KACrB,YAAY,EAAE,IAAI,GACnB,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CACjB,IAAI,sBAAsB,CAAC;gBACzB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;iBACf;gBACD,QAAQ,EAAE,gBAAgB;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,aAAa;gBACtB,MAAM,oBACD,kBAAkB,CACtB;aACF,CAAC,EACF,eAAe,CAAC,oBAAoB,EAAE,CACvC,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAtCD,oDAsCC"}
1
+ {"version":3,"file":"with-module-federation.js","sourceRoot":"","sources":["../../../../../packages/react/src/module-federation/with-module-federation.ts"],"names":[],"mappings":";;;;AACA,sEAAoF;AACpF,mCAAoD;AACpD,uFAAwF;AAExF,SAAS,kBAAkB,CAAC,MAAc;;IACxC,MAAM,mBAAmB,GAAG,IAAA,8CAA8B,EAAC,MAAM,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,MAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,0CAAE,KAAK,CAAC;IAExD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,iDAAiD,MAAM;mJACsF,CAC9I,CAAC;KACH;IAED,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,kBAAkB,CAAC;IAC7D,MAAM,IAAI,GAAG,MAAA,MAAA,WAAW,CAAC,OAAO,0CAAE,IAAI,mCAAI,IAAI,CAAC;IAC/C,OAAO,GACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAC3C,IAAI,IAAI,iBAAiB,CAAC;AAC5B,CAAC;AAED,SAAsB,oBAAoB,CAAC,OAA+B;;QACxE,MAAM,kBAAkB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,EAAE,kBAAkB,EAAE,eAAe,EAAE,aAAa,EAAE,GAC1D,MAAM,IAAA,iCAAyB,EAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;QAE/D,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACrB,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACzC,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC;YAElC,MAAM,CAAC,YAAY,GAAG;gBACpB,YAAY,EAAE,KAAK;aACpB,CAAC;YAEF,MAAM,CAAC,WAAW,mCACb,MAAM,CAAC,WAAW,KACrB,YAAY,EAAE,IAAI,GACnB,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CACjB,IAAI,sBAAsB,CAAC;gBACzB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE;oBACP,IAAI,EAAE,QAAQ;iBACf;gBACD,QAAQ,EAAE,gBAAgB;gBAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,OAAO,EAAE,aAAa;gBACtB,MAAM,oBACD,kBAAkB,CACtB;aACF,CAAC,EACF,eAAe,CAAC,oBAAoB,EAAE,CACvC,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;IACJ,CAAC;CAAA;AAtCD,oDAsCC"}
@@ -1,6 +1,6 @@
1
- import { Tree } from '@nrwl/devkit';
1
+ import { GeneratorCallback, Tree } from '@nrwl/devkit';
2
2
  export declare function updateModuleFederationProject(host: Tree, options: {
3
3
  projectName: string;
4
4
  appProjectRoot: string;
5
5
  devServerPort?: number;
6
- }): void;
6
+ }): GeneratorCallback;
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.updateModuleFederationProject = void 0;
4
4
  const devkit_1 = require("@nrwl/devkit");
5
+ const versions_1 = require("../utils/versions");
5
6
  function updateModuleFederationProject(host, options) {
6
7
  const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
7
8
  projectConfig.targets.build.options = Object.assign(Object.assign({}, projectConfig.targets.build.options), { main: `${options.appProjectRoot}/src/main.ts`, webpackConfig: `${options.appProjectRoot}/webpack.config.js` });
@@ -27,6 +28,7 @@ function updateModuleFederationProject(host, options) {
27
28
  },
28
29
  };
29
30
  (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
31
+ return (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@nrwl/web': versions_1.nxVersion });
30
32
  }
31
33
  exports.updateModuleFederationProject = updateModuleFederationProject;
32
34
  //# sourceMappingURL=update-module-federation-project.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"update-module-federation-project.js","sourceRoot":"","sources":["../../../../../packages/react/src/rules/update-module-federation-project.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AAEtB,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAIC;IAED,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1E,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCAC9B,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KACtC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,cAAc,EAC7C,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,GAC7D,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,mCAChD,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,KACxD,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,yBAAyB,GAClE,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ;QAClC,0CAA0C,CAAC;IAC7C,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IAEjE,uEAAuE;IACvE,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;QACtC,QAAQ,EAAE,uBAAuB;QACjC,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,IAAI,EAAE,OAAO,CAAC,aAAa;SAC5B;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;aACxD;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;aACvD;SACF;KACF,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AACvE,CAAC;AA5CD,sEA4CC"}
1
+ {"version":3,"file":"update-module-federation-project.js","sourceRoot":"","sources":["../../../../../packages/react/src/rules/update-module-federation-project.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,gDAA8C;AAE9C,SAAgB,6BAA6B,CAC3C,IAAU,EACV,OAIC;IAED,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE1E,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,mCAC9B,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,KACtC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,cAAc,EAC7C,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,GAC7D,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,mCAChD,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,KACxD,aAAa,EAAE,GAAG,OAAO,CAAC,cAAc,yBAAyB,GAClE,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ;QAClC,0CAA0C,CAAC;IAC7C,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC;IAEjE,uEAAuE;IACvE,aAAa,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG;QACtC,QAAQ,EAAE,uBAAuB;QACjC,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,IAAI,EAAE,OAAO,CAAC,aAAa;SAC5B;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;aACxD;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;aACvD;SACF;KACF,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAErE,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,oBAAS,EAAE,CAAC,CAAC;AAC5E,CAAC;AA9CD,sEA8CC"}