@nx/react 17.0.3 → 17.0.5

package/src/generators/host/files/module-federation-ts/webpack.config.prod.ts__tmpl__

@@ -1,10 +1,11 @@
 import { composePlugins, withNx } from '@nx/webpack';
 import { withReact } from '@nx/react';
 import { withModuleFederation } from '@nx/react/module-federation';
+import { ModuleFederationConfig } from '@nx/webpack';
 
 import baseConfig from './module-federation.config';
 
-const prodConfig = {
+const prodConfig: ModuleFederationConfig = {
     ...baseConfig,
     /*
      * Remote overrides for production.

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

@@ -1,10 +1,10 @@
-import {composePlugins, withNx} from '@nx/webpack';
+import {composePlugins, withNx, ModuleFederationConfig} from '@nx/webpack';
 import {withReact} from '@nx/react';
 import {withModuleFederation} from '@nx/react/module-federation';
 
 import baseConfig from './module-federation.config';
 
-const config = {
+const config: ModuleFederationConfig = {
     ...baseConfig,
 };
 

package/src/generators/host/host.js

@@ -11,6 +11,7 @@ const add_module_federation_files_1 = require("./lib/add-module-federation-files
 const normalize_remote_1 = require("./lib/normalize-remote");
 const setup_ssr_for_host_1 = require("./lib/setup-ssr-for-host");
 const update_module_federation_e2e_project_1 = require("./lib/update-module-federation-e2e-project");
+const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 async function hostGenerator(host, schema) {
     return hostGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -22,7 +23,13 @@ async function hostGeneratorInternal(host, schema) {
     const tasks = [];
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:host')),
-        typescriptConfiguration: schema.typescriptConfiguration ?? true,
+        js: schema.js ?? false,
+        typescriptConfiguration: schema.js
+            ? false
+            : schema.typescriptConfiguration ?? true,
+        dynamic: schema.dynamic ?? false,
+        // TODO(colum): remove when MF works with Crystal
+        addPlugin: false,
     };
     const initTask = await (0, application_1.default)(host, {
         ...options,
@@ -51,6 +58,9 @@ async function hostGeneratorInternal(host, schema) {
                 skipFormat: true,
                 projectNameAndRootFormat: options.projectNameAndRootFormat,
                 typescriptConfiguration: options.typescriptConfiguration,
+                js: options.js,
+                dynamic: options.dynamic,
+                host: options.name,
             });
             tasks.push(remoteTask);
             remotePort++;
@@ -72,6 +82,10 @@ async function hostGeneratorInternal(host, schema) {
         projectConfig.targets.server.options.webpackConfig = (0, devkit_1.joinPathFragments)(projectConfig.root, `webpack.server.config.${options.typescriptConfiguration ? 'ts' : 'js'}`);
         (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfig);
     }
+    if (!options.setParserOptionsProject) {
+        host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.lint.json'));
+    }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/host/lib/add-module-federation-files.d.ts

@@ -1,5 +1,6 @@
+import { Tree } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
-export declare function addModuleFederationFiles(host: any, options: NormalizedSchema, defaultRemoteManifest: {
+export declare function addModuleFederationFiles(host: Tree, options: NormalizedSchema, defaultRemoteManifest: {
     name: string;
     port: number;
 }[]): void;

package/src/generators/host/lib/add-module-federation-files.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
+const maybe_js_1 = require("../../../utils/maybe-js");
 function addModuleFederationFiles(host, options, defaultRemoteManifest) {
     const templateVariables = {
         ...(0, devkit_1.names)(options.name),
         ...options,
+        static: !options?.dynamic,
         tmpl: '',
         remotes: defaultRemoteManifest.map(({ name, port }) => {
             return {
@@ -15,24 +16,36 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
             };
         }),
     };
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.name);
+    const pathToMFManifest = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'assets/module-federation.manifest.json');
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in
     // new entry file.
-    host.rename((0, path_1.join)(options.appProjectRoot, 'src/main.tsx'), (0, path_1.join)(options.appProjectRoot, 'src/bootstrap.tsx'));
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `../files/common`), options.appProjectRoot, templateVariables);
+    host.rename((0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, 'src/main.tsx')), (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, 'src/bootstrap.tsx')));
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, `../files/${options.js ? 'common' : 'common-ts'}`), options.appProjectRoot, templateVariables);
     const pathToModuleFederationFiles = options.typescriptConfiguration
         ? 'module-federation-ts'
         : 'module-federation';
     // New entry file is created here.
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `../files/${pathToModuleFederationFiles}`), options.appProjectRoot, templateVariables);
-    if (options.typescriptConfiguration) {
-        const pathToWebpackConfig = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js');
-        const pathToWebpackProdConfig = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.prod.js');
-        if (host.exists(pathToWebpackConfig)) {
-            host.delete(pathToWebpackConfig);
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationFiles}`), options.appProjectRoot, templateVariables);
+    function deleteFileIfExists(host, filePath) {
+        if (host.exists(filePath)) {
+            host.delete(filePath);
         }
-        if (host.exists(pathToWebpackProdConfig)) {
-            host.delete(pathToWebpackProdConfig);
+    }
+    function processWebpackConfig(options, host, fileName) {
+        const pathToWebpackConfig = (0, devkit_1.joinPathFragments)(options.appProjectRoot, fileName);
+        deleteFileIfExists(host, pathToWebpackConfig);
+    }
+    if (options.typescriptConfiguration) {
+        processWebpackConfig(options, host, 'webpack.config.js');
+        processWebpackConfig(options, host, 'webpack.config.prod.js');
+    }
+    if (options.dynamic) {
+        processWebpackConfig(options, host, 'webpack.config.prod.js');
+        processWebpackConfig(options, host, 'webpack.config.prod.ts');
+        if (!host.exists(pathToMFManifest)) {
+            host.write(pathToMFManifest, '{}');
         }
     }
 }

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

@@ -13,6 +13,7 @@ async function setupSsrForHost(tree, options, appName, defaultRemoteManifest) {
         : 'module-federation-ssr';
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, `../files/${pathToModuleFederationSsrFiles}`), project.root, {
         ...options,
+        static: !options?.dynamic,
         remotes: defaultRemoteManifest.map(({ name, port }) => {
             return {
                 ...(0, devkit_1.names)(name),

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

@@ -5,11 +5,13 @@ const devkit_1 = require("@nx/devkit");
 function updateModuleFederationE2eProject(host, options) {
     try {
         let projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.e2eProjectName);
-        projectConfig.targets.e2e.options = {
-            ...projectConfig.targets.e2e.options,
-            baseUrl: `http://localhost:${options.devServerPort}`,
-        };
-        (0, devkit_1.updateProjectConfiguration)(host, options.e2eProjectName, projectConfig);
+        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);
+        }
     }
     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';
+import type { SupportedStyles } from '../../../typings/style';
 
 export interface Schema {
   classComponent?: boolean;
@@ -8,7 +8,7 @@ export interface Schema {
   devServerPort?: number;
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  e2eTestRunner: 'cypress' | 'none';
+  e2eTestRunner: 'cypress' | 'playwright' | 'none';
   globalCss?: boolean;
   js?: boolean;
   linter: Linter;
@@ -25,10 +25,13 @@ 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": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorReactHost",
   "cli": "nx",
   "title": "Generate Module Federation Setup for React Host App",
@@ -43,11 +43,15 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ http://sass-lang.com                     ]"
+            "label": "SASS(.scss)       [ https://sass-lang.com                     ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ http://lesscss.org                       ]"
+            "label": "LESS              [ https://lesscss.org                       ]"
+          },
+          {
+            "value": "tailwind",
+            "label": "tailwind [ https://tailwindcss.com/            ]"
           },
           {
             "value": "styled-components",
@@ -74,6 +78,11 @@
       "enum": ["eslint"],
       "default": "eslint"
     },
+    "dynamic": {
+      "type": "boolean",
+      "description": "Should the host application use dynamic federation?",
+      "default": false
+    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
@@ -94,8 +103,9 @@
     },
     "e2eTestRunner": {
       "type": "string",
-      "enum": ["cypress", "none"],
-      "description": "Test runner to use for end to end (e2e) tests.",
+      "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?",
       "default": "cypress"
     },
     "tags": {
@@ -165,7 +175,7 @@
     },
     "typescriptConfiguration": {
       "type": "boolean",
-      "description": "Whether the module federation configuration and webpack configuration files should use TS.",
+      "description": "Whether the module federation configuration and webpack configuration files should use TS. When --js is used, this flag is ignored.",
       "default": true
     }
   },

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

@@ -1,4 +1,4 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { type GeneratorCallback, type 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,59 +2,20 @@
 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 = [];
-    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.skipPackageJson) {
-        const installTask = updateDependencies(host, schema);
-        tasks.push(installTask);
+        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));
+    }
+    if (!schema.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

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

package/src/generators/init/schema.json

@@ -1,23 +1,11 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://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",
@@ -28,16 +16,11 @@
       "type": "boolean",
       "default": false
     },
-    "skipHelperLibs": {
-      "description": "Do not install  tslib.",
+    "keepExistingVersions": {
       "type": "boolean",
-      "default": false,
-      "hidden": true
-    },
-    "js": {
-      "type": "boolean",
-      "default": false,
-      "description": "Use JavaScript instead of TypeScript"
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
   },
   "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 = await (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
+            installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
         }
         return (0, devkit_1.runTasksInSerial)(lintTask, installTask);
     }

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

@@ -1,3 +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): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function addRollupBuildTarget(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

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

@@ -2,15 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRollupBuildTarget = void 0;
 const devkit_1 = require("@nx/devkit");
-const maybe_js_1 = require("./maybe-js");
+const maybe_js_1 = require("../../../utils/maybe-js");
 const versions_1 = require("../../../utils/versions");
 async function addRollupBuildTarget(host, options) {
-    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 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 { targets } = (0, devkit_1.readProjectConfiguration)(host, options.name);
     const external = ['react', 'react-dom'];
     if (options.style === '@emotion/styled') {
@@ -46,6 +54,6 @@ async function addRollupBuildTarget(host, options) {
         tags: options.parsedTags,
         targets,
     });
-    return rollupInitGenerator(host, { ...options, skipFormat: true });
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.addRollupBuildTarget = addRollupBuildTarget;

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

@@ -6,7 +6,15 @@ 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 devDependencies = {};
+    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;
+    }
     // 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
@@ -20,10 +28,10 @@ function installCommonDependencies(host, options) {
                 break;
         }
     }
-    const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, {
-        react: versions_1.reactVersion,
-        'react-dom': versions_1.reactDomVersion,
-    }, devDependencies);
+    if (options.unitTestRunner && options.unitTestRunner !== 'none') {
+        devDependencies['@testing-library/react'] = versions_1.testingLibraryReactVersion;
+    }
+    const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, devDependencies);
     tasks.push(baseInstallTask);
     if (options.compiler === 'swc') {
         tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));

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

@@ -13,6 +13,10 @@ 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;
@@ -49,11 +53,12 @@ async function normalizeOptions(host, options) {
         if (appProjectConfig.projectType !== 'application') {
             throw new Error(`appProject expected type of "application" but got "${appProjectConfig.projectType}"`);
         }
-        try {
-            normalized.appMain = appProjectConfig.targets.build.options.main;
-            normalized.appSourceRoot = (0, devkit_1.normalizePath)(appProjectConfig.sourceRoot);
-        }
-        catch (e) {
+        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) {
             throw new Error(`Could not locate project main for ${options.appProject}`);
         }
     }
@@ -61,3 +66,27 @@ 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("./maybe-js");
+const maybe_js_1 = require("../../../utils/maybe-js");
 const versions_1 = require("../../../utils/versions");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;

package/src/generators/library/library.js

@@ -1,10 +1,13 @@
 "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");
@@ -16,9 +19,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,
     });
@@ -33,11 +36,14 @@ 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, {
@@ -63,6 +69,7 @@ async function libraryGeneratorInternal(host, schema) {
             compiler: options.compiler,
             skipFormat: true,
             testEnvironment: 'jsdom',
+            addPlugin: options.addPlugin,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -113,10 +120,11 @@ async function libraryGeneratorInternal(host, schema) {
         const vitestTask = await vitestGenerator(host, {
             uiFramework: 'react',
             project: options.name,
-            coverageProvider: 'c8',
+            coverageProvider: 'v8',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             testEnvironment: 'jsdom',
+            addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
         createOrEditViteConfig(host, {
@@ -161,7 +169,7 @@ async function libraryGeneratorInternal(host, schema) {
         });
     }
     if (!options.skipPackageJson) {
-        const installReactTask = await (0, install_common_dependencies_1.installCommonDependencies)(host, options);
+        const installReactTask = (0, install_common_dependencies_1.installCommonDependencies)(host, options);
         tasks.push(installReactTask);
     }
     const routeTask = (0, update_app_routes_1.updateAppRoutes)(host, options);
@@ -170,12 +178,15 @@ async function libraryGeneratorInternal(host, schema) {
     (0, create_ts_config_1.extractTsConfigBase)(host);
     if (!options.skipTsConfig) {
         (0, js_1.addTsConfigPath)(host, options.importPath, [
-            (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
+            (0, maybe_js_1.maybeJs)(options, (0, devkit_1.joinPathFragments)(options.projectRoot, './src/index.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;