@nx/react 23.0.0-pr.35465.2bc2643 → 23.0.0-rc.1

package/{src → dist/src}/generators/host/host.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hostGenerator = hostGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
+const assert_supported_react_version_1 = require("../../utils/assert-supported-react-version");
 const devkit_1 = require("@nx/devkit");
 const update_module_federation_project_1 = require("../../rules/update-module-federation-project");
 const application_1 = tslib_1.__importDefault(require("../application/application"));
@@ -14,12 +16,14 @@ const setup_ssr_for_host_1 = require("./lib/setup-ssr-for-host");
 const update_module_federation_e2e_project_1 = require("./lib/update-module-federation-e2e-project");
 const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const versions_1 = require("../../utils/versions");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const update_module_federation_tsconfig_1 = require("./lib/update-module-federation-tsconfig");
 const normalize_host_name_1 = require("./lib/normalize-host-name");
+const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
 async function hostGenerator(host, schema) {
+    (0, assert_supported_react_version_1.assertSupportedReactVersion)(host);
+    (0, module_federation_deprecation_1.warnReactHostGeneratorDeprecation)();
     const tasks = [];
     const name = await (0, normalize_host_name_1.normalizeHostName)(host, schema.directory, schema.name);
     const options = {
@@ -46,7 +50,7 @@ async function hostGenerator(host, schema) {
             }
         });
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
     const initTask = await (0, application_1.default)(host, {
         ...options,
         directory: options.appProjectRoot,
@@ -57,7 +61,7 @@ async function hostGenerator(host, schema) {
     });
     tasks.push(initTask);
     // In TS solution setup, update package.json to use simple name instead of scoped name
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if ((0, internal_2.isUsingTsSolutionSetup)(host)) {
         const hostPackageJsonPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json');
         if (host.exists(hostPackageJsonPath)) {
             (0, devkit_1.updateJson)(host, hostPackageJsonPath, (json) => {
@@ -98,7 +102,7 @@ async function hostGenerator(host, schema) {
     (0, update_module_federation_e2e_project_1.updateModuleFederationE2eProject)(host, options);
     (0, update_module_federation_tsconfig_1.updateModuleFederationTsconfig)(host, options);
     // Add remotes as devDependencies in TS solution setup
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host) && remotesWithPorts.length > 0) {
+    if ((0, internal_2.isUsingTsSolutionSetup)(host) && remotesWithPorts.length > 0) {
         addRemotesAsHostDependencies(host, options.projectName, remotesWithPorts);
     }
     if (options.ssr) {
@@ -125,7 +129,7 @@ async function hostGenerator(host, schema) {
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, { '@module-federation/enhanced': versions_1.moduleFederationEnhancedVersion }, {
         '@nx/web': versions_1.nxVersion,
         '@nx/module-federation': versions_1.nxVersion,
-    });
+    }, undefined, true);
     tasks.push(installTask);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);

package/{src → dist/src}/generators/host/lib/add-module-federation-files.d.ts

@@ -4,4 +4,3 @@ export declare function addModuleFederationFiles(host: Tree, options: Normalized
     name: string;
     port: number;
 }[]): void;
-//# sourceMappingURL=add-module-federation-files.d.ts.map

package/{src → dist/src}/generators/host/lib/add-module-federation-files.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = addModuleFederationFiles;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const maybe_js_1 = require("../../../utils/maybe-js");
 const create_application_files_1 = require("../../application/lib/create-application-files");
 const path_1 = require("path");
@@ -35,7 +35,7 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
             }),
         };
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-    const pathToMFManifest = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, host), 'assets/module-federation.manifest.json');
+    const pathToMFManifest = (0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(projectConfig, host), 'assets/module-federation.manifest.json');
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in
     // new entry file.
@@ -69,7 +69,7 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
             processBundlerConfigFile(options, host, 'webpack.config.prod.js');
         }
         // Delete TypeScript prod config in TS solution setup - not needed in Crystal
-        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        if ((0, internal_1.isUsingTsSolutionSetup)(host)) {
             const prodConfigFileName = options.bundler === 'rspack'
                 ? 'rspack.config.prod.ts'
                 : 'webpack.config.prod.ts';

package/{src → dist/src}/generators/host/lib/normalize-host-name.d.ts

@@ -1,3 +1,2 @@
 import { Tree } from '@nx/devkit';
 export declare function normalizeHostName(tree: Tree, directory: string, name?: string): Promise<string>;
-//# sourceMappingURL=normalize-host-name.d.ts.map

package/{src → dist/src}/generators/host/lib/normalize-host-name.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeHostName = normalizeHostName;
-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 normalizeHostName(tree, directory, name) {
-    const { projectName } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    const { projectName } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
         name,
         directory,
         projectType: 'application',

package/{src → dist/src}/generators/host/lib/setup-ssr-for-host.d.ts

@@ -4,4 +4,3 @@ export declare function setupSsrForHost(tree: Tree, options: NormalizedSchema, a
     name: string;
     port: number;
 }[]): Promise<GeneratorCallback>;
-//# sourceMappingURL=setup-ssr-for-host.d.ts.map

package/{src → dist/src}/generators/host/lib/setup-ssr-for-host.js

@@ -54,7 +54,7 @@ async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
         isbot: versions_1.isbotVersion,
         express: versions_1.expressVersion,
         '@types/express': versions_1.typesExpressVersion,
-    }, {});
+    }, {}, undefined, true);
     tasks.push(installTask);
     return (0, devkit_2.runTasksInSerial)(...tasks);
 }

package/{src → dist/src}/generators/host/lib/update-module-federation-e2e-project.d.ts

@@ -1,4 +1,3 @@
 import { NormalizedSchema } from '../schema';
 import { Tree } from '@nx/devkit';
 export declare function updateModuleFederationE2eProject(host: Tree, options: NormalizedSchema): void;
-//# sourceMappingURL=update-module-federation-e2e-project.d.ts.map

package/{src → dist/src}/generators/host/lib/update-module-federation-tsconfig.d.ts

@@ -1,4 +1,3 @@
 import { type Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function updateModuleFederationTsconfig(host: Tree, options: NormalizedSchema): void;
-//# sourceMappingURL=update-module-federation-tsconfig.d.ts.map

package/{src → dist/src}/generators/host/lib/update-module-federation-tsconfig.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleFederationTsconfig = updateModuleFederationTsconfig;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function updateModuleFederationTsconfig(host, options) {
     const tsconfigPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json');
     const tsconfigRuntimePath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json');
     if (!host.exists(tsconfigPath) || !host.exists(tsconfigRuntimePath))
         return;
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if ((0, internal_1.isUsingTsSolutionSetup)(host)) {
         // Update references to match what `nx sync` does.
         if (options.remotes?.length) {
             (0, devkit_1.updateJson)(host, tsconfigPath, (json) => {

package/{src → dist/src}/generators/host/schema.json

@@ -27,6 +27,7 @@
       "type": "string",
       "default": "css",
       "alias": "s",
+      "enum": ["css", "scss", "none"],
       "x-prompt": {
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
@@ -37,27 +38,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 → dist/src}/generators/init/init.d.ts

@@ -2,4 +2,3 @@ import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { InitSchema } from './schema';
 export declare function reactInitGenerator(tree: Tree, schema: InitSchema): Promise<GeneratorCallback>;
 export default reactInitGenerator;
-//# sourceMappingURL=init.d.ts.map

package/{src → dist/src}/generators/init/init.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactInitGenerator = reactInitGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const assert_supported_react_version_1 = require("../../utils/assert-supported-react-version");
 const router_plugin_1 = require("../../plugins/router-plugin");
 async function reactInitGenerator(tree, schema) {
+    (0, assert_supported_react_version_1.assertSupportedReactVersion)(tree);
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/react'], []));
@@ -16,14 +18,14 @@ async function reactInitGenerator(tree, schema) {
             'react-dom': reactDeps['react-dom'],
         }, {
             '@nx/react': versions_1.nxVersion,
-        }, undefined, schema.keepExistingVersions));
+        }, undefined, schema.keepExistingVersions ?? true));
     }
     const nxJson = (0, devkit_1.readNxJson)(tree);
     schema.addPlugin ??=
         process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false;
     if (schema.useReactRouterPlugin && schema.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/react/router-plugin', router_plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/react/router-plugin', router_plugin_1.createNodes, {
             buildTargetName: ['build', 'react-router:build', 'react-router-build'],
             devTargetName: ['dev', 'react-router:dev', 'react-router-dev'],
             startTargetName: ['start', 'react-router-serve', 'react-router-start'],

package/{src → dist/src}/generators/init/schema.json

@@ -20,7 +20,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     },
     "useReactRouterPlugin": {
       "type": "boolean",

package/{src → dist/src}/generators/library/files/common/tsconfig.lib.json__tmpl__

@@ -4,7 +4,6 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { %>"@nx/react/typings/styled-jsx.d.ts",<% } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]

package/{src → dist/src}/generators/library/files/vite/tsconfig.lib.json__tmpl__

@@ -4,7 +4,6 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [
       "node",
-      <%_ if (style === 'styled-jsx') { _%>"@nx/react/typings/styled-jsx.d.ts",<%_ } _%>
       "@nx/react/typings/cssmodule.d.ts",
       "@nx/react/typings/image.d.ts"
     ]

package/{src → dist/src}/generators/library/lib/add-linting.d.ts

@@ -2,4 +2,3 @@ import { Tree } from 'nx/src/generators/tree';
 import { GeneratorCallback } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-//# sourceMappingURL=add-linting.d.ts.map

package/{src → dist/src}/generators/library/lib/add-linting.js

@@ -5,8 +5,7 @@ const eslint_1 = require("@nx/eslint");
 const path_1 = require("nx/src/utils/path");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("../../../utils/lint");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
+const internal_1 = require("@nx/eslint/internal");
 async function addLinting(host, options) {
     if (options.linter === 'eslint') {
         const tasks = [];
@@ -23,17 +22,17 @@ async function addLinting(host, options) {
             addPlugin: options.addPlugin,
         });
         tasks.push(lintTask);
-        if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-            if ((0, flat_config_1.useFlatConfig)(host)) {
-                (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(host, options.projectRoot, 'flat/react', { checkBaseConfig: true });
+        if ((0, internal_1.isEslintConfigSupported)(host)) {
+            if ((0, internal_1.useFlatConfig)(host)) {
+                (0, internal_1.addPredefinedConfigToFlatLintConfig)(host, options.projectRoot, 'flat/react', { checkBaseConfig: true });
                 // Add an empty rules object to users know how to add/override rules
-                (0, eslint_file_1.addOverrideToLintConfig)(host, options.projectRoot, {
+                (0, internal_1.addOverrideToLintConfig)(host, options.projectRoot, {
                     files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
                     rules: {},
                 });
             }
             else {
-                const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, {
+                const addExtendsTask = (0, internal_1.addExtendsToLintConfig)(host, options.projectRoot, {
                     name: 'plugin:@nx/react',
                     needCompatFixup: true,
                 });
@@ -41,12 +40,12 @@ async function addLinting(host, options) {
             }
             // Add out-tsc ignore pattern when using TS solution setup
             if (options.isUsingTsSolutionConfig) {
-                (0, eslint_file_1.addIgnoresToLintConfig)(host, options.projectRoot, ['**/out-tsc']);
+                (0, internal_1.addIgnoresToLintConfig)(host, options.projectRoot, ['**/out-tsc']);
             }
         }
         let installTask = () => { };
         if (!options.skipPackageJson) {
-            installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
+            installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies, undefined, true);
             tasks.push(installTask);
         }
         return (0, devkit_1.runTasksInSerial)(...tasks);

package/{src → dist/src}/generators/library/lib/add-rollup-build-target.d.ts

@@ -4,4 +4,3 @@ import { NormalizedSchema } from '../schema';
 export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema & {
     format?: Array<'esm' | 'cjs'>;
 }, external?: Set<String>): Promise<GeneratorCallback>;
-//# sourceMappingURL=add-rollup-build-target.d.ts.map

package/{src → dist/src}/generators/library/lib/add-rollup-build-target.js

@@ -17,14 +17,9 @@ async function addRollupBuildTarget(host, options, external = new Set(['react',
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {
             '@rollup/plugin-url': versions_1.rollupPluginUrlVersion,
             '@svgr/rollup': versions_1.svgrRollupVersion,
-        }));
-    }
-    if (options.style === '@emotion/styled') {
-        external.add('@emotion/react/jsx-runtime');
-    }
-    else {
-        external.add('react/jsx-runtime');
+        }, undefined, true));
     }
+    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 → dist/src}/generators/library/lib/create-files.d.ts

@@ -1,4 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function createFiles(host: Tree, options: NormalizedSchema): void;
-//# sourceMappingURL=create-files.d.ts.map

package/{src → dist/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 → dist/src}/generators/library/lib/determine-entry-fields.d.ts

@@ -1,4 +1,3 @@
 import type { PackageJson } from 'nx/src/utils/package-json';
 import type { NormalizedSchema } from '../schema';
 export declare function determineEntryFields(options: NormalizedSchema): Pick<PackageJson, 'main' | 'types' | 'exports'>;
-//# sourceMappingURL=determine-entry-fields.d.ts.map

package/{src → dist/src}/generators/library/lib/install-common-dependencies.d.ts

@@ -1,4 +1,3 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function installCommonDependencies(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
-//# sourceMappingURL=install-common-dependencies.d.ts.map

package/{src → dist/src}/generators/library/lib/install-common-dependencies.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installCommonDependencies = installCommonDependencies;
 const devkit_1 = require("@nx/devkit");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
+const internal_1 = require("@nx/js/internal");
 const version_utils_1 = require("../../../utils/version-utils");
 const versions_1 = require("../../../utils/versions");
 async function installCommonDependencies(host, options) {
@@ -21,29 +21,24 @@ 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') {
         devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
         devDependencies['@testing-library/dom'] = versions_1.testingLibraryDomVersion;
     }
-    const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, devDependencies);
+    const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, devDependencies, undefined, true);
     tasks.push(baseInstallTask);
     if (options.compiler === 'swc') {
-        tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));
+        tasks.push((0, internal_1.addSwcDependencies)(host));
     }
     else if (options.compiler === 'babel') {
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {
             '@babel/preset-react': versions_1.babelPresetReactVersion,
             '@babel/core': versions_1.babelCoreVersion,
-        }));
+        }, undefined, true));
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/{src → dist/src}/generators/library/lib/normalize-options.d.ts

@@ -1,4 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema, Schema } from '../schema';
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;
-//# sourceMappingURL=normalize-options.d.ts.map

package/{src → dist/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");
+const internal_2 = require("@nx/js/internal");
 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, {
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(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,
@@ -50,11 +50,11 @@ async function normalizeOptions(host, options) {
     normalized.inSourceTests === normalized.minimal || normalized.inSourceTests;
     if (options.appProject) {
         const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
-        const appProjectType = (0, ts_solution_setup_1.getProjectType)(host, appProjectConfig.root, appProjectConfig.projectType);
+        const appProjectType = (0, internal_2.getProjectType)(host, appProjectConfig.root, appProjectConfig.projectType);
         if (appProjectType !== 'application') {
             throw new Error(`appProject expected type of "application" but got "${appProjectType}"`);
         }
-        const appSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(appProjectConfig, host);
+        const appSourceRoot = (0, internal_2.getProjectSourceRoot)(appProjectConfig, host);
         normalized.appMain =
             appProjectConfig.targets.build?.options?.main ??
                 findMainEntry(host, appProjectConfig.root);

package/{src/generators/application → dist/src/generators/library}/lib/set-defaults.d.ts

@@ -1,4 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function setDefaults(host: Tree, options: NormalizedSchema): void;
-//# sourceMappingURL=set-defaults.d.ts.map

package/{src → dist/src}/generators/library/lib/update-app-routes.d.ts

@@ -1,4 +1,3 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 export declare function updateAppRoutes(host: Tree, options: NormalizedSchema): import("@nx/devkit").GeneratorCallback;
-//# sourceMappingURL=update-app-routes.d.ts.map

package/{src → dist/src}/generators/library/lib/update-app-routes.js

@@ -6,7 +6,7 @@ const ast_utils_1 = require("../../../utils/ast-utils");
 const ast_utils_2 = require("../../../utils/ast-utils");
 const maybe_js_1 = require("../../../utils/maybe-js");
 const versions_1 = require("../../../utils/versions");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function updateAppRoutes(host, options) {
     if (!options.appMain || !options.appSourceRoot) {
@@ -20,7 +20,7 @@ function updateAppRoutes(host, options) {
     const appComponentPath = (0, devkit_1.joinPathFragments)(options.appSourceRoot, (0, maybe_js_1.maybeJs)(options, `${componentImportPath}.tsx`));
     const routerTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
         'react-router-dom': versions_1.reactRouterDomVersion,
-    }, {});
+    }, {}, undefined, true);
     // addBrowserRouterToMain
     const isRouterPresent = content.match(/react-router-dom/);
     if (!isRouterPresent) {
@@ -53,7 +53,7 @@ function readComponent(host, path) {
         throw new Error(`Cannot find ${path}`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const content = host.read(path, 'utf-8');
     const source = tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true);

package/{src → dist/src}/generators/library/library.d.ts

@@ -3,4 +3,3 @@ import { Schema } from './schema';
 export declare function libraryGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function libraryGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;
-//# sourceMappingURL=library.d.ts.map