@nx/react 17.0.5 → 17.0.6

package/src/generators/host/lib/update-module-federation-e2e-project.js

@@ -5,13 +5,11 @@ const devkit_1 = require("@nx/devkit");
 function updateModuleFederationE2eProject(host, options) {
     try {
         let projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.e2eProjectName);
-        if (projectConfig.targets.e2e.executor !== '@nx/playwright:playwright') {
-            projectConfig.targets.e2e.options = {
-                ...projectConfig.targets.e2e.options,
-                baseUrl: `http://localhost:${options.devServerPort}`,
-            };
-            (0, devkit_1.updateProjectConfiguration)(host, options.e2eProjectName, projectConfig);
-        }
+        projectConfig.targets.e2e.options = {
+            ...projectConfig.targets.e2e.options,
+            baseUrl: `http://localhost:${options.devServerPort}`,
+        };
+        (0, devkit_1.updateProjectConfiguration)(host, options.e2eProjectName, projectConfig);
     }
     catch {
         // nothing

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

@@ -1,6 +1,6 @@
 import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import type { Linter } from '@nx/eslint';
-import type { SupportedStyles } from '../../../typings/style';
+import type { SupportedStyles } from '../../../typings';
 
 export interface Schema {
   classComponent?: boolean;
@@ -8,7 +8,7 @@ export interface Schema {
   devServerPort?: number;
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  e2eTestRunner: 'cypress' | 'playwright' | 'none';
+  e2eTestRunner: 'cypress' | 'none';
   globalCss?: boolean;
   js?: boolean;
   linter: Linter;
@@ -25,13 +25,10 @@ export interface Schema {
   unitTestRunner: 'jest' | 'vitest' | 'none';
   minimal?: boolean;
   typescriptConfiguration?: boolean;
-  dynamic?: boolean;
-  addPlugin?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {
   appProjectRoot: string;
   e2eProjectName: string;
   projectName: string;
-  addPlugin?: boolean;
 }

package/src/generators/host/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "GeneratorReactHost",
   "cli": "nx",
   "title": "Generate Module Federation Setup for React Host App",
@@ -43,15 +43,11 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com                     ]"
+            "label": "SASS(.scss)       [ http://sass-lang.com                     ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ https://lesscss.org                       ]"
-          },
-          {
-            "value": "tailwind",
-            "label": "tailwind [ https://tailwindcss.com/            ]"
+            "label": "LESS              [ http://lesscss.org                       ]"
           },
           {
             "value": "styled-components",
@@ -78,11 +74,6 @@
       "enum": ["eslint"],
       "default": "eslint"
     },
-    "dynamic": {
-      "type": "boolean",
-      "description": "Should the host application use dynamic federation?",
-      "default": false
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
@@ -103,9 +94,8 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "playwright", "none"],
-      "description": "Test runner to use for end to end (E2E) tests.",
-      "x-prompt": "Which E2E test runner would you like to use?",
+      "enum": ["cypress", "none"],
+      "description": "Test runner to use for end to end (e2e) tests.",
       "default": "cypress"
     },
     "tags": {
@@ -175,7 +165,7 @@
     },
     "typescriptConfiguration": {
       "type": "boolean",
-      "description": "Whether the module federation configuration and webpack configuration files should use TS. When --js is used, this flag is ignored.",
+      "description": "Whether the module federation configuration and webpack configuration files should use TS.",
       "default": true
     }
   },

package/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
-import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { InitSchema } from './schema';
 export declare function reactInitGenerator(host: Tree, schema: InitSchema): Promise<GeneratorCallback>;
 export default reactInitGenerator;

package/src/generators/init/init.js

@@ -2,20 +2,59 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
+function setDefault(host) {
+    const workspace = (0, devkit_1.readNxJson)(host);
+    workspace.generators = workspace.generators || {};
+    const reactGenerators = workspace.generators['@nx/react'] || {};
+    const generators = {
+        ...workspace.generators,
+        '@nx/react': {
+            ...reactGenerators,
+            application: {
+                ...reactGenerators.application,
+                babel: true,
+            },
+        },
+    };
+    (0, devkit_1.updateNxJson)(host, { ...workspace, generators });
+}
+function updateDependencies(host, schema) {
+    (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react'], []);
+    const dependencies = {
+        react: versions_1.reactVersion,
+        'react-dom': versions_1.reactDomVersion,
+    };
+    if (!schema.skipHelperLibs) {
+        dependencies['tslib'] = versions_1.tsLibVersion;
+    }
+    return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, {
+        '@nx/react': versions_1.nxVersion,
+        '@types/node': versions_1.typesNodeVersion,
+        '@types/react': versions_1.typesReactVersion,
+        '@types/react-dom': versions_1.typesReactDomVersion,
+        '@testing-library/react': versions_1.testingLibraryReactVersion,
+    });
+}
 async function reactInitGenerator(host, schema) {
     const tasks = [];
-    if (!schema.skipPackageJson) {
-        tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react'], []));
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {
-            react: versions_1.reactVersion,
-            'react-dom': versions_1.reactDomVersion,
-        }, {
-            '@nx/react': versions_1.nxVersion,
-        }, undefined, schema.keepExistingVersions));
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
+    setDefault(host);
+    if (!schema.e2eTestRunner || schema.e2eTestRunner === 'cypress') {
+        (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+        const { cypressInitGenerator } = await Promise.resolve().then(() => require('@nx/cypress/src/generators/init/init'));
+        const cypressTask = await cypressInitGenerator(host, {});
+        tasks.push(cypressTask);
     }
-    if (!schema.skipFormat) {
-        await (0, devkit_1.formatFiles)(host);
+    if (!schema.skipPackageJson) {
+        const installTask = updateDependencies(host, schema);
+        tasks.push(installTask);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

@@ -1,5 +1,10 @@
 export interface InitSchema {
+  unitTestRunner?: 'jest' | 'vitest' | 'none';
+  e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;
   skipPackageJson?: boolean;
-  keepExistingVersions?: boolean;
+  skipHelperLibs?: boolean;
+  js?: boolean;
+
+  rootProject?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,11 +1,23 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxReactNgInit",
   "title": "Init React Plugin",
   "description": "Initialize a React Plugin.",
   "cli": "nx",
   "type": "object",
   "properties": {
+    "unitTestRunner": {
+      "description": "Adds the specified unit test runner.",
+      "type": "string",
+      "enum": ["jest", "none"],
+      "default": "jest"
+    },
+    "e2eTestRunner": {
+      "description": "Adds the specified E2E test runner.",
+      "type": "string",
+      "enum": ["cypress", "playwright", "none"],
+      "default": "cypress"
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
@@ -16,11 +28,16 @@
       "type": "boolean",
       "default": false
     },
-    "keepExistingVersions": {
+    "skipHelperLibs": {
+      "description": "Do not install  tslib.",
       "type": "boolean",
-      "x-priority": "internal",
-      "description": "Keep existing dependencies versions",
-      "default": false
+      "default": false,
+      "hidden": true
+    },
+    "js": {
+      "type": "boolean",
+      "default": false,
+      "description": "Use JavaScript instead of TypeScript"
     }
   },
   "required": []

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

@@ -15,17 +15,17 @@ async function addLinting(host, options) {
                 (0, path_1.joinPathFragments)(options.projectRoot, 'tsconfig.lib.json'),
             ],
             unitTestRunner: options.unitTestRunner,
+            eslintFilePatterns: [`${options.projectRoot}/**/*.{ts,tsx,js,jsx}`],
             skipFormat: true,
             skipPackageJson: options.skipPackageJson,
             setParserOptionsProject: options.setParserOptionsProject,
-            addPlugin: options.addPlugin,
         });
         if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
             (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, 'plugin:@nx/react');
         }
         let installTask = () => { };
         if (!options.skipPackageJson) {
-            installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
+            installTask = await (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
         }
         return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
     }

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

@@ -1,4 +1,3 @@
 import { Tree } from 'nx/src/generators/tree';
-import { GeneratorCallback } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
-export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
+export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema): Promise<import("@nx/devkit").GeneratorCallback>;

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

@@ -2,23 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRollupBuildTarget = void 0;
 const devkit_1 = require("@nx/devkit");
-const maybe_js_1 = require("../../../utils/maybe-js");
+const maybe_js_1 = require("./maybe-js");
 const versions_1 = require("../../../utils/versions");
 async function addRollupBuildTarget(host, options) {
-    const tasks = [];
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-    tasks.push(await configurationGenerator(host, {
-        ...options,
-        project: options.name,
-        skipFormat: true,
-    }));
-    if (!options.skipPackageJson) {
-        // These are used in `@nx/react/plugins/bundle-rollup`
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            '@rollup/plugin-url': versions_1.rollupPluginUrlVersion,
-            '@svgr/rollup': versions_1.svgrRollupVersion,
-        }));
-    }
+    const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+    // These are used in `@nx/react/plugins/bundle-rollup`
+    (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+        '@rollup/plugin-url': versions_1.rollupPluginUrlVersion,
+        '@svgr/rollup': versions_1.svgrRollupVersion,
+    });
     const { targets } = (0, devkit_1.readProjectConfiguration)(host, options.name);
     const external = ['react', 'react-dom'];
     if (options.style === '@emotion/styled') {
@@ -54,6 +46,6 @@ async function addRollupBuildTarget(host, options) {
         tags: options.parsedTags,
         targets,
     });
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return rollupInitGenerator(host, { ...options, skipFormat: true });
 }
 exports.addRollupBuildTarget = addRollupBuildTarget;

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

@@ -6,15 +6,7 @@ const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencie
 const versions_1 = require("../../../utils/versions");
 function installCommonDependencies(host, options) {
     const tasks = [];
-    const dependencies = {};
-    const devDependencies = {
-        '@types/node': versions_1.typesNodeVersion,
-        '@types/react': versions_1.typesReactVersion,
-        '@types/react-dom': versions_1.typesReactDomVersion,
-    };
-    if (options.bundler !== 'vite') {
-        dependencies['tslib'] = versions_1.tsLibVersion;
-    }
+    const devDependencies = {};
     // Vite requires style preprocessors to be installed manually.
     // `@nx/webpack` installs them automatically for now.
     // TODO(jack): Once we clean up webpack we can remove this check
@@ -28,10 +20,10 @@ function installCommonDependencies(host, options) {
                 break;
         }
     }
-    if (options.unitTestRunner && options.unitTestRunner !== 'none') {
-        devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
-    }
-    const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, devDependencies);
+    const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
+        react: versions_1.reactVersion,
+        'react-dom': versions_1.reactDomVersion,
+    }, devDependencies);
     tasks.push(baseInstallTask);
     if (options.compiler === 'swc') {
         tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));

package/src/generators/library/lib/maybe-js.d.ts

@@ -0,0 +1,2 @@
+import { NormalizedSchema } from '../schema';
+export declare function maybeJs(options: NormalizedSchema, path: string): string;

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

@@ -13,10 +13,6 @@ async function normalizeOptions(host, options) {
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         callingGenerator: '@nx/react:library',
     });
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPlugin;
     const fileName = options.simpleName
         ? projectNames.projectSimpleName
         : projectNames.projectFileName;
@@ -53,12 +49,11 @@ async function normalizeOptions(host, options) {
         if (appProjectConfig.projectType !== 'application') {
             throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
         }
-        normalized.appMain =
-            appProjectConfig.targets.build?.options?.main ??
-                findMainEntry(host, appProjectConfig.root);
-        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) {
+        try {
+            normalized.appMain = appProjectConfig.targets.build.options.main;
+            normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
+        }
+        catch (e) {
             throw new Error(`Could not locate project main for ${options.appProject}`);
         }
     }
@@ -66,27 +61,3 @@ async function normalizeOptions(host, options) {
     return normalized;
 }
 exports.normalizeOptions = normalizeOptions;
-function findMainEntry(tree, projectRoot) {
-    const mainFiles = [
-        // These are the main files we generate with.
-        'src/main.ts',
-        'src/main.tsx',
-        'src/main.js',
-        'src/main.jsx',
-        // Other options just in case
-        'src/index.ts',
-        'src/index.tsx',
-        'src/index.js',
-        'src/index.jsx',
-        'main.ts',
-        'main.tsx',
-        'main.js',
-        'main.jsx',
-        'index.ts',
-        'index.tsx',
-        'index.js',
-        'index.jsx',
-    ];
-    const mainEntry = mainFiles.find((file) => tree.exists((0, devkit_1.joinPathFragments)(projectRoot, file)));
-    return mainEntry ? (0, devkit_1.joinPathFragments)(projectRoot, mainEntry) : undefined;
-}

package/src/generators/library/lib/update-app-routes.js

@@ -4,7 +4,7 @@ exports.updateAppRoutes = void 0;
 const devkit_1 = require("@nx/devkit");
 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 maybe_js_1 = require("./maybe-js");
 const versions_1 = require("../../../utils/versions");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;

package/src/generators/library/library.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
-const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
-const maybe_js_1 = require("../../utils/maybe-js");
 const component_1 = require("../component/component");
 const init_1 = require("../init/init");
 const jest_utils_1 = require("../../utils/jest-utils");
@@ -19,9 +16,9 @@ const create_files_1 = require("./lib/create-files");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const install_common_dependencies_1 = require("./lib/install-common-dependencies");
 const set_defaults_1 = require("./lib/set-defaults");
+const path_1 = require("path");
 async function libraryGenerator(host, schema) {
     return await libraryGeneratorInternal(host, {
-        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -36,14 +33,11 @@ async function libraryGeneratorInternal(host, schema) {
     if (!options.component) {
         options.style = 'none';
     }
-    const jsInitTask = await (0, js_1.initGenerator)(host, {
-        ...schema,
-        skipFormat: true,
-    });
-    tasks.push(jsInitTask);
     const initTask = await (0, init_1.default)(host, {
         ...options,
+        e2eTestRunner: 'none',
         skipFormat: true,
+        skipHelperLibs: options.bundler === 'vite',
     });
     tasks.push(initTask);
     (0, devkit_1.addProjectConfiguration)(host, options.name, {
@@ -69,7 +63,6 @@ async function libraryGeneratorInternal(host, schema) {
             compiler: options.compiler,
             skipFormat: true,
             testEnvironment: 'jsdom',
-            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -120,11 +113,10 @@ async function libraryGeneratorInternal(host, schema) {
         const vitestTask = await vitestGenerator(host, {
             uiFramework: 'react',
             project: options.name,
-            coverageProvider: 'v8',
+            coverageProvider: 'c8',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             testEnvironment: 'jsdom',
-            addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -169,7 +161,7 @@ async function libraryGeneratorInternal(host, schema) {
         });
     }
     if (!options.skipPackageJson) {
-        const installReactTask = (0, install_common_dependencies_1.installCommonDependencies)(host, options);
+        const installReactTask = await (0, install_common_dependencies_1.installCommonDependencies)(host, options);
         tasks.push(installReactTask);
     }
     const routeTask = (0, update_app_routes_1.updateAppRoutes)(host, options);
@@ -178,15 +170,12 @@ async function libraryGeneratorInternal(host, schema) {
     (0, create_ts_config_1.extractTsConfigBase)(host);
     if (!options.skipTsConfig) {
         (0, js_1.addTsConfigPath)(host, options.importPath, [
-            (0, maybe_js_1.maybeJs)(options, (0, devkit_1.joinPathFragments)(options.projectRoot, './src/index.ts')),
+            (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
         ]);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
-    tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
-    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.libraryGeneratorInternal = libraryGeneratorInternal;

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

@@ -29,7 +29,6 @@ export interface Schema {
   unitTestRunner?: 'jest' | 'vitest' | 'none';
   minimal?: boolean;
   simpleName?: boolean;
-  addPlugin?: boolean;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/library/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactLibrary",
   "title": "Create a React Library",
@@ -50,11 +50,11 @@
           { "value": "css", "label": "CSS" },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com          ]"
+            "label": "SASS(.scss)       [ http://sass-lang.com          ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ https://lesscss.org            ]"
+            "label": "LESS              [ http://lesscss.org            ]"
           },
           {
             "value": "styled-components",

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

@@ -1,7 +1,7 @@
 export interface Schema {
   name: string;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18.
    */
   project?: string;
   directory?: string;

package/src/generators/redux/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "redux",
   "title": "Create Redux state",
@@ -22,7 +22,7 @@
       "$default": {
         "$source": "projectName"
       },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
     },
     "directory": {
       "type": "string",

package/src/generators/remote/files/module-federation/module-federation.config.js__tmpl__

@@ -1,9 +1,6 @@
 module.exports = {
    name: '<%= projectName %>',
-   <% if (dynamic) { %>
-   library: { type: 'var', name: '<%= projectName %>'},
-   <% } %>
    exposes: {
-     './Module': './src/remote-entry.<%= js ? 'js' : 'ts' %>',
+     './Module': './src/remote-entry.ts',
    },
 };

package/src/generators/remote/files/module-federation-ssr/module-federation.server.config.js__tmpl__

@@ -1,6 +1,6 @@
 module.exports = {
     name: '<%= projectName %>',
    exposes: {
-     './Module': '<%= appProjectRoot %>/src/remote-entry.<%= js ? 'js' : 'ts' %>',
+     './Module': '<%= appProjectRoot %>/src/remote-entry.ts',
    },
 };

package/src/generators/remote/files/module-federation-ssr-ts/module-federation.server.config.ts__tmpl__

@@ -3,7 +3,7 @@ import {ModuleFederationConfig} from '@nx/webpack';
 const config: ModuleFederationConfig = {
     name: '<%= projectName %>',
     exposes: {
-        './Module': '<%= appProjectRoot %>/src/remote-entry.<%= js ? 'js' : 'ts' %>',
+        './Module': '<%= appProjectRoot %>/src/remote-entry.ts',
     },
 };
 

package/src/generators/remote/files/module-federation-ts/module-federation.config.ts__tmpl__

@@ -2,11 +2,8 @@ import {ModuleFederationConfig} from '@nx/webpack';
 
 const config: ModuleFederationConfig = {
     name: '<%= projectName %>',
-    <% if (dynamic) { %>
-   library: { type: 'var', name: '<%= projectName %>'},
-   <% } %>
     exposes: {
-        './Module': './src/remote-entry.<%= js ? 'js' : 'ts' %>',
+        './Module': './src/remote-entry.ts',
     },
 };
 

package/src/generators/remote/lib/setup-ssr-for-remote.js

@@ -18,16 +18,12 @@ async function setupSsrForRemote(tree, options, appName) {
     });
     // For hosts to use when running remotes in static mode.
     const originalOutputPath = project.targets.build?.options?.outputPath;
-    const serverOptions = project.targets.server?.options;
-    const serverOutputPath = serverOptions?.outputPath ??
-        (0, devkit_1.joinPathFragments)(originalOutputPath, 'server');
-    const serverOutputName = serverOptions?.outputFileName ?? 'main.js';
     project.targets['serve-static'] = {
         dependsOn: ['build', 'server'],
         executor: 'nx:run-commands',
         defaultConfiguration: 'development',
         options: {
-            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_1.joinPathFragments)(serverOutputPath, serverOutputName)}`,
+            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_1.joinPathFragments)(originalOutputPath, 'server', 'main.js')}`,
         },
     };
     (0, devkit_1.updateProjectConfiguration)(tree, appName, project);

package/src/generators/remote/lib/setup-tspath-for-remote.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupTspathForRemote = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const maybe_js_1 = require("../../../utils/maybe-js");
 function setupTspathForRemote(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-    const exportPath = (0, maybe_js_1.maybeJs)(options, './src/remote-entry.ts');
+    const exportPath = `./src/remote-entry.ts`;
     const exportName = 'Module';
     (0, js_1.addTsConfigPath)(tree, `${options.name}/${exportName}`, [
         (0, devkit_1.joinPathFragments)(project.root, exportPath),