@nx/react 0.0.0-pr-29860-d639246 → 0.0.0-pr-3-e51e28c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "0.0.0-pr-29860-d639246",
+  "version": "0.0.0-pr-3-e51e28c",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -38,11 +38,11 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-29860-d639246",
-    "@nx/js": "0.0.0-pr-29860-d639246",
-    "@nx/eslint": "0.0.0-pr-29860-d639246",
-    "@nx/web": "0.0.0-pr-29860-d639246",
-    "@nx/module-federation": "0.0.0-pr-29860-d639246",
+    "@nx/devkit": "0.0.0-pr-3-e51e28c",
+    "@nx/js": "0.0.0-pr-3-e51e28c",
+    "@nx/eslint": "0.0.0-pr-3-e51e28c",
+    "@nx/web": "0.0.0-pr-3-e51e28c",
+    "@nx/module-federation": "0.0.0-pr-3-e51e28c",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

package/src/generators/application/application.js

@@ -29,7 +29,6 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
-        useProjectJson: true,
         ...schema,
     });
 }
@@ -45,6 +44,11 @@ async function applicationGeneratorInternal(tree, schema) {
     });
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(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) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+    }
     (0, show_possible_warnings_1.showPossibleWarnings)(tree, options);
     const initTask = await (0, init_1.default)(tree, {
         ...options,
@@ -79,11 +83,6 @@ async function applicationGeneratorInternal(tree, schema) {
     }
     await (0, create_application_files_1.createApplicationFiles)(tree, options);
     (0, add_project_1.addProject)(tree, options);
-    // 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);
-    }
     if (options.style === 'tailwind') {
         const twTask = await (0, setup_tailwind_1.setupTailwindGenerator)(tree, {
             project: options.projectName,

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

@@ -46,15 +46,17 @@ async function addE2e(tree, options) {
     switch (options.e2eTestRunner) {
         case 'cypress': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-            const packageJson = {
-                name: options.e2eProjectName,
-                version: '0.0.1',
-                private: true,
-            };
-            if (!options.useProjectJson) {
-                packageJson.nx = {
-                    implicitDependencies: [options.projectName],
-                };
+            if (options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        projectType: 'application',
+                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                        implicitDependencies: [options.projectName],
+                    },
+                });
             }
             else {
                 (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -66,9 +68,6 @@ async function addE2e(tree, options) {
                     tags: [],
                 });
             }
-            if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
-            }
             const e2eTask = await configurationGenerator(tree, {
                 ...options,
                 project: options.e2eProjectName,
@@ -117,15 +116,17 @@ async function addE2e(tree, options) {
         }
         case 'playwright': {
             const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
-            const packageJson = {
-                name: options.e2eProjectName,
-                version: '0.0.1',
-                private: true,
-            };
-            if (!options.useProjectJson) {
-                packageJson.nx = {
-                    implicitDependencies: [options.projectName],
-                };
+            if (options.isUsingTsSolutionConfig) {
+                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
+                    name: options.e2eProjectName,
+                    version: '0.0.1',
+                    private: true,
+                    nx: {
+                        projectType: 'application',
+                        sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                        implicitDependencies: [options.projectName],
+                    },
+                });
             }
             else {
                 (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
@@ -134,12 +135,8 @@ async function addE2e(tree, options) {
                     sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
                     targets: {},
                     implicitDependencies: [options.projectName],
-                    tags: [],
                 });
             }
-            if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-                (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
-            }
             const e2eTask = await configurationGenerator(tree, {
                 project: options.e2eProjectName,
                 skipFormat: true,

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

@@ -28,31 +28,26 @@ function addProject(host, options) {
             serve: createRspackServeTarget(options),
         };
     }
-    const packageJson = {
-        name: options.importPath,
-        version: '0.0.1',
-        private: true,
-    };
-    if (!options.useProjectJson) {
-        if (options.projectName !== options.importPath) {
-            packageJson.nx = { name: options.projectName };
-        }
-        if (Object.keys(project.targets).length) {
-            packageJson.nx ??= {};
-            packageJson.nx.targets = project.targets;
-        }
-        if (options.parsedTags?.length) {
-            packageJson.nx ??= {};
-            packageJson.nx.tags = options.parsedTags;
-        }
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: options.projectName,
+            version: '0.0.1',
+            private: true,
+        });
     }
-    else {
+    if (!options.isUsingTsSolutionConfig || options.alwaysGenerateProjectJson) {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
             ...project,
         });
     }
-    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+    else if (options.parsedTags?.length ||
+        Object.keys(project.targets).length) {
+        const updatedProject = {
+            root: options.appProjectRoot,
+            targets: project.targets,
+            tags: options.parsedTags?.length ? options.parsedTags : undefined,
+        };
+        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, updatedProject);
     }
 }
 function createRspackBuildTarget(options) {

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

@@ -39,7 +39,7 @@ async function createApplicationFiles(host, options) {
     const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot);
     const appTests = (0, get_app_tests_1.getAppTests)(options);
     const templateVariables = {
-        ...options.names,
+        ...(0, devkit_1.names)(options.name),
         ...options,
         js: !!options.js, // Ensure this is defined in template
         tmpl: '',

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,3 +1,5 @@
 import { Tree } from '@nx/devkit';
 import { NormalizedSchema, Schema } from '../schema';
+export declare function normalizeDirectory(options: Schema): string;
+export declare function normalizeProjectName(options: Schema): string;
 export declare function normalizeOptions<T extends Schema = Schema>(host: Tree, options: Schema): Promise<NormalizedSchema<T>>;

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

@@ -1,14 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeDirectory = normalizeDirectory;
+exports.normalizeProjectName = normalizeProjectName;
 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 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 get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+function normalizeDirectory(options) {
+    options.directory = options.directory?.replace(/\\{1,2}/g, '/');
+    const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
+    return projectDirectory
+        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${(0, devkit_1.names)(options.name).fileName}`
+        : (0, devkit_1.names)(options.name).fileName;
+}
+function normalizeProjectName(options) {
+    return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
+}
 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, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
+    const { projectName: appProjectName, projectRoot: appProjectRoot } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -19,8 +32,6 @@ async function normalizeOptions(host, options) {
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
     options.rootProject = appProjectRoot === '.';
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags
@@ -31,20 +42,21 @@ async function normalizeOptions(host, options) {
         ? null
         : options.style;
     (0, assertion_1.assertValidStyle)(options.style);
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const normalized = {
         ...options,
-        projectName: appProjectName,
+        name: appProjectName,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(host, appProjectName)
+            : appProjectName,
         appProjectRoot,
-        importPath,
         e2eProjectName,
         e2eProjectRoot,
         parsedTags,
         fileName,
         styledModule,
         hasStyles: options.style !== 'none',
-        names: (0, devkit_1.names)(projectNames.projectSimpleName),
         isUsingTsSolutionConfig,
-        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     normalized.routing = normalized.routing ?? false;
     normalized.strict = normalized.strict ?? true;

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

@@ -1,4 +1,3 @@
-import type { names } from '@nx/devkit';
 import type { Linter, LinterType } from '@nx/eslint';
 import type { SupportedStyles } from '../../../typings/style';
 
@@ -31,7 +30,7 @@ export interface Schema {
   nxCloudToken?: string;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'none';
-  useProjectJson?: boolean;
+  alwaysGenerateProjectJson?: boolean; // this is needed for MF currently
 }
 
 export interface NormalizedSchema<T extends Schema = Schema> extends T {
@@ -39,13 +38,11 @@ export interface NormalizedSchema<T extends Schema = Schema> extends T {
   appProjectRoot: string;
   e2eProjectName: string;
   e2eProjectRoot: string;
-  importPath: string;
   parsedTags: string[];
   fileName: string;
   styledModule: null | SupportedStyles;
   hasStyles: boolean;
   unitTestRunner: 'jest' | 'vitest' | 'none';
   addPlugin?: boolean;
-  names: ReturnType<typeof names>;
   isUsingTsSolutionConfig?: boolean;
 }

package/src/generators/application/schema.json

@@ -187,10 +187,6 @@
       "description": "Generate a React app with a minimal setup, no separate test files.",
       "type": "boolean",
       "default": false
-    },
-    "useProjectJson": {
-      "type": "boolean",
-      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"],

package/src/generators/host/host.js

@@ -19,10 +19,7 @@ const update_module_federation_tsconfig_1 = require("./lib/update-module-federat
 async function hostGenerator(host, schema) {
     const tasks = [];
     const options = {
-        ...(await (0, normalize_options_1.normalizeOptions)(host, {
-            ...schema,
-            useProjectJson: true,
-        })),
+        ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
         js: schema.js ?? false,
         typescriptConfiguration: schema.js
             ? false
@@ -42,7 +39,7 @@ async function hostGenerator(host, schema) {
             }
         });
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
     const initTask = await (0, application_1.default)(host, {
         ...options,
         directory: options.appProjectRoot,
@@ -50,7 +47,7 @@ async function hostGenerator(host, schema) {
         // The target use-case is loading remotes as child routes, thus always enable routing.
         routing: true,
         skipFormat: true,
-        useProjectJson: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initTask);
     const remotesWithPorts = [];

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

@@ -1,6 +1,4 @@
 import { Tree } from 'nx/src/generators/tree';
 import { GeneratorCallback } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
-export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema & {
-    format?: Array<'esm' | 'cjs'>;
-}, external?: Set<String>): Promise<GeneratorCallback>;
+export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

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

@@ -4,7 +4,7 @@ exports.addRollupBuildTarget = addRollupBuildTarget;
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../../../utils/maybe-js");
 const versions_1 = require("../../../utils/versions");
-async function addRollupBuildTarget(host, options, external = new Set(['react', 'react-dom'])) {
+async function addRollupBuildTarget(host, options) {
     const tasks = [];
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
     tasks.push(await configurationGenerator(host, {
@@ -19,11 +19,12 @@ async function addRollupBuildTarget(host, options, external = new Set(['react',
             '@svgr/rollup': versions_1.svgrRollupVersion,
         }));
     }
+    const external = ['react', 'react-dom'];
     if (options.style === '@emotion/styled') {
-        external.add('@emotion/react/jsx-runtime');
+        external.push('@emotion/react/jsx-runtime');
     }
     else {
-        external.add('react/jsx-runtime');
+        external.push('react/jsx-runtime');
     }
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasRollupPlugin = !!nxJson.plugins?.some((p) => typeof p === 'string'
@@ -43,8 +44,8 @@ module.exports = withNx(
             : (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), 'dist', options.projectRoot)}',
     tsConfig: './tsconfig.lib.json',
     compiler: '${options.compiler ?? 'babel'}',
-    external: ${JSON.stringify(Array.from(external))},
-    format: ${JSON.stringify(options.format ?? ['esm'])},
+    external: ${JSON.stringify(external)},
+    format: ['esm'],
     assets:[{ input: '.', output: '.', glob: 'README.md'}],
   }, {
     // Provide additional rollup configuration here. See: https://rollupjs.org/configuration-options
@@ -73,7 +74,7 @@ module.exports = withNx(
                 tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
                 project: `${options.projectRoot}/package.json`,
                 entryFile: (0, maybe_js_1.maybeJs)(options, `${options.projectRoot}/src/index.ts`),
-                external: Array.from(external),
+                external,
                 rollupConfig: `@nx/react/plugins/bundle-rollup`,
                 compiler: options.compiler ?? 'babel',
                 assets: [

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

@@ -43,8 +43,7 @@ function createFiles(host, options) {
         });
     }
     if ((options.publishable || options.buildable) &&
-        !options.isUsingTsSolutionConfig &&
-        options.useProjectJson) {
+        !options.isUsingTsSolutionConfig) {
         if (options.bundler === 'vite') {
             (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
                 name: options.importPath,

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

@@ -7,7 +7,7 @@ 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');
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
@@ -41,26 +41,23 @@ async function normalizeOptions(host, options) {
         bundler,
         fileName,
         routePath: `/${projectNames.projectSimpleName}`,
-        name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
+        name: isUsingTsSolutionConfig ? importPath : projectName,
         projectRoot,
         parsedTags,
         importPath,
-        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     // Libraries with a bundler or is publishable must also be buildable.
     normalized.buildable = Boolean(normalized.bundler !== 'none' || options.buildable || options.publishable);
     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);
-        if (appProjectType !== 'application') {
-            throw new Error(`appProject expected type of "application" but got "${appProjectType}"`);
+        if (appProjectConfig.projectType !== 'application') {
+            throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
         }
-        const appSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(host, appProjectConfig.sourceRoot, appProjectConfig.root);
         normalized.appMain =
             appProjectConfig.targets.build?.options?.main ??
                 findMainEntry(host, appProjectConfig.root);
-        normalized.appSourceRoot = (0, devkit_1.normalizePath)(appSourceRoot);
+        normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
         // TODO(jack): We should use appEntryFile instead of appProject so users can directly set it rather than us inferring it.
         if (!normalized.appMain) {
             throw new Error(`Could not locate project main for ${options.appProject}`);

package/src/generators/library/library.js

@@ -27,7 +27,6 @@ const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-re
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
         addPlugin: false,
-        useProjectJson: true,
         ...schema,
     });
 }
@@ -40,7 +39,7 @@ async function libraryGeneratorInternal(host, schema) {
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     if (options.publishable === true && !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
@@ -53,20 +52,18 @@ async function libraryGeneratorInternal(host, schema) {
         skipFormat: true,
     });
     tasks.push(initTask);
-    const packageJson = {
-        name: options.importPath,
-        version: '0.0.1',
-        ...(0, determine_entry_fields_1.determineEntryFields)(options),
-        files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
-    };
-    if (!options.useProjectJson) {
-        if (options.name !== options.importPath) {
-            packageJson.nx = { name: options.name };
-        }
-        if (options.parsedTags?.length) {
-            packageJson.nx ??= {};
-            packageJson.nx.tags = options.parsedTags;
-        }
+    if (options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, {
+            name: options.importPath ?? options.name,
+            version: '0.0.1',
+            ...(0, determine_entry_fields_1.determineEntryFields)(options),
+            nx: options.parsedTags?.length
+                ? {
+                    tags: options.parsedTags,
+                }
+                : undefined,
+            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
+        });
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.name, {
@@ -77,9 +74,6 @@ async function libraryGeneratorInternal(host, schema) {
             targets: {},
         });
     }
-    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(host, `${options.projectRoot}/package.json`, packageJson);
-    }
     (0, create_files_1.createFiles)(host, options);
     const lintTask = await (0, add_linting_1.addLinting)(host, options);
     tasks.push(lintTask);

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

@@ -27,7 +27,6 @@ export interface Schema {
   minimal?: boolean;
   simpleName?: boolean;
   addPlugin?: boolean;
-  useProjectJson?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {
@@ -37,7 +36,6 @@ export interface NormalizedSchema extends Schema {
   projectRoot: string;
   routePath: string;
   parsedTags: string[];
-  importPath: string;
   appMain?: string;
   appSourceRoot?: string;
   unitTestRunner: 'jest' | 'vitest' | 'none';

package/src/generators/library/schema.json

@@ -190,10 +190,6 @@
       "description": "Don't include the directory in the name of the module of the library.",
       "type": "boolean",
       "default": false
-    },
-    "useProjectJson": {
-      "type": "boolean",
-      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]

package/src/generators/remote/remote.js

@@ -48,10 +48,7 @@ function addModuleFederationFiles(host, options) {
 async function remoteGenerator(host, schema) {
     const tasks = [];
     const options = {
-        ...(await (0, normalize_options_1.normalizeOptions)(host, {
-            ...schema,
-            useProjectJson: true,
-        })),
+        ...(await (0, normalize_options_1.normalizeOptions)(host, schema)),
         // when js is set to true, we want to use the js configuration
         js: schema.js ?? false,
         typescriptConfiguration: schema.js
@@ -65,29 +62,29 @@ async function remoteGenerator(host, schema) {
     if (options.dynamic) {
         // Dynamic remotes generate with library { type: 'var' } by default.
         // We need to ensure that the remote name is a valid variable name.
-        const isValidRemote = (0, js_1.isValidVariable)(options.projectName);
+        const isValidRemote = (0, js_1.isValidVariable)(options.name);
         if (!isValidRemote.isValid) {
-            throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);
+            throw new Error(`Invalid remote name provided: ${options.name}. ${isValidRemote.message}`);
         }
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
     const REMOTE_NAME_REGEX = '^[a-zA-Z_$][a-zA-Z_$0-9]*$';
     const remoteNameRegex = new RegExp(REMOTE_NAME_REGEX);
-    if (!remoteNameRegex.test(options.projectName)) {
-        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${options.projectName}. Remote project names must:
+    if (!remoteNameRegex.test(options.name)) {
+        throw new Error((0, devkit_1.stripIndents) `Invalid remote name: ${options.name}. Remote project names must:
       - Start with a letter, dollar sign ($) or underscore (_)
       - Followed by any valid character (letters, digits, underscores, or dollar signs)
       The regular expression used is ${REMOTE_NAME_REGEX}.`);
     }
     const initAppTask = await (0, application_1.default)(host, {
         ...options,
-        name: options.projectName,
+        name: options.name,
         skipFormat: true,
-        useProjectJson: true,
+        alwaysGenerateProjectJson: true,
     });
     tasks.push(initAppTask);
     if (options.host) {
-        (0, update_host_with_remote_1.updateHostWithRemote)(host, options.host, options.projectName);
+        (0, update_host_with_remote_1.updateHostWithRemote)(host, options.host, options.name);
     }
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in

package/src/utils/versions.d.ts

@@ -42,8 +42,8 @@ export declare const typesExpressVersion = "^4.17.21";
 export declare const isbotVersion = "^3.6.5";
 export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.12";
-export declare const moduleFederationNodeVersion = "^2.6.26";
-export declare const moduleFederationEnhancedVersion = "^0.9.0";
+export declare const moduleFederationNodeVersion = "^2.6.21";
+export declare const moduleFederationEnhancedVersion = "^0.8.8";
 export declare const lessVersion = "3.12.2";
 export declare const sassVersion = "^1.55.0";
 export declare const rollupPluginUrlVersion = "^8.0.2";

package/src/utils/versions.js

@@ -48,8 +48,8 @@ exports.typesExpressVersion = '^4.17.21';
 exports.isbotVersion = '^3.6.5';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.12';
-exports.moduleFederationNodeVersion = '^2.6.26';
-exports.moduleFederationEnhancedVersion = '^0.9.0';
+exports.moduleFederationNodeVersion = '^2.6.21';
+exports.moduleFederationEnhancedVersion = '^0.8.8';
 // style preprocessors
 exports.lessVersion = '3.12.2';
 exports.sassVersion = '^1.55.0';