@nx/react 23.0.0-beta.2 → 23.0.0-beta.21

package/src/generators/_utils/normalize.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefaultPort = getDefaultPort;
+exports.toFederationName = toFederationName;
+exports.normalizeScaffoldOptions = normalizeScaffoldOptions;
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+// Default ports are split so a `consumer` + `provider` generated with no
+// overrides don't collide. Consumer gets the round base (the user navigates
+// to it); providers get base+1, base+2, etc., so a manifest pointing at
+// `consumer-base + 1` lines up with the first generated provider.
+//
+// Vite base deliberately avoids 5000 (macOS AirTunes binds it on the IPv4
+// wildcard, leading to silent EADDRINUSE on `127.0.0.1`).
+const DEFAULT_BASE_PORTS = {
+    vite: 5100,
+    rsbuild: 3100,
+    rspack: 8100,
+};
+function getDefaultPort(bundler, surface) {
+    const base = DEFAULT_BASE_PORTS[bundler];
+    return surface === 'consumer' ? base : base + 1;
+}
+// Federation `name` must be a JS identifier so the bundler can use it as a
+// global namespace. Hyphens are allowed in project names but invalid as an
+// identifier, so we coerce to underscores.
+function toFederationName(projectName) {
+    if (!/[A-Za-z0-9]/.test(projectName)) {
+        throw new Error(`Cannot derive a federation name from project name '${projectName}'. Use letters, digits, hyphens, or underscores.`);
+    }
+    const candidate = projectName
+        .replace(/-/g, '_')
+        .replace(/[^A-Za-z0-9_]/g, '');
+    if (/^[0-9]/.test(candidate)) {
+        throw new Error(`Federation name '${candidate}' (derived from project '${projectName}') cannot start with a digit. Rename the project.`);
+    }
+    return candidate;
+}
+async function normalizeScaffoldOptions(tree, raw) {
+    const bundler = raw.bundler ?? 'vite';
+    const { projectName, projectRoot } = await (0, internal_1.determineProjectNameAndRootOptions)(tree, {
+        projectType: 'application',
+        directory: raw.directory,
+    });
+    const federationName = toFederationName((0, devkit_1.names)(projectName).fileName);
+    const port = raw.port ?? getDefaultPort(bundler, raw.surface);
+    return { projectName, federationName, bundler, port, projectRoot };
+}

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

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA8BpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAsL5B;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA+BpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA2L5B;AAiBD,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
+const internal_2 = require("@nx/devkit/internal");
 const js_1 = require("@nx/js");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_3 = require("@nx/js/internal");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const create_application_files_1 = require("./lib/create-application-files");
@@ -23,8 +24,6 @@ const add_webpack_1 = require("./lib/bundlers/add-webpack");
 const add_rspack_1 = require("./lib/bundlers/add-rspack");
 const add_rsbuild_1 = require("./lib/bundlers/add-rsbuild");
 const add_vite_1 = require("./lib/bundlers/add-vite");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
-const prompt_1 = require("@nx/devkit/src/generators/prompt");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
@@ -34,7 +33,7 @@ async function applicationGenerator(tree, schema) {
 }
 async function applicationGeneratorInternal(tree, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_3.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
@@ -48,7 +47,7 @@ async function applicationGeneratorInternal(tree, schema) {
     options.useReactRouter =
         options.routing && options.bundler === 'vite'
             ? (options.useReactRouter ??
-                (await (0, prompt_1.promptWhenInteractive)({
+                (await (0, internal_1.promptWhenInteractive)({
                     name: 'response',
                     message: 'Would you like to use react-router for server-side rendering?',
                     type: 'autocomplete',
@@ -72,18 +71,23 @@ async function applicationGeneratorInternal(tree, schema) {
     });
     tasks.push(initTask);
     if (!options.addPlugin) {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        nxJson.targetDefaults ??= {};
-        if (!Object.keys(nxJson.targetDefaults).includes('build')) {
-            nxJson.targetDefaults.build = {
+        const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+        const existing = findBuildDefault(nxJson.targetDefaults);
+        if (!existing) {
+            (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+                target: 'build',
                 cache: true,
                 dependsOn: ['^build'],
-            };
+            });
+            (0, devkit_1.updateNxJson)(tree, nxJson);
         }
-        else if (!nxJson.targetDefaults.build.dependsOn) {
-            nxJson.targetDefaults.build.dependsOn = ['^build'];
+        else if (!existing.dependsOn) {
+            (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+                target: 'build',
+                dependsOn: ['^build'],
+            });
+            (0, devkit_1.updateNxJson)(tree, nxJson);
         }
-        (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     if (options.bundler === 'webpack') {
         await (0, add_webpack_1.initWebpack)(tree, options, tasks);
@@ -102,7 +106,7 @@ async function applicationGeneratorInternal(tree, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+        await (0, internal_3.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(tree, options);
     tasks.push(lintTask);
@@ -151,20 +155,30 @@ async function applicationGeneratorInternal(tree, schema) {
         });
     }
     // Only for the new TS solution
-    (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+    (0, internal_3.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined, options.useReactRouter ? 'app' : 'src');
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
+    (0, internal_3.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+        (0, internal_1.logShowProjectCommand)(options.projectName);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+function findBuildDefault(td) {
+    if (!td)
+        return undefined;
+    if (Array.isArray(td)) {
+        return td.find((e) => e.target === 'build' &&
+            e.projects === undefined &&
+            e.plugin === undefined);
+    }
+    return td['build'];
+}
 exports.default = applicationGenerator;

package/src/generators/application/lib/add-e2e.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAI7C,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAwN5B"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAwN5B"}

package/src/generators/application/lib/add-linting.js

@@ -37,10 +37,9 @@ exports.addLinting = addLinting;
 exports.isEslintInstalled = isEslintInstalled;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
-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");
 const devkit_2 = require("@nx/devkit");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
+const internal_2 = require("@nx/js/internal");
 const lint_1 = require("../../../utils/lint");
 const versions_1 = require("../../../utils/versions");
 async function addLinting(host, options) {
@@ -59,23 +58,23 @@ 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.appProjectRoot, 'flat/react', { checkBaseConfig: true });
+        if ((0, internal_1.isEslintConfigSupported)(host)) {
+            if ((0, internal_1.useFlatConfig)(host)) {
+                (0, internal_1.addPredefinedConfigToFlatLintConfig)(host, options.appProjectRoot, 'flat/react', { checkBaseConfig: true });
                 // Add an empty rules object to users know how to add/override rules
-                (0, eslint_file_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
+                (0, internal_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
                     files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
                     rules: {},
                 });
             }
             else {
-                const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.appProjectRoot, { name: 'plugin:@nx/react', needCompatFixup: true });
+                const addExtendsTask = (0, internal_1.addExtendsToLintConfig)(host, options.appProjectRoot, { name: 'plugin:@nx/react', needCompatFixup: true });
                 tasks.push(addExtendsTask);
             }
         }
         if (!options.skipPackageJson) {
             const installTask = (0, devkit_2.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
-            const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(host);
+            const addSwcTask = (0, internal_2.addSwcDependencies)(host);
             tasks.push(installTask, addSwcTask);
         }
         if (options.useReactRouter) {
@@ -89,11 +88,11 @@ async function ignoreReactRouterFilesInEslintConfig(tree, projectRoot) {
         return;
     }
     (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
-    const { addIgnoresToLintConfig, isEslintConfigSupported } = await Promise.resolve().then(() => __importStar(require('@nx/eslint/src/generators/utils/eslint-file')));
+    const { addIgnoresToLintConfig, isEslintConfigSupported } = await Promise.resolve().then(() => __importStar(require('@nx/eslint/internal')));
     if (!isEslintConfigSupported(tree)) {
         return;
     }
-    const { useFlatConfig } = await Promise.resolve().then(() => __importStar(require('@nx/eslint/src/utils/flat-config')));
+    const { useFlatConfig } = await Promise.resolve().then(() => __importStar(require('@nx/eslint/internal')));
     const isUsingFlatConfig = useFlatConfig(tree);
     if (!projectRoot && !isUsingFlatConfig) {
         // root eslintrc files ignore all files and the root eslintrc files add

package/src/generators/application/lib/add-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAKL,IAAI,EAGL,MAAM,YAAY,CAAC;AAMpB,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QA2E/D"}
+{"version":3,"file":"add-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAML,IAAI,EAGL,MAAM,YAAY,CAAC;AAMpB,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAyF/D"}

package/src/generators/application/lib/add-project.js

@@ -15,6 +15,12 @@ function addProject(host, options) {
     };
     if (options.bundler === 'webpack') {
         if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(host) || !options.addPlugin) {
+            // Mirrors warnWebpackExecutorGenerating from @nx/webpack/src/utils/deprecation.
+            // Inlined to avoid a cross-package deep import; @nx/webpack'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('Generating targets that use the deprecated `@nx/webpack:webpack` and `@nx/webpack:dev-server` executors. These executors will be removed in Nx v24. Run `nx g @nx/webpack:convert-to-inferred` next to migrate these targets to the `@nx/webpack/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
             project.targets = {
                 build: createBuildTarget(options),
                 serve: createServeTarget(options),
@@ -23,6 +29,10 @@ function addProject(host, options) {
     }
     else if (options.bundler === 'rspack' &&
         (!(0, has_rspack_plugin_1.hasRspackPlugin)(host) || !options.addPlugin)) {
+        // Mirrors warnRspackExecutorGenerating from @nx/rspack/src/utils/deprecation.
+        // Inlined to avoid a cross-package import where react does not declare a
+        // TypeScript project reference to rspack.
+        devkit_1.logger.warn('Generating targets that use the deprecated `@nx/rspack:rspack` and `@nx/rspack:dev-server` executors. These executors will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` next to migrate these targets to the `@nx/rspack/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
         project.targets = {
             build: createRspackBuildTarget(options),
             serve: createRspackServeTarget(options),

package/src/generators/application/lib/add-routing.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRouting = addRouting;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const ast_utils_1 = require("../../../utils/ast-utils");
 const versions_1 = require("../../../utils/versions");
 const maybe_js_1 = require("../../../utils/maybe-js");
@@ -12,7 +12,7 @@ function addRouting(host, options) {
         return () => { };
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const appPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)({
         js: options.js,

package/src/generators/application/lib/bundlers/add-vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-vite.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/react/src/generators/application/lib/bundlers/add-vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAoC,MAAM,YAAY,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAExD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA8Db;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA0Cb"}
+{"version":3,"file":"add-vite.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/react/src/generators/application/lib/bundlers/add-vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAoC,MAAM,YAAY,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAExD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBAkEb;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA8Cb"}

package/src/generators/application/lib/bundlers/add-vite.js

@@ -79,7 +79,11 @@ async function setupViteConfiguration(tree, options, tasks) {
         includeLib: false,
         includeVitest: options.unitTestRunner === 'vitest',
         inSourceTests: options.inSourceTests,
-        rollupOptionsExternal: ["'react'", "'react-dom'", "'react/jsx-runtime'"],
+        rolldownOptionsExternal: [
+            "'react'",
+            "'react-dom'",
+            "'react/jsx-runtime'",
+        ],
         port: options.port,
         previewPort: options.port,
         useEsmExtension: true,
@@ -106,7 +110,11 @@ async function setupVitestConfiguration(tree, options, tasks) {
         includeLib: false,
         includeVitest: true,
         inSourceTests: options.inSourceTests,
-        rollupOptionsExternal: ["'react'", "'react-dom'", "'react/jsx-runtime'"],
+        rolldownOptionsExternal: [
+            "'react'",
+            "'react-dom'",
+            "'react/jsx-runtime'",
+        ],
         imports: [
             options.compiler === 'swc'
                 ? `import react from '@vitejs/plugin-react-swc'`

package/src/generators/application/lib/create-application-files.d.ts

@@ -37,7 +37,7 @@ export declare function getDefaultTemplateVariables(host: Tree, options: Normali
     tags?: string;
     inSourceTests?: boolean;
     e2eTestRunner: "cypress" | "playwright" | "none";
-    linter: import("packages/eslint").Linter | import("packages/eslint").LinterType;
+    linter: import("packages/eslint/dist").Linter | import("packages/eslint/dist").LinterType;
     classComponent?: boolean;
     routing?: boolean;
     useReactRouter?: boolean;

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

@@ -13,7 +13,7 @@ const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const get_app_tests_1 = require("./get-app-tests");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 const has_rspack_plugin_1 = require("../../../utils/has-rspack-plugin");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const versions_1 = require("../../../utils/versions");
 function getDefaultTemplateVariables(host, options) {
     const hasStyleFile = ['scss', 'css'].includes(options.style);
@@ -35,7 +35,7 @@ function getDefaultTemplateVariables(host, options) {
         inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(appTests),
         style: options.style,
         hasStyleFile,
-        isUsingTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionSetup: (0, internal_1.isUsingTsSolutionSetup)(host),
         port: options.port ?? 4200,
     };
 }

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

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 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");
 const assertion_1 = require("../../../utils/assertion");
 const find_free_port_1 = require("./find-free-port");
-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) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -19,7 +19,7 @@ async function normalizeOptions(host, options) {
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
     options.rootProject = appProjectRoot === '.';
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;

package/src/generators/component/component.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const get_in_source_vitest_tests_template_1 = require("../../utils/get-in-source-vitest-tests-template");
@@ -45,7 +45,7 @@ function createComponentFiles(host, options) {
 let tsModule;
 function addExportsToBarrel(host, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
     const isApp = workspace.get(options.projectName).projectType === 'application';

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

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,IAAI,EAAE,MAAM,YAAY,CAAC;AAK3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGrD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CA2D3B"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/component/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,IAAI,EAAE,MAAM,YAAY,CAAC;AAI3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGrD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CA0D3B"}

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

@@ -2,23 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
+const internal_1 = require("@nx/devkit/internal");
 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(tree, options) {
     (0, assertion_1.assertValidStyle)(options.style);
-    const { artifactName: name, directory, fileName, filePath, fileExtension, fileExtensionType, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
+    const { artifactName: name, directory, fileName, filePath, fileExtension, fileExtensionType, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
         path: options.path,
         name: options.name,
         allowedFileExtensions: ['js', 'jsx', 'ts', 'tsx'],
-        fileExtension: options.js ? 'js' : 'tsx',
-        js: options.js,
+        fileExtension: 'tsx',
     });
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     const { className } = (0, devkit_1.names)(name);
     const { sourceRoot: projectSourceRoot, root: projectRoot, projectType, } = project;
     if (options.export &&
-        (0, ts_solution_setup_1.getProjectType)(tree, projectRoot, projectType) === 'application') {
+        (0, internal_2.getProjectType)(tree, projectRoot, projectType) === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
     options.classComponent = options.classComponent ?? false;

package/src/generators/component/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';
 import { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
@@ -14,14 +14,9 @@ export interface Schema {
   skipFormat?: boolean;
   // Used by Next.js to determine how React should generate the page
   isNextPage?: boolean;
-
-  /**
-   * @deprecated Provide the full file path including the file extension in the `path` option. This option will be removed in Nx v21.
-   */
-  js?: boolean;
 }
 
-export interface NormalizedSchema extends Omit<Schema, 'js'> {
+export interface NormalizedSchema extends Schema {
   directory: string;
   projectRoot: string;
   projectSourceRoot: string;

package/src/generators/component/schema.json

@@ -45,11 +45,6 @@
         ]
       }
     },
-    "js": {
-      "type": "boolean",
-      "description": "Generate JavaScript files rather than TypeScript files.",
-      "x-deprecated": "Provide the full file path including the file extension in the `path` option. This option will be removed in Nx v21."
-    },
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create `spec.ts` test files for the new component.",

package/src/generators/component-story/component-story.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-story.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-story/component-story.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAWtC,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,EACE,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,WAAW,GACZ,EAAE,gCAAgC,QA2EpC;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,cAAc,EAAE,EAAE,CAAC,IAAI,EACvB,kBAAkB,EAAE,MAAM,EAC1B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,OAAO,EACzB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,OAAO,EAClB,aAAa,CAAC,EAAE,OAAO,QAwBxB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,iBAWzC;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"component-story.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-story/component-story.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAWtC,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,EACE,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,WAAW,GACZ,EAAE,gCAAgC,QA2EpC;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,cAAc,EAAE,EAAE,CAAC,IAAI,EACvB,kBAAkB,EAAE,MAAM,EAC1B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,OAAO,EACzB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,OAAO,EAClB,aAAa,CAAC,EAAE,OAAO,QAwBxB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,iBAWzC;AAED,eAAe,uBAAuB,CAAC"}

package/src/generators/component-story/component-story.js

@@ -4,8 +4,7 @@ exports.createComponentStoriesFile = createComponentStoriesFile;
 exports.findPropsAndGenerateFile = findPropsAndGenerateFile;
 exports.componentStoryGenerator = componentStoryGenerator;
 const devkit_1 = require("@nx/devkit");
-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");
+const internal_1 = require("@nx/js/internal");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
 const framework_1 = require("../../utils/framework");
@@ -13,10 +12,10 @@ const path_1 = require("path");
 let tsModule;
 function createComponentStoriesFile(host, { project, componentPath, interactionTests, uiFramework, }) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const proj = (0, devkit_1.getProjects)(host).get(project);
-    const componentFilePath = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(proj, host), componentPath);
+    const componentFilePath = (0, devkit_1.joinPathFragments)((0, internal_1.getProjectSourceRoot)(proj, host), componentPath);
     const componentDirectory = componentFilePath.replace(componentFilePath.slice(componentFilePath.lastIndexOf('/')), '');
     const isPlainJs = componentFilePath.endsWith('.jsx') || componentFilePath.endsWith('.js');
     const componentFileName = componentFilePath

package/src/generators/component-test/component-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,iBAkB7B;AAqED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,iBAkB7B;AAqED,eAAe,sBAAsB,CAAC"}

package/src/generators/component-test/component-test.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentTestGenerator = componentTestGenerator;
 const devkit_1 = require("@nx/devkit");
-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");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
@@ -14,7 +13,7 @@ async function componentTestGenerator(tree, options) {
     // normalize any windows paths
     options.componentPath = options.componentPath.replace(/\\/g, '/');
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     const normalizedPath = options.componentPath.startsWith(sourceRoot)
         ? (0, path_1.relative)(sourceRoot, options.componentPath)
         : options.componentPath;
@@ -25,7 +24,7 @@ async function componentTestGenerator(tree, options) {
 }
 function generateSpecsForComponents(tree, filePath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const sourceFile = tsModule.createSourceFile(filePath, tree.read(filePath, 'utf-8'), tsModule.ScriptTarget.Latest, true);
     const cmpNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);

package/src/generators/consumer/consumer.d.ts

@@ -0,0 +1,5 @@
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import type { ConsumerGeneratorSchema } from './schema';
+export declare function consumerGenerator(tree: Tree, schema: ConsumerGeneratorSchema): Promise<GeneratorCallback>;
+export default consumerGenerator;
+//# sourceMappingURL=consumer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"consumer.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/consumer/consumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAgBpB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAgBxD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAqI5B;AAED,eAAe,iBAAiB,CAAC"}