@nx/react 16.4.0-beta.0 → 16.4.0-beta.10

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 (226) hide show
  1. package/ast-utils.js +0 -1
  2. package/babel.js +0 -1
  3. package/index.js +0 -1
  4. package/migrations.json +43 -0
  5. package/module-federation.js +0 -1
  6. package/package.json +7 -7
  7. package/plugins/bundle-rollup.js +0 -1
  8. package/plugins/component-testing/index.js +0 -1
  9. package/plugins/component-testing/webpack-fallback.js +0 -1
  10. package/plugins/jest.js +0 -1
  11. package/plugins/storybook/index.js +65 -4
  12. package/plugins/storybook/merge-plugins.js +0 -1
  13. package/plugins/webpack.js +0 -1
  14. package/plugins/with-react.js +0 -1
  15. package/src/executors/module-federation-dev-server/compat.js +0 -1
  16. package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js +0 -1
  17. package/src/executors/module-federation-ssr-dev-server/compat.js +0 -1
  18. package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js +0 -1
  19. package/src/generators/application/application.js +4 -5
  20. package/src/generators/application/lib/add-cypress.js +0 -1
  21. package/src/generators/application/lib/add-jest.js +0 -1
  22. package/src/generators/application/lib/add-project.js +0 -1
  23. package/src/generators/application/lib/add-routing.js +0 -1
  24. package/src/generators/application/lib/create-application-files.js +0 -1
  25. package/src/generators/application/lib/find-free-port.js +0 -1
  26. package/src/generators/application/lib/get-app-tests.js +0 -1
  27. package/src/generators/application/lib/install-common-dependencies.js +15 -9
  28. package/src/generators/application/lib/normalize-options.js +0 -1
  29. package/src/generators/application/lib/set-defaults.js +1 -2
  30. package/src/generators/application/lib/show-possible-warnings.d.ts +3 -0
  31. package/src/generators/application/lib/show-possible-warnings.js +11 -0
  32. package/src/generators/application/lib/update-jest-config.js +0 -1
  33. package/src/generators/application/schema.d.ts +1 -1
  34. package/src/generators/application/schema.json +2 -2
  35. package/src/generators/component/component.js +0 -1
  36. package/src/generators/component/get-component-tests.js +0 -1
  37. package/src/generators/component/noramlized-schema.js +0 -1
  38. package/src/generators/component-cypress-spec/component-cypress-spec.js +0 -1
  39. package/src/generators/component-story/component-story.js +0 -1
  40. package/src/generators/component-test/component-test.js +0 -1
  41. package/src/generators/component-test/schema.js +0 -1
  42. package/src/generators/cypress-component-configuration/cypress-component-configuration.js +0 -1
  43. package/src/generators/cypress-component-configuration/lib/add-files.d.ts +1 -1
  44. package/src/generators/cypress-component-configuration/lib/add-files.js +4 -2
  45. package/src/generators/hook/hook.js +0 -1
  46. package/src/generators/host/host.js +0 -1
  47. package/src/generators/host/lib/add-module-federation-files.js +0 -1
  48. package/src/generators/host/lib/setup-ssr-for-host.js +0 -1
  49. package/src/generators/host/lib/update-module-federation-e2e-project.js +0 -1
  50. package/src/generators/host/schema.d.ts +1 -1
  51. package/src/generators/host/schema.json +1 -1
  52. package/src/generators/init/init.js +0 -26
  53. package/src/generators/init/schema.d.ts +0 -1
  54. package/src/generators/init/schema.json +0 -5
  55. package/src/generators/library/lib/add-linting.js +0 -1
  56. package/src/generators/library/lib/add-rollup-build-target.js +0 -1
  57. package/src/generators/library/lib/create-files.js +25 -4
  58. package/src/generators/library/lib/install-common-dependencies.js +3 -1
  59. package/src/generators/library/lib/maybe-js.js +0 -1
  60. package/src/generators/library/lib/normalize-options.js +0 -1
  61. package/src/generators/library/lib/set-defaults.js +0 -1
  62. package/src/generators/library/lib/update-app-routes.js +0 -1
  63. package/src/generators/library/library.js +3 -2
  64. package/src/generators/redux/redux.js +0 -1
  65. package/src/generators/remote/lib/setup-ssr-for-remote.js +0 -1
  66. package/src/generators/remote/lib/update-host-with-remote.js +0 -1
  67. package/src/generators/remote/remote.js +0 -1
  68. package/src/generators/remote/schema.d.ts +1 -1
  69. package/src/generators/remote/schema.json +1 -1
  70. package/src/generators/setup-ssr/setup-ssr.js +0 -1
  71. package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js +0 -1
  72. package/src/generators/setup-tailwind/lib/update-project.js +0 -1
  73. package/src/generators/setup-tailwind/schema.js +0 -1
  74. package/src/generators/setup-tailwind/setup-tailwind.js +0 -1
  75. package/src/generators/stories/stories.js +0 -1
  76. package/src/generators/storybook-configuration/configuration.js +0 -1
  77. package/src/migrations/update-12-0-0/remove-react-redux-types-package.js +0 -1
  78. package/src/migrations/update-12-0-0/update-emotion-setup.js +0 -1
  79. package/src/migrations/update-12-0-0/use-react-jsx-in-tsconfig.js +0 -1
  80. package/src/migrations/update-12-8-0/update-12-8-0.js +0 -1
  81. package/src/migrations/update-13-0-0/migrate-storybook-to-webpack-5.js +0 -1
  82. package/src/migrations/update-13-0-0/update-emotion-setup.js +0 -1
  83. package/src/migrations/update-13-0-0/webpack5-changes-utils.js +0 -1
  84. package/src/migrations/update-13-10-0/update-13-10-0.js +0 -1
  85. package/src/migrations/update-14-0-0/add-default-development-configurations.js +0 -1
  86. package/src/migrations/update-14-0-0/replace-testing-library-react-hook.js +0 -1
  87. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js +0 -1
  88. package/src/migrations/update-14-1-0/update-external-emotion-jsx-runtime.js +0 -1
  89. package/src/migrations/update-14-6-0/add-preset-jest-config.js +0 -1
  90. package/src/migrations/update-15-3-0/install-webpack-rollup-dependencies.js +0 -1
  91. package/src/migrations/update-15-3-0/update-rollup-executor.js +0 -1
  92. package/src/migrations/update-15-6-3/webpack-config-setup.js +0 -1
  93. package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js +0 -1
  94. package/src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package.js +0 -1
  95. package/src/migrations/update-16-3-0/remove-types-react-router-dom-package.js +0 -1
  96. package/src/module-federation/ast-utils.js +0 -1
  97. package/src/module-federation/load-config.js +0 -1
  98. package/src/module-federation/models.js +0 -1
  99. package/src/module-federation/package-json.js +0 -1
  100. package/src/module-federation/utils.js +0 -1
  101. package/src/module-federation/with-module-federation-ssr.js +0 -1
  102. package/src/module-federation/with-module-federation.js +0 -1
  103. package/src/rules/add-styled-dependencies.js +0 -1
  104. package/src/rules/update-module-federation-project.js +0 -1
  105. package/src/utils/assertion.js +0 -1
  106. package/src/utils/ast-utils.js +0 -1
  107. package/src/utils/component-props.js +0 -1
  108. package/src/utils/create-ts-config.js +0 -1
  109. package/src/utils/ct-utils.d.ts +2 -5
  110. package/src/utils/ct-utils.js +13 -10
  111. package/src/utils/dependencies.js +0 -1
  112. package/src/utils/format-file.js +0 -1
  113. package/src/utils/get-in-source-vitest-tests-template.js +0 -1
  114. package/src/utils/jest-utils.js +0 -1
  115. package/src/utils/lint.js +0 -1
  116. package/src/utils/styled.js +0 -1
  117. package/src/utils/testing-generators.js +0 -1
  118. package/src/utils/versions.d.ts +7 -7
  119. package/src/utils/versions.js +7 -8
  120. package/tailwind.js +0 -1
  121. package/ast-utils.js.map +0 -1
  122. package/babel.js.map +0 -1
  123. package/index.js.map +0 -1
  124. package/module-federation.js.map +0 -1
  125. package/plugins/bundle-rollup.js.map +0 -1
  126. package/plugins/component-testing/index.js.map +0 -1
  127. package/plugins/component-testing/webpack-fallback.js.map +0 -1
  128. package/plugins/jest.js.map +0 -1
  129. package/plugins/storybook/index.js.map +0 -1
  130. package/plugins/storybook/merge-plugins.js.map +0 -1
  131. package/plugins/webpack.js.map +0 -1
  132. package/plugins/with-react.js.map +0 -1
  133. package/src/executors/module-federation-dev-server/compat.js.map +0 -1
  134. package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js.map +0 -1
  135. package/src/executors/module-federation-ssr-dev-server/compat.js.map +0 -1
  136. package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js.map +0 -1
  137. package/src/generators/application/application.js.map +0 -1
  138. package/src/generators/application/lib/add-cypress.js.map +0 -1
  139. package/src/generators/application/lib/add-jest.js.map +0 -1
  140. package/src/generators/application/lib/add-project.js.map +0 -1
  141. package/src/generators/application/lib/add-routing.js.map +0 -1
  142. package/src/generators/application/lib/create-application-files.js.map +0 -1
  143. package/src/generators/application/lib/find-free-port.js.map +0 -1
  144. package/src/generators/application/lib/get-app-tests.js.map +0 -1
  145. package/src/generators/application/lib/install-common-dependencies.js.map +0 -1
  146. package/src/generators/application/lib/normalize-options.js.map +0 -1
  147. package/src/generators/application/lib/set-defaults.js.map +0 -1
  148. package/src/generators/application/lib/update-jest-config.js.map +0 -1
  149. package/src/generators/component/component.js.map +0 -1
  150. package/src/generators/component/get-component-tests.js.map +0 -1
  151. package/src/generators/component/noramlized-schema.js.map +0 -1
  152. package/src/generators/component-cypress-spec/component-cypress-spec.js.map +0 -1
  153. package/src/generators/component-story/component-story.js.map +0 -1
  154. package/src/generators/component-test/component-test.js.map +0 -1
  155. package/src/generators/component-test/schema.js.map +0 -1
  156. package/src/generators/cypress-component-configuration/cypress-component-configuration.js.map +0 -1
  157. package/src/generators/cypress-component-configuration/lib/add-files.js.map +0 -1
  158. package/src/generators/hook/hook.js.map +0 -1
  159. package/src/generators/host/host.js.map +0 -1
  160. package/src/generators/host/lib/add-module-federation-files.js.map +0 -1
  161. package/src/generators/host/lib/setup-ssr-for-host.js.map +0 -1
  162. package/src/generators/host/lib/update-module-federation-e2e-project.js.map +0 -1
  163. package/src/generators/init/init.js.map +0 -1
  164. package/src/generators/library/files/common/.babelrc__tmpl__ +0 -16
  165. package/src/generators/library/lib/add-linting.js.map +0 -1
  166. package/src/generators/library/lib/add-rollup-build-target.js.map +0 -1
  167. package/src/generators/library/lib/create-files.js.map +0 -1
  168. package/src/generators/library/lib/install-common-dependencies.js.map +0 -1
  169. package/src/generators/library/lib/maybe-js.js.map +0 -1
  170. package/src/generators/library/lib/normalize-options.js.map +0 -1
  171. package/src/generators/library/lib/set-defaults.js.map +0 -1
  172. package/src/generators/library/lib/update-app-routes.js.map +0 -1
  173. package/src/generators/library/library.js.map +0 -1
  174. package/src/generators/redux/redux.js.map +0 -1
  175. package/src/generators/remote/lib/setup-ssr-for-remote.js.map +0 -1
  176. package/src/generators/remote/lib/update-host-with-remote.js.map +0 -1
  177. package/src/generators/remote/remote.js.map +0 -1
  178. package/src/generators/setup-ssr/setup-ssr.js.map +0 -1
  179. package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js.map +0 -1
  180. package/src/generators/setup-tailwind/lib/update-project.js.map +0 -1
  181. package/src/generators/setup-tailwind/schema.js.map +0 -1
  182. package/src/generators/setup-tailwind/setup-tailwind.js.map +0 -1
  183. package/src/generators/stories/stories.js.map +0 -1
  184. package/src/generators/storybook-configuration/configuration.js.map +0 -1
  185. package/src/migrations/update-12-0-0/remove-react-redux-types-package.js.map +0 -1
  186. package/src/migrations/update-12-0-0/update-emotion-setup.js.map +0 -1
  187. package/src/migrations/update-12-0-0/use-react-jsx-in-tsconfig.js.map +0 -1
  188. package/src/migrations/update-12-8-0/update-12-8-0.js.map +0 -1
  189. package/src/migrations/update-13-0-0/migrate-storybook-to-webpack-5.js.map +0 -1
  190. package/src/migrations/update-13-0-0/update-emotion-setup.js.map +0 -1
  191. package/src/migrations/update-13-0-0/webpack5-changes-utils.js.map +0 -1
  192. package/src/migrations/update-13-10-0/update-13-10-0.js.map +0 -1
  193. package/src/migrations/update-14-0-0/add-default-development-configurations.js.map +0 -1
  194. package/src/migrations/update-14-0-0/replace-testing-library-react-hook.js.map +0 -1
  195. package/src/migrations/update-14-0-0/update-react-dom-render-for-v18.js.map +0 -1
  196. package/src/migrations/update-14-1-0/update-external-emotion-jsx-runtime.js.map +0 -1
  197. package/src/migrations/update-14-6-0/add-preset-jest-config.js.map +0 -1
  198. package/src/migrations/update-15-3-0/install-webpack-rollup-dependencies.js.map +0 -1
  199. package/src/migrations/update-15-3-0/update-rollup-executor.js.map +0 -1
  200. package/src/migrations/update-15-6-3/webpack-config-setup.js.map +0 -1
  201. package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js.map +0 -1
  202. package/src/migrations/update-16-2-0-remove-package/update-16-2-0-remove-package.js.map +0 -1
  203. package/src/migrations/update-16-3-0/remove-types-react-router-dom-package.js.map +0 -1
  204. package/src/module-federation/ast-utils.js.map +0 -1
  205. package/src/module-federation/load-config.js.map +0 -1
  206. package/src/module-federation/models.js.map +0 -1
  207. package/src/module-federation/package-json.js.map +0 -1
  208. package/src/module-federation/utils.js.map +0 -1
  209. package/src/module-federation/with-module-federation-ssr.js.map +0 -1
  210. package/src/module-federation/with-module-federation.js.map +0 -1
  211. package/src/rules/add-styled-dependencies.js.map +0 -1
  212. package/src/rules/update-module-federation-project.js.map +0 -1
  213. package/src/utils/assertion.js.map +0 -1
  214. package/src/utils/ast-utils.js.map +0 -1
  215. package/src/utils/component-props.js.map +0 -1
  216. package/src/utils/create-ts-config.js.map +0 -1
  217. package/src/utils/ct-utils.js.map +0 -1
  218. package/src/utils/dependencies.js.map +0 -1
  219. package/src/utils/format-file.js.map +0 -1
  220. package/src/utils/get-in-source-vitest-tests-template.js.map +0 -1
  221. package/src/utils/jest-utils.js.map +0 -1
  222. package/src/utils/lint.js.map +0 -1
  223. package/src/utils/styled.js.map +0 -1
  224. package/src/utils/testing-generators.js.map +0 -1
  225. package/src/utils/versions.js.map +0 -1
  226. package/tailwind.js.map +0 -1
@@ -1,7 +1,6 @@
1
1
  export interface InitSchema {
2
2
  unitTestRunner?: 'jest' | 'vitest' | 'none';
3
3
  e2eTestRunner?: 'cypress' | 'none';
4
- skipBabelConfig?: boolean;
5
4
  skipFormat?: boolean;
6
5
  skipPackageJson?: boolean;
7
6
  skipHelperLibs?: boolean;
@@ -28,11 +28,6 @@
28
28
  "type": "boolean",
29
29
  "default": false
30
30
  },
31
- "skipBabelConfig": {
32
- "description": "Do not generate a root babel.config.json (if babel is not needed).",
33
- "type": "boolean",
34
- "default": false
35
- },
36
31
  "skipHelperLibs": {
37
32
  "description": "Do not install tslib.",
38
33
  "type": "boolean",
@@ -35,4 +35,3 @@ function addLinting(host, options) {
35
35
  });
36
36
  }
37
37
  exports.addLinting = addLinting;
38
- //# sourceMappingURL=add-linting.js.map
@@ -56,4 +56,3 @@ function addRollupBuildTarget(host, options) {
56
56
  });
57
57
  }
58
58
  exports.addRollupBuildTarget = addRollupBuildTarget;
59
- //# sourceMappingURL=add-rollup-build-target.js.map
@@ -10,9 +10,31 @@ function createFiles(host, options) {
10
10
  (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files/common'), options.projectRoot, substitutions);
11
11
  if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
12
12
  (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '../files/vite'), options.projectRoot, substitutions);
13
- if (host.exists((0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'))) {
14
- host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'));
15
- }
13
+ }
14
+ if (options.compiler === 'babel') {
15
+ (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, '.babelrc'), {
16
+ presets: [
17
+ [
18
+ '@nx/react/babel',
19
+ {
20
+ runtime: 'automatic',
21
+ useBuiltIns: 'usage',
22
+ importSource: options.style === '@emotion/styled'
23
+ ? '@emotion/react'
24
+ : undefined,
25
+ },
26
+ ],
27
+ ],
28
+ plugins: [
29
+ options.style === 'styled-components'
30
+ ? ['styled-components', { pure: true, ssr: true }]
31
+ : undefined,
32
+ options.style === 'styled-jsx' ? 'styled-jsx/babel' : undefined,
33
+ options.style === '@emotion/styled'
34
+ ? '@emotion/babel-plugin'
35
+ : undefined,
36
+ ].filter(Boolean),
37
+ });
16
38
  }
17
39
  if (!options.publishable && !options.buildable) {
18
40
  host.delete(`${options.projectRoot}/package.json`);
@@ -23,4 +45,3 @@ function createFiles(host, options) {
23
45
  (0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, relativePathToRootTsConfig);
24
46
  }
25
47
  exports.createFiles = createFiles;
26
- //# sourceMappingURL=create-files.js.map
@@ -31,7 +31,9 @@ function installCommonDependencies(host, options) {
31
31
  if (options.compiler === 'swc') {
32
32
  tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));
33
33
  }
34
+ else if (options.compiler === 'babel') {
35
+ tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@babel/preset-react': versions_1.babelPresetReactVersion }));
36
+ }
34
37
  return (0, devkit_1.runTasksInSerial)(...tasks);
35
38
  }
36
39
  exports.installCommonDependencies = installCommonDependencies;
37
- //# sourceMappingURL=install-common-dependencies.js.map
@@ -7,4 +7,3 @@ function maybeJs(options, path) {
7
7
  : path;
8
8
  }
9
9
  exports.maybeJs = maybeJs;
10
- //# sourceMappingURL=maybe-js.js.map
@@ -55,4 +55,3 @@ function normalizeOptions(host, options) {
55
55
  return normalized;
56
56
  }
57
57
  exports.normalizeOptions = normalizeOptions;
58
- //# sourceMappingURL=normalize-options.js.map
@@ -13,4 +13,3 @@ function setDefaults(host, options) {
13
13
  (0, devkit_1.updateNxJson)(host, nxJson);
14
14
  }
15
15
  exports.setDefaults = setDefaults;
16
- //# sourceMappingURL=set-defaults.js.map
@@ -61,4 +61,3 @@ function readComponent(host, path) {
61
61
  const source = tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true);
62
62
  return { content, source };
63
63
  }
64
- //# sourceMappingURL=update-app-routes.js.map
@@ -26,7 +26,7 @@ function libraryGenerator(host, schema) {
26
26
  if (!options.component) {
27
27
  options.style = 'none';
28
28
  }
29
- const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { e2eTestRunner: 'none', skipFormat: true, skipBabelConfig: options.bundler === 'vite' || options.compiler === 'swc', skipHelperLibs: options.bundler === 'vite' }));
29
+ const initTask = yield (0, init_1.default)(host, Object.assign(Object.assign({}, options), { e2eTestRunner: 'none', skipFormat: true, skipHelperLibs: options.bundler === 'vite' }));
30
30
  tasks.push(initTask);
31
31
  (0, devkit_1.addProjectConfiguration)(host, options.name, {
32
32
  root: options.projectRoot,
@@ -50,6 +50,7 @@ function libraryGenerator(host, schema) {
50
50
  includeVitest: options.unitTestRunner === 'vitest',
51
51
  compiler: options.compiler,
52
52
  skipFormat: true,
53
+ testEnvironment: 'jsdom',
53
54
  });
54
55
  tasks.push(viteTask);
55
56
  }
@@ -78,6 +79,7 @@ function libraryGenerator(host, schema) {
78
79
  coverageProvider: 'c8',
79
80
  inSourceTests: options.inSourceTests,
80
81
  skipFormat: true,
82
+ testEnvironment: 'jsdom',
81
83
  });
82
84
  tasks.push(vitestTask);
83
85
  }
@@ -127,4 +129,3 @@ function libraryGenerator(host, schema) {
127
129
  exports.libraryGenerator = libraryGenerator;
128
130
  exports.default = libraryGenerator;
129
131
  exports.librarySchematic = (0, devkit_1.convertNxGenerator)(libraryGenerator);
130
- //# sourceMappingURL=library.js.map
@@ -114,4 +114,3 @@ function normalizeOptions(host, options) {
114
114
  }
115
115
  exports.default = reduxGenerator;
116
116
  exports.reduxSchematic = (0, devkit_1.convertNxGenerator)(reduxGenerator);
117
- //# sourceMappingURL=redux.js.map
@@ -29,4 +29,3 @@ function setupSsrForRemote(tree, options, appName) {
29
29
  });
30
30
  }
31
31
  exports.setupSsrForRemote = setupSsrForRemote;
32
- //# sourceMappingURL=setup-ssr-for-remote.js.map
@@ -50,4 +50,3 @@ function findAppComponentPath(host, sourceRoot) {
50
50
  }
51
51
  }
52
52
  }
53
- //# sourceMappingURL=update-host-with-remote.js.map
@@ -53,4 +53,3 @@ function remoteGenerator(host, schema) {
53
53
  }
54
54
  exports.remoteGenerator = remoteGenerator;
55
55
  exports.default = remoteGenerator;
56
- //# sourceMappingURL=remote.js.map
@@ -17,7 +17,7 @@ export interface Schema {
17
17
  routing?: boolean;
18
18
  setParserOptionsProject?: boolean;
19
19
  skipFormat: boolean;
20
- skipWorkspaceJson?: boolean;
20
+ skipNxJson?: boolean;
21
21
  ssr?: boolean;
22
22
  strict?: boolean;
23
23
  style: SupportedStyles;
@@ -84,7 +84,7 @@
84
84
  "default": false,
85
85
  "x-priority": "internal"
86
86
  },
87
- "skipWorkspaceJson": {
87
+ "skipNxJson": {
88
88
  "description": "Skip updating workspace.json with default options based on values provided to this app (e.g. babel, style).",
89
89
  "type": "boolean",
90
90
  "default": false,
@@ -159,4 +159,3 @@ function setupSsrGenerator(tree, options) {
159
159
  exports.setupSsrGenerator = setupSsrGenerator;
160
160
  exports.default = setupSsrGenerator;
161
161
  exports.setupSsrSchematic = (0, devkit_1.convertNxGenerator)(setupSsrGenerator);
162
- //# sourceMappingURL=setup-ssr.js.map
@@ -33,4 +33,3 @@ function addTailwindStyleImports(tree, project, _options) {
33
33
  }
34
34
  }
35
35
  exports.addTailwindStyleImports = addTailwindStyleImports;
36
- //# sourceMappingURL=add-tailwind-style-imports.js.map
@@ -13,4 +13,3 @@ function updateProject(tree, config, options) {
13
13
  }
14
14
  }
15
15
  exports.updateProject = updateProject;
16
- //# sourceMappingURL=update-project.js.map
@@ -1,3 +1,2 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=schema.js.map
@@ -36,4 +36,3 @@ function setupTailwindGenerator(tree, options) {
36
36
  exports.setupTailwindGenerator = setupTailwindGenerator;
37
37
  exports.default = setupTailwindGenerator;
38
38
  exports.setupTailwindSchematic = (0, devkit_1.convertNxGenerator)(setupTailwindGenerator);
39
- //# sourceMappingURL=setup-tailwind.js.map
@@ -115,4 +115,3 @@ function storiesGenerator(host, schema) {
115
115
  exports.storiesGenerator = storiesGenerator;
116
116
  exports.default = storiesGenerator;
117
117
  exports.storiesSchematic = (0, devkit_1.convertNxGenerator)(storiesGenerator);
118
- //# sourceMappingURL=stories.js.map
@@ -56,4 +56,3 @@ function storybookConfigurationGenerator(host, schema) {
56
56
  exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
57
57
  exports.default = storybookConfigurationGenerator;
58
58
  exports.storybookConfigurationSchematic = (0, devkit_1.convertNxGenerator)(storybookConfigurationGenerator);
59
- //# sourceMappingURL=configuration.js.map
@@ -10,4 +10,3 @@ function removeReactReduxTypesFromPackageJson(host) {
10
10
  }
11
11
  exports.removeReactReduxTypesFromPackageJson = removeReactReduxTypesFromPackageJson;
12
12
  exports.default = removeReactReduxTypesFromPackageJson;
13
- //# sourceMappingURL=remove-react-redux-types-package.js.map
@@ -64,4 +64,3 @@ function updateEmotionSetup(host) {
64
64
  }
65
65
  exports.updateEmotionSetup = updateEmotionSetup;
66
66
  exports.default = updateEmotionSetup;
67
- //# sourceMappingURL=update-emotion-setup.js.map
@@ -24,4 +24,3 @@ function useReactJsxInTsconfig(host) {
24
24
  }
25
25
  exports.useReactJsxInTsconfig = useReactJsxInTsconfig;
26
26
  exports.default = useReactJsxInTsconfig;
27
- //# sourceMappingURL=use-react-jsx-in-tsconfig.js.map
@@ -12,4 +12,3 @@ function removeReactReduxTypesFromPackageJson(host) {
12
12
  }
13
13
  exports.removeReactReduxTypesFromPackageJson = removeReactReduxTypesFromPackageJson;
14
14
  exports.default = removeReactReduxTypesFromPackageJson;
15
- //# sourceMappingURL=update-12-8-0.js.map
@@ -35,4 +35,3 @@ function migrateStorybookToWebPack5(tree) {
35
35
  }
36
36
  exports.migrateStorybookToWebPack5 = migrateStorybookToWebPack5;
37
37
  exports.default = migrateStorybookToWebPack5;
38
- //# sourceMappingURL=migrate-storybook-to-webpack-5.js.map
@@ -36,4 +36,3 @@ function updateEmotionSetup(host) {
36
36
  }
37
37
  exports.updateEmotionSetup = updateEmotionSetup;
38
38
  exports.default = updateEmotionSetup;
39
- //# sourceMappingURL=update-emotion-setup.js.map
@@ -266,4 +266,3 @@ function getTsSourceFile(host, path) {
266
266
  return source;
267
267
  }
268
268
  exports.getTsSourceFile = getTsSourceFile;
269
- //# sourceMappingURL=webpack5-changes-utils.js.map
@@ -26,4 +26,3 @@ function updateToReact18(host) {
26
26
  }
27
27
  exports.updateToReact18 = updateToReact18;
28
28
  exports.default = updateToReact18;
29
- //# sourceMappingURL=update-13-10-0.js.map
@@ -37,4 +37,3 @@ function update(tree) {
37
37
  }
38
38
  exports.update = update;
39
39
  exports.default = update;
40
- //# sourceMappingURL=add-default-development-configurations.js.map
@@ -24,4 +24,3 @@ function update(tree) {
24
24
  }
25
25
  exports.update = update;
26
26
  exports.default = update;
27
- //# sourceMappingURL=replace-testing-library-react-hook.js.map
@@ -66,4 +66,3 @@ function migrateReactDomRender(sourcePath, source) {
66
66
  }
67
67
  exports.migrateReactDomRender = migrateReactDomRender;
68
68
  exports.default = update;
69
- //# sourceMappingURL=update-react-dom-render-for-v18.js.map
@@ -35,4 +35,3 @@ function updateExternalEmotionJsxRuntime(tree) {
35
35
  }
36
36
  exports.updateExternalEmotionJsxRuntime = updateExternalEmotionJsxRuntime;
37
37
  exports.default = updateExternalEmotionJsxRuntime;
38
- //# sourceMappingURL=update-external-emotion-jsx-runtime.js.map
@@ -37,4 +37,3 @@ function isReactProject(tree, projectConfig) {
37
37
  return true;
38
38
  }
39
39
  exports.default = addBabelJestPresetTransformerOption;
40
- //# sourceMappingURL=add-preset-jest-config.js.map
@@ -36,4 +36,3 @@ function installWebpackRollupDependencies(tree) {
36
36
  }
37
37
  exports.installWebpackRollupDependencies = installWebpackRollupDependencies;
38
38
  exports.default = installWebpackRollupDependencies;
39
- //# sourceMappingURL=install-webpack-rollup-dependencies.js.map
@@ -14,4 +14,3 @@ function updateRollupExecutor(tree) {
14
14
  }
15
15
  exports.updateRollupExecutor = updateRollupExecutor;
16
16
  exports.default = updateRollupExecutor;
17
- //# sourceMappingURL=update-rollup-executor.js.map
@@ -105,4 +105,3 @@ function renameFile(tree, from, to) {
105
105
  tree.write(to, buffer);
106
106
  tree.delete(from);
107
107
  }
108
- //# sourceMappingURL=webpack-config-setup.js.map
@@ -10,4 +10,3 @@ function replacePackage(tree) {
10
10
  });
11
11
  }
12
12
  exports.default = replacePackage;
13
- //# sourceMappingURL=update-16-0-0-add-nx-packages.js.map
@@ -9,4 +9,3 @@ function removePackage(tree) {
9
9
  });
10
10
  }
11
11
  exports.default = removePackage;
12
- //# sourceMappingURL=update-16-2-0-remove-package.js.map
@@ -9,4 +9,3 @@ function removePackage(tree) {
9
9
  });
10
10
  }
11
11
  exports.default = removePackage;
12
- //# sourceMappingURL=remove-types-react-router-dom-package.js.map
@@ -100,4 +100,3 @@ function addRemoteRoute(source, names) {
100
100
  }
101
101
  }
102
102
  exports.addRemoteRoute = addRemoteRoute;
103
- //# sourceMappingURL=ast-utils.js.map
@@ -14,4 +14,3 @@ function loadModuleFederationConfigFromContext(context) {
14
14
  }
15
15
  }
16
16
  exports.loadModuleFederationConfigFromContext = loadModuleFederationConfigFromContext;
17
- //# sourceMappingURL=load-config.js.map
@@ -1,3 +1,2 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=models.js.map
@@ -11,4 +11,3 @@ function readRootPackageJson() {
11
11
  return (0, devkit_1.readJsonFile)(pkgJsonPath);
12
12
  }
13
13
  exports.readRootPackageJson = readRootPackageJson;
14
- //# sourceMappingURL=package-json.js.map
@@ -56,4 +56,3 @@ function getModuleFederationConfig(mfConfig, options = { isServer: false }) {
56
56
  });
57
57
  }
58
58
  exports.getModuleFederationConfig = getModuleFederationConfig;
59
- //# sourceMappingURL=utils.js.map
@@ -30,4 +30,3 @@ function withModuleFederationForSSR(options) {
30
30
  });
31
31
  }
32
32
  exports.withModuleFederationForSSR = withModuleFederationForSSR;
33
- //# sourceMappingURL=with-module-federation-ssr.js.map
@@ -32,4 +32,3 @@ function withModuleFederation(options) {
32
32
  });
33
33
  }
34
34
  exports.withModuleFederation = withModuleFederation;
35
- //# sourceMappingURL=with-module-federation.js.map
@@ -15,4 +15,3 @@ function addStyledModuleDependencies(host, options) {
15
15
  }
16
16
  }
17
17
  exports.addStyledModuleDependencies = addStyledModuleDependencies;
18
- //# sourceMappingURL=add-styled-dependencies.js.map
@@ -31,4 +31,3 @@ function updateModuleFederationProject(host, options) {
31
31
  return (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@nx/web': versions_1.nxVersion });
32
32
  }
33
33
  exports.updateModuleFederationProject = updateModuleFederationProject;
34
- //# sourceMappingURL=update-module-federation-project.js.map
@@ -17,4 +17,3 @@ function assertValidStyle(style) {
17
17
  }
18
18
  }
19
19
  exports.assertValidStyle = assertValidStyle;
20
- //# sourceMappingURL=assertion.js.map
@@ -523,4 +523,3 @@ function getComponentPropsInterface(sourceFile, cmpDeclaration) {
523
523
  }
524
524
  }
525
525
  exports.getComponentPropsInterface = getComponentPropsInterface;
526
- //# sourceMappingURL=ast-utils.js.map
@@ -58,4 +58,3 @@ function getImportForType(sourceFile, typeName) {
58
58
  statement.getText().includes(typeName));
59
59
  }
60
60
  exports.getImportForType = getImportForType;
61
- //# sourceMappingURL=component-props.js.map
@@ -61,4 +61,3 @@ function extractTsConfigBase(host) {
61
61
  }
62
62
  }
63
63
  exports.extractTsConfigBase = extractTsConfigBase;
64
- //# sourceMappingURL=create-ts-config.js.map
@@ -1,8 +1,5 @@
1
- import { TargetConfiguration, Tree } from '@nx/devkit';
2
- export interface FoundTarget {
3
- config?: TargetConfiguration;
4
- target: string;
5
- }
1
+ import { Tree } from '@nx/devkit';
2
+ import { type FoundTarget } from '@nx/cypress/src/utils/find-target-options';
6
3
  export declare function addCTTargetWithBuildTarget(tree: Tree, options: {
7
4
  project: string;
8
5
  buildTarget: string;
@@ -6,17 +6,21 @@ const devkit_1 = require("@nx/devkit");
6
6
  const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
7
7
  const ast_utils_1 = require("./ast-utils");
8
8
  let tsModule;
9
- const allowedFileExt = new RegExp(/\.[jt]sx?/g);
10
- const isSpecFile = new RegExp(/(spec|test)\./g);
9
+ const allowedFileExt = new RegExp(/\.[jt]sx?/);
10
+ const isSpecFile = new RegExp(/(spec|test)\./);
11
11
  function addCTTargetWithBuildTarget(tree, options) {
12
12
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
13
- const { findBuildConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
14
- const found = yield findBuildConfig(tree, {
15
- project: options.project,
16
- buildTarget: options.buildTarget,
17
- validExecutorNames: options.validExecutorNames,
18
- });
19
- assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
13
+ let found = { target: options.buildTarget, config: undefined };
14
+ // Specifically undefined as a workaround for Remix to pass an empty string as the buildTarget
15
+ if (options.buildTarget === undefined) {
16
+ const { findBuildConfig } = yield Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
17
+ found = yield findBuildConfig(tree, {
18
+ project: options.project,
19
+ buildTarget: options.buildTarget,
20
+ validExecutorNames: options.validExecutorNames,
21
+ });
22
+ assertValidConfig(found === null || found === void 0 ? void 0 : found.config);
23
+ }
20
24
  const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
21
25
  projectConfig.targets['component-test'].options = Object.assign(Object.assign({}, projectConfig.targets['component-test'].options), { devServerTarget: found.target, skipServe: true });
22
26
  (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
@@ -60,4 +64,3 @@ function isComponent(tree, filePath) {
60
64
  return !!cmpDeclaration;
61
65
  }
62
66
  exports.isComponent = isComponent;
63
- //# sourceMappingURL=ct-utils.js.map
@@ -1,3 +1,2 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=dependencies.js.map
@@ -10,4 +10,3 @@ function formatFile(content, ...values) {
10
10
  });
11
11
  }
12
12
  exports.formatFile = formatFile;
13
- //# sourceMappingURL=format-file.js.map
@@ -19,4 +19,3 @@ if (import.meta.vitest) {
19
19
  `;
20
20
  }
21
21
  exports.getInSourceVitestTestsTemplate = getInSourceVitestTestsTemplate;
22
- //# sourceMappingURL=get-in-source-vitest-tests-template.js.map
@@ -7,4 +7,3 @@ function updateJestConfigContent(content) {
7
7
  .replace(`'babel-jest'`, `['babel-jest', { presets: ['@nx/react/babel'] }]`);
8
8
  }
9
9
  exports.updateJestConfigContent = updateJestConfigContent;
10
- //# sourceMappingURL=jest-utils.js.map
package/src/utils/lint.js CHANGED
@@ -17,4 +17,3 @@ const extendReactEslintJson = (json) => {
17
17
  return Object.assign({ extends: ['plugin:@nx/react', ...(pluginExtends || [])] }, config);
18
18
  };
19
19
  exports.extendReactEslintJson = extendReactEslintJson;
20
- //# sourceMappingURL=lint.js.map
@@ -60,4 +60,3 @@ exports.cssInJsDependenciesSwc = {
60
60
  },
61
61
  },
62
62
  };
63
- //# sourceMappingURL=styled.js.map
@@ -32,4 +32,3 @@ function createLib(tree, libName) {
32
32
  });
33
33
  }
34
34
  exports.createLib = createLib;
35
- //# sourceMappingURL=testing-generators.js.map
@@ -5,16 +5,16 @@ export declare const reactDomVersion = "18.2.0";
5
5
  export declare const reactIsVersion = "18.2.0";
6
6
  export declare const swcLoaderVersion = "0.1.15";
7
7
  export declare const babelLoaderVersion = "^9.1.2";
8
- export declare const typesReactVersion = "18.0.28";
9
- export declare const typesReactDomVersion = "18.0.11";
10
- export declare const typesReactIsVersion = "17.0.3";
8
+ export declare const typesReactVersion = "18.2.12";
9
+ export declare const typesReactDomVersion = "18.2.5";
10
+ export declare const typesReactIsVersion = "18.2.0";
11
11
  export declare const typesNodeVersion = "18.14.2";
12
12
  export declare const babelPresetReactVersion = "^7.14.5";
13
13
  export declare const styledComponentsVersion = "5.3.6";
14
14
  export declare const typesStyledComponentsVersion = "5.1.26";
15
- export declare const emotionStyledVersion = "11.10.6";
16
- export declare const emotionReactVersion = "11.10.6";
17
- export declare const emotionBabelPlugin = "11.10.6";
15
+ export declare const emotionStyledVersion = "11.11.0";
16
+ export declare const emotionReactVersion = "11.11.1";
17
+ export declare const emotionBabelPlugin = "11.11.0";
18
18
  export declare const styledJsxVersion = "5.1.2";
19
19
  export declare const reactRouterDomVersion = "6.11.2";
20
20
  export declare const testingLibraryReactVersion = "14.0.0";
@@ -38,7 +38,7 @@ export declare const typesCorsVersion = "~2.8.12";
38
38
  export declare const moduleFederationNodeVersion = "~0.9.9";
39
39
  export declare const lessVersion = "3.12.2";
40
40
  export declare const sassVersion = "^1.55.0";
41
- export declare const stylusVersion = "^0.55.0";
41
+ export declare const stylusVersion = "^0.59.0";
42
42
  export declare const rollupPluginUrlVersion = "^7.0.0";
43
43
  export declare const svgrRollupVersion = "^8.0.1";
44
44
  export declare const swcPluginStyledJsxVersion = "^1.5.67";
@@ -9,16 +9,16 @@ exports.reactDomVersion = '18.2.0';
9
9
  exports.reactIsVersion = '18.2.0';
10
10
  exports.swcLoaderVersion = '0.1.15';
11
11
  exports.babelLoaderVersion = '^9.1.2';
12
- exports.typesReactVersion = '18.0.28';
13
- exports.typesReactDomVersion = '18.0.11';
14
- exports.typesReactIsVersion = '17.0.3';
12
+ exports.typesReactVersion = '18.2.12';
13
+ exports.typesReactDomVersion = '18.2.5';
14
+ exports.typesReactIsVersion = '18.2.0';
15
15
  exports.typesNodeVersion = '18.14.2';
16
16
  exports.babelPresetReactVersion = '^7.14.5';
17
17
  exports.styledComponentsVersion = '5.3.6';
18
18
  exports.typesStyledComponentsVersion = '5.1.26';
19
- exports.emotionStyledVersion = '11.10.6';
20
- exports.emotionReactVersion = '11.10.6';
21
- exports.emotionBabelPlugin = '11.10.6';
19
+ exports.emotionStyledVersion = '11.11.0';
20
+ exports.emotionReactVersion = '11.11.1';
21
+ exports.emotionBabelPlugin = '11.11.0';
22
22
  // WARNING: This needs to be in sync with Next.js' dependency or else there might be issues.
23
23
  exports.styledJsxVersion = '5.1.2';
24
24
  exports.reactRouterDomVersion = '6.11.2';
@@ -45,11 +45,10 @@ exports.moduleFederationNodeVersion = '~0.9.9';
45
45
  // style preprocessors
46
46
  exports.lessVersion = '3.12.2';
47
47
  exports.sassVersion = '^1.55.0';
48
- exports.stylusVersion = '^0.55.0';
48
+ exports.stylusVersion = '^0.59.0';
49
49
  // rollup plugins (if needed)
50
50
  exports.rollupPluginUrlVersion = '^7.0.0';
51
51
  exports.svgrRollupVersion = '^8.0.1';
52
52
  exports.swcPluginStyledJsxVersion = '^1.5.67';
53
53
  exports.swcPluginEmotionVersion = '^2.5.67';
54
54
  exports.swcPluginStyledComponentsVersion = '^1.5.67';
55
- //# sourceMappingURL=versions.js.map
package/tailwind.js CHANGED
@@ -27,4 +27,3 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPattern = '/**/!(*.s
27
27
  }
28
28
  }
29
29
  exports.createGlobPatternsForDependencies = createGlobPatternsForDependencies;
30
- //# sourceMappingURL=tailwind.js.map
package/ast-utils.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../packages/react/ast-utils.ts"],"names":[],"mappings":";;;AAAA,2EAA2E;AAC3E,mDAO+B;AAN7B,oHAAA,uBAAuB,OAAA;AACvB,oHAAA,uBAAuB,OAAA;AACvB,yGAAA,YAAY,OAAA;AACZ,8GAAA,iBAAiB,OAAA;AACjB,+GAAA,kBAAkB,OAAA;AAClB,kGAAA,KAAK,OAAA"}
package/babel.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"babel.js","sourceRoot":"","sources":["../../../packages/react/babel.ts"],"names":[],"mappings":"AAAA;;GAEG;AAeH,MAAM,CAAC,OAAO,GAAG,UAAU,GAAQ,EAAE,OAA4B;IAC/D,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC;IACtB;;OAEG;IACH,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAU,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpE;;;;;;;;;;OAUG;IACH,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,CAAC,IAAI,CAAC;YACX,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC;YACtC,qBAAqB,CAAC;gBACpB,aAAa,EAAE,OAAO;gBACtB,GAAG;aACJ,CAAC;SACH,CAAC,CAAC;KACJ;IAED,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,qBAAqB,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE;;IACnD,MAAM,kBAAkB,GAAqC;QAC3D,OAAO,EAAE,MAAA,aAAa,CAAC,OAAO,mCAAI,WAAW;QAC7C,WAAW,EAAE,GAAG,KAAK,YAAY;KAClC,CAAC;IAEF,sFAAsF;IACtF,4CAA4C;IAC5C,IAAI,kBAAkB,CAAC,OAAO,KAAK,WAAW,EAAE;QAC9C,kBAAkB,CAAC,WAAW,GAAG,IAAI,CAAC;KACvC;IAED,IAAI,aAAa,CAAC,YAAY,EAAE;QAC9B,kBAAkB,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;KAC9D;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC"}
package/index.js.map DELETED
@@ -1 +0,0 @@
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,6CAA8D;AAArD,kHAAA,wBAAwB,OAAA;AACjC,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;AACtB,yDAAiE;AAAxD,yGAAA,eAAe,OAAA;AACxB,oIAAmI;AAA1H,kJAAA,+BAA+B,OAAA;AACxC,iFAAwF;AAA/E,wHAAA,sBAAsB,OAAA;AAC/B,iFAAwF;AAA/E,wHAAA,sBAAsB,OAAA;AAE/B,+DAAqC"}