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

package/src/generators/library/lib/add-rollup-build-target.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-rollup-build-target.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/add-rollup-build-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAGL,iBAAiB,EAOlB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAA;CAAE,EAC7D,QAAQ,GAAE,GAAG,CAAC,MAAM,CAAmC,8BAqHxD"}
+{"version":3,"file":"add-rollup-build-target.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/add-rollup-build-target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAGL,iBAAiB,EAQlB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAA;CAAE,EAC7D,QAAQ,GAAE,GAAG,CAAC,MAAM,CAAmC,8BAyHxD"}

package/src/generators/library/lib/add-rollup-build-target.js

@@ -19,12 +19,7 @@ async function addRollupBuildTarget(host, options, external = new Set(['react',
             '@svgr/rollup': versions_1.svgrRollupVersion,
         }));
     }
-    if (options.style === '@emotion/styled') {
-        external.add('@emotion/react/jsx-runtime');
-    }
-    else {
-        external.add('react/jsx-runtime');
-    }
+    external.add('react/jsx-runtime');
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasRollupPlugin = !!nxJson.plugins?.some((p) => typeof p === 'string'
         ? p === '@nx/rollup/plugin'
@@ -64,6 +59,12 @@ module.exports = withNx(
     }
     else {
         // Legacy behavior, there is a target in project.json using rollup executor.
+        // Mirrors warnRollupExecutorGenerating from @nx/rollup/src/utils/deprecation.
+        // Inlined to avoid a cross-package deep import; @nx/rollup's package
+        // exports field doesn't expose internal `src/...` paths, so the import
+        // works at compile time (via tsconfig project refs) but fails at runtime
+        // in published packages.
+        devkit_1.logger.warn('The `@nx/rollup:rollup` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rollup:convert-to-inferred` to migrate to the `@nx/rollup/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
         const { targets } = (0, devkit_1.readProjectConfiguration)(host, options.name);
         targets.build = {
             executor: '@nx/rollup:rollup',

package/src/generators/library/lib/create-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/create-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAI7C,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA6FhE"}
+{"version":3,"file":"create-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/create-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAI7C,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAiFhE"}

package/src/generators/library/lib/create-files.js

@@ -26,21 +26,10 @@ function createFiles(host, options) {
                     {
                         runtime: 'automatic',
                         useBuiltIns: 'usage',
-                        importSource: options.style === '@emotion/styled'
-                            ? '@emotion/react'
-                            : undefined,
                     },
                 ],
             ],
-            plugins: [
-                options.style === 'styled-components'
-                    ? ['styled-components', { pure: true, ssr: true }]
-                    : undefined,
-                options.style === 'styled-jsx' ? 'styled-jsx/babel' : undefined,
-                options.style === '@emotion/styled'
-                    ? '@emotion/babel-plugin'
-                    : undefined,
-            ].filter(Boolean),
+            plugins: [],
         });
     }
     if ((options.publishable || options.buildable) &&

package/src/generators/library/lib/install-common-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install-common-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/install-common-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,8BA2D1B"}
+{"version":3,"file":"install-common-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/install-common-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,IAAI,EACL,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,8BAsD1B"}

package/src/generators/library/lib/install-common-dependencies.js

@@ -21,13 +21,8 @@ async function installCommonDependencies(host, options) {
     // `@nx/webpack` installs them automatically for now.
     // TODO(jack): Once we clean up webpack we can remove this check
     if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
-        switch (options.style) {
-            case 'scss':
-                devDependencies['sass'] = versions_1.sassVersion;
-                break;
-            case 'less':
-                devDependencies['less'] = versions_1.lessVersion;
-                break;
+        if (options.style === 'scss') {
+            devDependencies['sass'] = versions_1.sassVersion;
         }
     }
     if (options.unitTestRunner && options.unitTestRunner !== 'none') {

package/src/generators/library/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAOrD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAmG3B"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAOrD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAmG3B"}

package/src/generators/library/lib/normalize-options.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const assertion_1 = require("../../../utils/assertion");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
-    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'library');
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAgCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA0RxE;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA8BpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAyRxE;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
 const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
@@ -184,8 +183,8 @@ async function libraryGeneratorInternal(host, schema) {
         }, true);
     }
     if (options.component) {
-        const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
-        const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
+        const relativeCwd = (0, internal_1.getRelativeCwd)();
+        const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.js ? `${options.fileName}.js` : options.fileName);
         const componentTask = await (0, component_1.default)(host, {
             path: relativeCwd ? (0, path_1.relative)(relativeCwd, path) : path,
             style: options.style,
@@ -193,7 +192,6 @@ async function libraryGeneratorInternal(host, schema) {
                 (options.unitTestRunner === 'vitest' && options.inSourceTests == true),
             export: true,
             routing: options.routing,
-            js: options.js,
             name: options.name,
             inSourceTests: options.inSourceTests,
             skipFormat: true,
@@ -242,7 +240,7 @@ async function libraryGeneratorInternal(host, schema) {
         tasks.push(() => (0, devkit_1.installPackagesTask)(host, true));
     }
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+        (0, internal_1.logShowProjectCommand)(options.name);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/src/generators/library/schema.json

@@ -36,6 +36,7 @@
       "type": "string",
       "default": "css",
       "alias": "s",
+      "enum": ["css", "scss", "none"],
       "x-prompt": {
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
@@ -46,27 +47,7 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com          ]"
-          },
-          {
-            "value": "less",
-            "label": "LESS              [ https://lesscss.org            ]"
-          },
-          {
-            "value": "tailwind",
-            "label": "tailwind          [ https://tailwindcss.com/       ]"
-          },
-          {
-            "value": "styled-components",
-            "label": "styled-components [ https://styled-components.com ]"
-          },
-          {
-            "value": "@emotion/styled",
-            "label": "emotion           [ https://emotion.sh            ]"
-          },
-          {
-            "value": "styled-jsx",
-            "label": "styled-jsx        [ https://www.npmjs.com/package/styled-jsx ]"
+            "label": "SASS(.scss)       [ https://sass-lang.com   ]"
           },
           {
             "value": "none",

package/src/generators/redux/redux.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redux.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/redux/redux.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EACL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAoB,MAAM,EAAE,MAAM,UAAU,CAAC;AAIpD,wBAAsB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAW9D;AA0LD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"redux.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/redux/redux.ts"],"names":[],"mappings":"AACA,OAAO,EASL,IAAI,EACL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAoB,MAAM,EAAE,MAAM,UAAU,CAAC;AAIpD,wBAAsB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAW9D;AA0LD,eAAe,cAAc,CAAC"}

package/src/generators/redux/redux.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reduxGenerator = reduxGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
@@ -77,7 +77,7 @@ function updateReducerConfiguration(host, options) {
     host.write(options.appMainFilePath, changes);
 }
 async function normalizeOptions(host, options) {
-    const { artifactName: name, directory, fileName, fileExtension, fileExtensionType, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+    const { artifactName: name, directory, fileName, fileExtension, fileExtensionType, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(host, {
         path: options.path,
         name: options.name,
         suffix: 'slice',

package/src/generators/redux/schema.d.ts

@@ -1,4 +1,4 @@
-import type { FileExtensionType } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+import type { FileExtensionType } from '@nx/devkit/internal';
 
 export interface Schema {
   path: string;

package/src/generators/remote/remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAOzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAmFlC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqK/D;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/remote/remote.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAsBpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAOzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAmFlC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqK/D;AAED,eAAe,eAAe,CAAC"}

package/src/generators/remote/remote.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = addModuleFederationFiles;
 exports.remoteGenerator = remoteGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const update_module_federation_project_1 = require("../../rules/update-module-federation-project");
@@ -93,7 +93,7 @@ async function remoteGenerator(host, schema) {
             throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);
         }
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
     const isValidRemote = (0, js_1.isValidVariable)(options.projectName);
     if (!isValidRemote.isValid) {
         throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);

package/src/generators/remote/schema.json

@@ -33,6 +33,7 @@
       "type": "string",
       "default": "css",
       "alias": "s",
+      "enum": ["css", "scss", "none"],
       "x-prompt": {
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
@@ -43,27 +44,7 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com                     ]"
-          },
-          {
-            "value": "less",
-            "label": "LESS              [ https://lesscss.org                       ]"
-          },
-          {
-            "value": "tailwind",
-            "label": "tailwind [ https://tailwindcss.com/            ]"
-          },
-          {
-            "value": "styled-components",
-            "label": "styled-components [ https://styled-components.com            ]"
-          },
-          {
-            "value": "@emotion/styled",
-            "label": "emotion           [ https://emotion.sh                       ]"
-          },
-          {
-            "value": "styled-jsx",
-            "label": "styled-jsx        [ https://www.npmjs.com/package/styled-jsx ]"
+            "label": "SASS(.scss)       [ https://sass-lang.com   ]"
           },
           {
             "value": "none",

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AASpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAqD3D"}
+{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAQpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAqD3D"}

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateWithMfImport;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const versions_1 = require("../../utils/versions");
 const NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/react/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/react/module-federation]';
 const NEW_IMPORT_PATH = `'@nx/module-federation/webpack'`;
 async function migrateWithMfImport(tree) {
     const projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-nx-module-federation-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAIpB,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAqBvD"}
+{"version":3,"file":"ensure-nx-module-federation-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAGpB,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAqBvD"}

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = ensureMfPackage;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const versions_1 = require("../../utils/versions");
 async function ensureMfPackage(tree) {
     const projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });

package/src/migrations/update-22-0-0/add-svgr-to-webpack-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-svgr-to-webpack-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-22-0-0/add-svgr-to-webpack-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAiHpB,wBAA8B,sBAAsB,CAAC,IAAI,EAAE,IAAI,iBAsX9D"}
+{"version":3,"file":"add-svgr-to-webpack-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-22-0-0/add-svgr-to-webpack-config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAgHpB,wBAA8B,sBAAsB,CAAC,IAAI,EAAE,IAAI,iBAsZ9D"}

package/src/migrations/update-22-0-0/add-svgr-to-webpack-config.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = addSvgrToWebpackConfig;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = tslib_1.__importStar(require("typescript"));
 const withSvgrFunctionForWithReact = `
@@ -115,7 +115,7 @@ function withSvgr(svgrOptions = {}) {
 async function addSvgrToWebpackConfig(tree) {
     const projects = new Map();
     // Find all React webpack projects using either withReact OR NxReactWebpackPlugin
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (options, project, target) => {
         if (!options.webpackConfig)
             return;
         const webpackConfigPath = options.webpackConfig;
@@ -271,11 +271,38 @@ async function addSvgrToWebpackConfig(tree) {
                             ts.isIdentifier(prop.name) &&
                             prop.name.text === 'svgr');
                         if (svgrProp) {
-                            changes.push({
-                                type: devkit_1.ChangeType.Delete,
-                                start: arg.getStart(),
-                                length: arg.getEnd() - arg.getStart(),
-                            });
+                            const hasOnlySvgrProperty = arg.properties.length === 1;
+                            if (hasOnlySvgrProperty) {
+                                changes.push({
+                                    type: devkit_1.ChangeType.Delete,
+                                    start: arg.getStart(),
+                                    length: arg.getEnd() - arg.getStart(),
+                                });
+                            }
+                            else {
+                                const propIndex = arg.properties.indexOf(svgrProp);
+                                const isLastProp = propIndex === arg.properties.length - 1;
+                                const isFirstProp = propIndex === 0;
+                                let removeStart = svgrProp.getFullStart();
+                                let removeEnd = svgrProp.getEnd();
+                                if (!isLastProp) {
+                                    const nextProp = arg.properties[propIndex + 1];
+                                    removeEnd = nextProp.getFullStart();
+                                }
+                                else if (!isFirstProp) {
+                                    const prevProp = arg.properties[propIndex - 1];
+                                    const textBetween = content.substring(prevProp.getEnd(), svgrProp.getFullStart());
+                                    const commaIndex = textBetween.indexOf(',');
+                                    if (commaIndex !== -1) {
+                                        removeStart = prevProp.getEnd() + commaIndex;
+                                    }
+                                }
+                                changes.push({
+                                    type: devkit_1.ChangeType.Delete,
+                                    start: removeStart,
+                                    length: removeEnd - removeStart,
+                                });
+                            }
                             if (config.svgrOptions) {
                                 const composePluginsCalls = (0, tsquery_1.query)(sourceFile, 'CallExpression[expression.name=composePlugins]');
                                 if (composePluginsCalls.length > 0) {

package/src/plugins/router-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/plugins/router-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAUnB,MAAM,YAAY,CAAC;AAgBpB,MAAM,WAAW,wBAAwB;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAyBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,wBAAwB,CAsFjE,CAAC"}
+{"version":3,"file":"router-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/plugins/router-plugin.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,wBAAwB;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAUD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,wBAAwB,CA2FjE,CAAC"}

package/src/plugins/router-plugin.js

@@ -1,34 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const js_1 = require("@nx/js");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const util_1 = require("@nx/js/src/plugins/typescript/util");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
 const pmCommand = (0, devkit_1.getPackageManagerCommand)();
 const reactRouterConfigBlob = '**/react-router.config.{ts,js,cjs,cts,mjs,mts}';
-function readTargetsCache(cachePath) {
-    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, fs_1.existsSync)(cachePath)
-        ? (0, devkit_1.readJsonFile)(cachePath)
-        : {};
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 exports.createNodesV2 = [
     reactRouterConfigBlob,
     async (configFiles, options, context) => {
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
         const normalizedOptions = normalizeOptions(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `react-router-${optionsHash}.hash`);
-        const targetsCache = readTargetsCache(cachePath);
+        const targetsCache = new internal_1.PluginCache(cachePath);
         const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
         const { roots: projectRoots, configFiles: validConfigFiles } = configFiles.reduce((acc, configFile) => {
             const potentialRoot = (0, path_1.dirname)(configFile);
@@ -42,14 +32,16 @@ exports.createNodesV2 = [
             configFiles: [],
         });
         const lockfile = (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
-        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, { ...normalizedOptions, isUsingTsSolutionSetup }, context, projectRoots.map((_) => [lockfile]));
+        const hashes = await (0, internal_1.calculateHashesForCreateNodes)(projectRoots, { ...normalizedOptions, isUsingTsSolutionSetup }, context, projectRoots.map((_) => [lockfile]));
         try {
             return await (0, devkit_1.createNodesFromFiles)(async (configFile, _, context, idx) => {
                 const projectRoot = (0, path_1.dirname)(configFile);
                 const siblingFiles = (0, fs_1.readdirSync)((0, devkit_1.joinPathFragments)(context.workspaceRoot, projectRoot));
                 const hash = hashes[idx] + configFile;
-                const { projectType, metadata, targets } = (targetsCache[hash] ??=
-                    await buildReactRouterTargets(configFile, projectRoot, normalizedOptions, context, siblingFiles, isUsingTsSolutionSetup));
+                if (!targetsCache.has(hash)) {
+                    targetsCache.set(hash, await buildReactRouterTargets(configFile, projectRoot, normalizedOptions, context, siblingFiles, isUsingTsSolutionSetup));
+                }
+                const { projectType, metadata, targets } = targetsCache.get(hash);
                 const project = {
                     root: projectRoot,
                     targets,
@@ -66,16 +58,16 @@ exports.createNodesV2 = [
             }, validConfigFiles, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
 async function buildReactRouterTargets(configFilePath, projectRoot, options, context, siblingFiles, isUsingTsSolutionSetup) {
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const configPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
     if (require.cache[configPath])
-        (0, config_utils_1.clearRequireCache)();
-    const reactRouterConfig = await (0, config_utils_1.loadConfigFile)(configPath);
+        (0, internal_1.clearRequireCache)();
+    const reactRouterConfig = await (0, internal_1.loadConfigFile)(configPath);
     const isLibMode = reactRouterConfig?.ssr !== undefined && reactRouterConfig.ssr === false;
     const { buildDirectory, serverBuildPath } = await getBuildPaths(reactRouterConfig, isLibMode);
     const targets = {};

package/src/utils/assertion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assertion.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/assertion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAa/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAQpD;AAED,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,GACzB,IAAI,CAMN"}
+{"version":3,"file":"assertion.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/assertion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAI/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAQpD;AAED,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,GACzB,IAAI,CAMN"}

package/src/utils/assertion.js

@@ -2,16 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertValidStyle = assertValidStyle;
 exports.assertValidReactRouter = assertValidReactRouter;
-const VALID_STYLES = [
-    'css',
-    'scss',
-    'less',
-    'tailwind',
-    'styled-components',
-    '@emotion/styled',
-    'styled-jsx',
-    'none',
-];
+const VALID_STYLES = ['css', 'scss', 'none'];
 function assertValidStyle(style) {
     if (VALID_STYLES.indexOf(style) === -1) {
         throw new Error(`Unsupported style option found: ${style}. Valid values are: "${VALID_STYLES.join('", "')}"`);

package/src/utils/create-ts-config.js

@@ -54,10 +54,6 @@ function createTsConfigForTsSolution(host, projectRoot, type, options, relativeP
                 types.add('vite/client');
                 json.compilerOptions.types = Array.from(types);
             }
-            if (options.style === '@emotion/styled') {
-                json.compilerOptions ??= {};
-                json.compilerOptions.jsxImportSource = '@emotion/react';
-            }
             return json;
         });
     }
@@ -79,9 +75,6 @@ function createTsConfigForNonTsSolution(host, projectRoot, type, options, relati
             },
         ],
     };
-    if (options.style === '@emotion/styled') {
-        json.compilerOptions.jsxImportSource = '@emotion/react';
-    }
     if (options.bundler === 'vite') {
         json.compilerOptions.types =
             options.unitTestRunner === 'vitest'

package/src/utils/normalize-remote.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeRemoteName = normalizeRemoteName;
 exports.normalizeRemoteDirectory = normalizeRemoteDirectory;
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function normalizeRemoteName(tree, remote, options) {
-    const { projectName: remoteName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    const { projectName: remoteName } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
         name: remote,
         projectType: 'application',
         directory: options.directory,

package/src/utils/versions.d.ts

@@ -6,7 +6,6 @@ export declare const reactDomV18Version = "18.3.1";
 export declare const reactIsVersion = "^19.0.0";
 export declare const reactIsV18Version = "18.3.1";
 export declare const swcLoaderVersion = "0.1.15";
-export declare const babelLoaderVersion = "^9.1.2";
 export declare const typesReactV18Version = "18.3.1";
 export declare const typesReactVersion = "^19.0.0";
 export declare const typesReactDomV18Version = "18.3.0";
@@ -14,15 +13,9 @@ export declare const typesReactDomVersion = "^19.0.0";
 export declare const typesReactIsV18Version = "18.3.0";
 export declare const typesReactIsVersion = "^19.0.0";
 export declare const reactViteVersion = "^4.2.0";
-export declare const typesNodeVersion = "^20.0.0";
+export declare const typesNodeVersion = "^22.0.0";
 export declare const babelPresetReactVersion = "^7.14.5";
 export declare const babelCoreVersion = "^7.14.5";
-export declare const styledComponentsVersion = "5.3.6";
-export declare const typesStyledComponentsVersion = "5.1.26";
-export declare const emotionStyledVersion = "11.14.1";
-export declare const emotionReactVersion = "11.14.0";
-export declare const emotionBabelPlugin = "11.13.5";
-export declare const styledJsxVersion = "5.1.2";
 export declare const reactRouterDomVersion = "6.30.3";
 export declare const reactRouterVersion = "^7.14.2";
 export declare const reactRouterIsBotVersion = "^4.4.0";
@@ -34,10 +27,8 @@ export declare const eslintPluginImportVersion = "2.31.0";
 export declare const eslintPluginJsxA11yVersion = "6.10.1";
 export declare const eslintPluginReactVersion = "7.35.0";
 export declare const eslintPluginReactHooksVersion = "5.0.0";
-export declare const babelPluginStyledComponentsVersion = "1.10.7";
 export declare const tsLibVersion = "^2.3.0";
 export declare const postcssVersion = "8.4.38";
-export declare const tailwindcssVersion = "3.4.3";
 export declare const autoprefixerVersion = "10.4.13";
 export declare const expressVersion = "^4.21.2";
 export declare const typesExpressVersion = "^4.17.21";
@@ -46,11 +37,7 @@ export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.12";
 export declare const moduleFederationNodeVersion = "^2.7.21";
 export declare const moduleFederationEnhancedVersion = "^2.1.0";
-export declare const lessVersion = "3.12.2";
-export declare const sassVersion = "^1.55.0";
+export declare const sassVersion = "^1.97.2";
 export declare const rollupPluginUrlVersion = "^8.0.2";
 export declare const svgrRollupVersion = "^8.1.0";
-export declare const swcPluginStyledJsxVersion = "^1.5.67";
-export declare const swcPluginEmotionVersion = "^2.5.67";
-export declare const swcPluginStyledComponentsVersion = "^1.5.67";
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,kBAAkB,WAAW,CAAC;AAC3C,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC,eAAO,MAAM,kBAAkB,WAAW,CAAC;AAC3C,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,gBAAgB,WAAW,CAAC;AAGzC,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAE1C,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAE1C,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAC/C,eAAO,MAAM,4BAA4B,WAAW,CAAC;AAErD,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAG5C,eAAO,MAAM,gBAAgB,UAAU,CAAC;AAExC,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAC9C,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD,eAAO,MAAM,0BAA0B,WAAW,CAAC;AACnD,eAAO,MAAM,wBAAwB,WAAW,CAAC;AAEjD,eAAO,MAAM,qBAAqB,UAAU,CAAC;AAC7C,eAAO,MAAM,iBAAiB,UAAU,CAAC;AAEzC,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,0BAA0B,WAAW,CAAC;AACnD,eAAO,MAAM,wBAAwB,WAAW,CAAC;AACjD,eAAO,MAAM,6BAA6B,UAAU,CAAC;AAErD,eAAO,MAAM,kCAAkC,WAAW,CAAC;AAE3D,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,kBAAkB,UAAU,CAAC;AAC1C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAG7C,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,YAAY,WAAW,CAAC;AACrC,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,2BAA2B,YAAY,CAAC;AACrD,eAAO,MAAM,+BAA+B,WAAW,CAAC;AAGxD,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,WAAW,YAAY,CAAC;AAGrC,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAE1C,eAAO,MAAM,yBAAyB,YAAY,CAAC;AACnD,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,gCAAgC,YAAY,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,YAAY,YAAY,CAAC;AACtC,eAAO,MAAM,eAAe,WAAW,CAAC;AACxC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,kBAAkB,WAAW,CAAC;AAC3C,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAC9C,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,gBAAgB,WAAW,CAAC;AAGzC,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAE1C,eAAO,MAAM,uBAAuB,YAAY,CAAC;AACjD,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAE1C,eAAO,MAAM,qBAAqB,WAAW,CAAC;AAC9C,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD,eAAO,MAAM,0BAA0B,WAAW,CAAC;AACnD,eAAO,MAAM,wBAAwB,WAAW,CAAC;AAEjD,eAAO,MAAM,qBAAqB,UAAU,CAAC;AAC7C,eAAO,MAAM,iBAAiB,UAAU,CAAC;AAEzC,eAAO,MAAM,yBAAyB,WAAW,CAAC;AAClD,eAAO,MAAM,0BAA0B,WAAW,CAAC;AACnD,eAAO,MAAM,wBAAwB,WAAW,CAAC;AACjD,eAAO,MAAM,6BAA6B,UAAU,CAAC;AAErD,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAG7C,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,YAAY,WAAW,CAAC;AACrC,eAAO,MAAM,WAAW,WAAW,CAAC;AACpC,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,2BAA2B,YAAY,CAAC;AACrD,eAAO,MAAM,+BAA+B,WAAW,CAAC;AAGxD,eAAO,MAAM,WAAW,YAAY,CAAC;AAGrC,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAC/C,eAAO,MAAM,iBAAiB,WAAW,CAAC"}