@nx/react 17.0.2 → 17.0.4

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.ts',
+        './Module': '<%= appProjectRoot %>/src/remote-entry.<%= js ? 'js' : 'ts' %>',
     },
 };
 

package/src/generators/remote/files/module-federation-ssr-ts/tsconfig.lint.json__tmpl__

@@ -0,0 +1,19 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": [
+        "node",
+        "@nx/react/typings/cssmodule.d.ts",
+        "@nx/react/typings/image.d.ts"
+    ]
+  },
+  "include": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "webpack.config.ts",
+    "webpack.prod.config.ts"
+  ]
+}

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

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

package/src/generators/remote/files/module-federation-ts/tsconfig.lint.json__tmpl__

@@ -0,0 +1,19 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": [
+        "node",
+        "@nx/react/typings/cssmodule.d.ts",
+        "@nx/react/typings/image.d.ts"
+    ]
+  },
+  "include": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "webpack.config.ts",
+    "webpack.prod.config.ts"
+  ]
+}

package/src/generators/remote/lib/add-remote-to-dynamic-host.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function addRemoteToDynamicHost(tree: Tree, remoteName: string, remotePort: number, pathToMfManifest: string): void;

package/src/generators/remote/lib/add-remote-to-dynamic-host.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addRemoteToDynamicHost = void 0;
+function addRemoteToDynamicHost(tree, remoteName, remotePort, pathToMfManifest) {
+    const current = tree.read(pathToMfManifest, 'utf8');
+    tree.write(pathToMfManifest, JSON.stringify({
+        ...JSON.parse(current),
+        [remoteName]: `http://localhost:${remotePort}`,
+    }));
+}
+exports.addRemoteToDynamicHost = addRemoteToDynamicHost;

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

@@ -18,12 +18,16 @@ 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)(originalOutputPath, 'server', 'main.js')}`,
+            command: `PORT=${options.devServerPort ?? 4200} node ${(0, devkit_1.joinPathFragments)(serverOutputPath, serverOutputName)}`,
         },
     };
     (0, devkit_1.updateProjectConfiguration)(tree, appName, project);

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

@@ -3,9 +3,10 @@ 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 = `./src/remote-entry.ts`;
+    const exportPath = (0, maybe_js_1.maybeJs)(options, './src/remote-entry.ts');
     const exportName = 'Module';
     (0, js_1.addTsConfigPath)(tree, `${options.name}/${exportName}`, [
         (0, devkit_1.joinPathFragments)(project.root, exportPath),

package/src/generators/remote/lib/update-host-with-remote.js

@@ -46,7 +46,16 @@ function updateHostWithRemote(host, hostName, remoteName) {
 }
 exports.updateHostWithRemote = updateHostWithRemote;
 function findAppComponentPath(host, sourceRoot) {
-    const locations = ['app/app.tsx', 'app/App.tsx', 'app.tsx', 'App.tsx'];
+    const locations = [
+        'app/app.tsx',
+        'app/App.tsx',
+        'app/app.js',
+        'app/App.js',
+        'app.tsx',
+        'App.tsx',
+        'app.js',
+        'App.js',
+    ];
     for (const loc of locations) {
         if (host.exists((0, devkit_1.joinPathFragments)(sourceRoot, loc))) {
             return (0, devkit_1.joinPathFragments)(sourceRoot, loc);

package/src/generators/remote/remote.js

@@ -10,12 +10,16 @@ const update_module_federation_project_1 = require("../../rules/update-module-fe
 const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_ssr_for_remote_1 = require("./lib/setup-ssr-for-remote");
 const setup_tspath_for_remote_1 = require("./lib/setup-tspath-for-remote");
+const add_remote_to_dynamic_host_1 = require("./lib/add-remote-to-dynamic-host");
+const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
+const maybe_js_1 = require("../../utils/maybe-js");
 function addModuleFederationFiles(host, options) {
     const templateVariables = {
         ...(0, devkit_1.names)(options.name),
         ...options,
         tmpl: '',
     };
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, `./files/${options.js ? 'common' : 'common-ts'}`), options.appProjectRoot, templateVariables);
     const pathToModuleFederationFiles = options.typescriptConfiguration
         ? 'module-federation-ts'
         : 'module-federation';
@@ -43,7 +47,14 @@ async function remoteGeneratorInternal(host, schema) {
     const tasks = [];
     const options = {
         ...(await (0, normalize_options_1.normalizeOptions)(host, schema, '@nx/react:remote')),
-        typescriptConfiguration: schema.typescriptConfiguration ?? false,
+        // when js is set to true, we want to use the js configuration
+        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 initAppTask = await (0, application_1.default)(host, {
         ...options,
@@ -58,7 +69,7 @@ async function remoteGeneratorInternal(host, schema) {
     // 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'));
+    host.rename((0, path_1.join)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, 'src/main.tsx')), (0, path_1.join)(options.appProjectRoot, (0, maybe_js_1.maybeJs)(options, 'src/bootstrap.tsx')));
     addModuleFederationFiles(host, options);
     (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
     (0, setup_tspath_for_remote_1.setupTspathForRemote)(host, options);
@@ -75,6 +86,15 @@ async function remoteGeneratorInternal(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'));
+    }
+    if (options.host && options.dynamic) {
+        const hostConfig = (0, devkit_1.readProjectConfiguration)(host, schema.host);
+        const pathToMFManifest = (0, devkit_1.joinPathFragments)(hostConfig.sourceRoot, 'assets/module-federation.manifest.json');
+        (0, add_remote_to_dynamic_host_1.addRemoteToDynamicHost)(host, options.name, options.devServerPort, pathToMFManifest);
+    }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/remote/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';
 import type { NormalizedSchema as ApplicationNormalizedSchema } from '../application/schema';
 
 export interface Schema {
@@ -9,7 +9,7 @@ export interface Schema {
   devServerPort?: number;
   directory?: string;
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
-  e2eTestRunner: 'cypress' | 'none';
+  e2eTestRunner: 'cypress' | 'playwright' | 'none';
   globalCss?: boolean;
   host?: string;
   js?: boolean;
@@ -26,6 +26,7 @@ export interface Schema {
   tags?: string;
   unitTestRunner: 'jest' | 'vitest' | 'none';
   typescriptConfiguration?: boolean;
+  dynamic?: boolean;
 }
 
 export interface NormalizedSchema extends ApplicationNormalizedSchema {

package/src/generators/remote/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorReactRemote",
   "cli": "nx",
   "title": "Generate Module Federation Setup for React Remote App",
@@ -28,6 +28,12 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
+    "dynamic": {
+      "type": "boolean",
+      "description": "Should the host application use dynamic federation?",
+      "default": false,
+      "x-priority": "internal"
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
@@ -43,11 +49,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",
@@ -99,8 +109,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": {
@@ -163,7 +174,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/setup-ssr/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorReactSSRSetup",
   "cli": "nx",
   "title": "Generate SSR setup for a React app",

package/src/generators/setup-ssr/setup-ssr.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const init_1 = require("../init/init");
 const versions_1 = require("../../utils/versions");
 const ast_utils_1 = require("../../utils/ast-utils");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
@@ -18,9 +17,22 @@ function readEntryFile(host, path) {
         source: tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true),
     };
 }
+async function getProjectConfig(tree, projectName) {
+    let maybeProjectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+    if (!maybeProjectConfig.targets?.build) {
+        let projectGraph;
+        try {
+            projectGraph = (0, devkit_1.readCachedProjectGraph)();
+        }
+        catch {
+            projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+        }
+        maybeProjectConfig = projectGraph.nodes[projectName].data;
+    }
+    return maybeProjectConfig;
+}
 async function setupSsrGenerator(tree, options) {
-    await (0, init_1.default)(tree, { skipFormat: true });
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const projectConfig = await getProjectConfig(tree, options.project);
     const projectRoot = projectConfig.root;
     const appImportCandidates = [
         options.appComponentImportPath ?? 'app/app',
@@ -44,11 +56,15 @@ async function setupSsrGenerator(tree, options) {
     if (projectConfig.targets.server) {
         throw new Error(`Project ${options.project} already has a server target.`);
     }
-    const originalOutputPath = projectConfig.targets.build?.options?.outputPath;
+    const originalOutputPath = projectConfig.targets.build?.options?.outputPath ??
+        projectConfig.targets.build?.outputs[0];
     if (!originalOutputPath) {
         throw new Error(`Project ${options.project} does not contain a outputPath for the build target.`);
     }
-    projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
+    // TODO(colum): We need to figure out how to handle this for Crystal
+    if (projectConfig.targets.build.options?.outputPath) {
+        projectConfig.targets.build.options.outputPath = (0, devkit_1.joinPathFragments)(originalOutputPath, 'browser');
+    }
     projectConfig.targets = {
         ...projectConfig.targets,
         server: {
@@ -65,7 +81,6 @@ async function setupSsrGenerator(tree, options) {
                 compiler: 'babel',
                 externalDependencies: 'all',
                 outputHashing: 'none',
-                isolatedConfig: true,
                 webpackConfig: (0, devkit_1.joinPathFragments)(projectRoot, 'webpack.config.js'),
             },
             configurations: {
@@ -139,7 +154,8 @@ async function setupSsrGenerator(tree, options) {
             ? `"${options.extraInclude.join('", "')}",`
             : '',
         appComponentImport: appComponentInfo.importPath,
-        browserBuildOutputPath: projectConfig.targets.build.options.outputPath,
+        browserBuildOutputPath: projectConfig.targets.build?.options?.outputPath ??
+            projectConfig.targets.build?.outputs[0],
     });
     // Add <StaticRouter> to server main if needed.
     // TODO: need to read main.server.tsx not main.tsx.

package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js

@@ -11,6 +11,9 @@ const knownLocations = [
     'pages/styles.css',
     'pages/styles.scss',
     'pages/styles.less',
+    'app/global.css',
+    'app/global.scss',
+    'app/global.less',
 ];
 function addTailwindStyleImports(tree, project, _options) {
     const candidates = knownLocations.map((x) => (0, devkit_1.joinPathFragments)(project.root, x));

package/src/generators/setup-tailwind/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactTailwindSetupGenerator",
   "title": "Configures Tailwind CSS for an application or a buildable/publishable library.",

package/src/generators/stories/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactStorybookStories",
   "title": "Generate React Storybook stories",

package/src/generators/stories/stories.js

@@ -6,16 +6,15 @@ const component_cypress_spec_1 = require("../component-cypress-spec/component-cy
 const ast_utils_1 = require("../../utils/ast-utils");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const versions_1 = require("../../utils/versions");
 let tsModule;
 async function projectRootPath(tree, config) {
-    const { findStorybookAndBuildTargetsAndCompiler } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
     let projectDir;
     if (config.projectType === 'application') {
-        const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
-        if (!!nextBuildTarget) {
+        const isNextJs = await isNextJsProject(tree, config);
+        if (isNextJs) {
             // Next.js apps
             projectDir = 'components';
         }
@@ -53,7 +52,7 @@ async function createAllStories(tree, projectName, interactionTests, js, project
         // Ignore private files starting with "_".
         if ((0, path_1.basename)(path).startsWith('_'))
             return;
-        if (ignorePaths?.some((pattern) => minimatch(path, pattern)))
+        if (ignorePaths?.some((pattern) => (0, minimatch_1.minimatch)(path, pattern)))
             return;
         if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
             (path.endsWith('.js') && !path.endsWith('.spec.js')) ||
@@ -115,4 +114,17 @@ async function storiesGenerator(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.storiesGenerator = storiesGenerator;
+async function isNextJsProject(tree, config) {
+    const { findStorybookAndBuildTargetsAndCompiler } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
+    const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(config.targets);
+    if (nextBuildTarget) {
+        return true;
+    }
+    for (const configFile of ['next.config.js', 'next.config.ts']) {
+        if (tree.exists((0, path_1.join)(config.root, configFile))) {
+            return true;
+        }
+    }
+    return false;
+}
 exports.default = storiesGenerator;

package/src/generators/storybook-configuration/configuration.d.ts

@@ -1,4 +1,6 @@
 import { StorybookConfigureSchema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function storybookConfigurationGeneratorInternal(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default storybookConfigurationGenerator;
+export declare function findWebpackConfig(tree: Tree, projectRoot: string): string | undefined;

package/src/generators/storybook-configuration/configuration.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storybookConfigurationGenerator = void 0;
+exports.findWebpackConfig = exports.storybookConfigurationGeneratorInternal = exports.storybookConfigurationGenerator = void 0;
 const stories_1 = require("../stories/stories");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 async function generateStories(host, schema) {
-    // TODO(katerina): Nx 18 -> remove Cypress
+    // TODO(katerina): Nx 19 -> remove Cypress
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const { getE2eProjectName } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/project-name'));
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
-    const cypressProject = getE2eProjectName(schema.name, projectConfig.root, schema.cypressDirectory);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
+    const cypressProject = getE2eProjectName(schema.project, projectConfig.root, schema.cypressDirectory);
     await (0, stories_1.default)(host, {
-        project: schema.name,
+        project: schema.project,
         generateCypressSpecs: schema.configureCypress && schema.generateCypressSpecs,
         js: schema.js,
         cypressProject,
@@ -20,27 +20,39 @@ async function generateStories(host, schema) {
         interactionTests: schema.interactionTests ?? true,
     });
 }
-async function storybookConfigurationGenerator(host, schema) {
+function storybookConfigurationGenerator(host, schema) {
+    return storybookConfigurationGeneratorInternal(host, {
+        addPlugin: false,
+        ...schema,
+    });
+}
+exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
+async function storybookConfigurationGeneratorInternal(host, schema) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    schema.addPlugin ??= addPluginDefault;
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
     let uiFramework = '@storybook/react-vite';
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.name);
-    if (projectConfig.targets['build']?.executor === '@nx/webpack:webpack' ||
-        projectConfig.targets['build']?.executor === '@nrwl/webpack:webpack' ||
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
+    if (findWebpackConfig(host, projectConfig.root) ||
         projectConfig.targets['build']?.executor === '@nx/rollup:rollup' ||
-        projectConfig.targets['build']?.executor === '@nrwl/rollup:rollup') {
+        projectConfig.targets['build']?.executor === '@nrwl/rollup:rollup' ||
+        projectConfig.targets['build']?.executor === '@nx/expo:build') {
         uiFramework = '@storybook/react-webpack5';
     }
     const installTask = await configurationGenerator(host, {
-        name: schema.name,
+        project: schema.project,
         configureCypress: schema.configureCypress,
         js: schema.js,
         linter: schema.linter,
         cypressDirectory: schema.cypressDirectory,
-        tsConfiguration: schema.tsConfiguration ?? true,
-        interactionTests: schema.interactionTests ?? true,
+        tsConfiguration: schema.tsConfiguration ?? true, // default is true
+        interactionTests: schema.interactionTests ?? true, // default is true
         configureStaticServe: schema.configureStaticServe,
-        uiFramework: uiFramework,
+        uiFramework: uiFramework, // cannot import UiFramework type dynamically
         skipFormat: true,
+        addPlugin: schema.addPlugin,
     });
     if (schema.generateStories) {
         await generateStories(host, schema);
@@ -48,5 +60,15 @@ async function storybookConfigurationGenerator(host, schema) {
     await (0, devkit_1.formatFiles)(host);
     return installTask;
 }
-exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
+exports.storybookConfigurationGeneratorInternal = storybookConfigurationGeneratorInternal;
 exports.default = storybookConfigurationGenerator;
+function findWebpackConfig(tree, projectRoot) {
+    const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];
+    for (const ext of allowsExt) {
+        const webpackConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, `webpack.config.${ext}`);
+        if (tree.exists(webpackConfigPath)) {
+            return webpackConfigPath;
+        }
+    }
+}
+exports.findWebpackConfig = findWebpackConfig;

package/src/generators/storybook-configuration/schema.d.ts

@@ -1,7 +1,7 @@
 import { Linter } from '@nx/eslint';
 
 export interface StorybookConfigureSchema {
-  name: string;
+  project: string;
   interactionTests?: boolean;
   generateStories?: boolean;
   js?: boolean;
@@ -12,4 +12,5 @@ export interface StorybookConfigureSchema {
   configureCypress?: boolean;
   generateCypressSpecs?: boolean;
   cypressDirectory?: string;
+  addPlugin?: boolean;
 }

package/src/generators/storybook-configuration/schema.json

@@ -1,14 +1,14 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactStorybookConfigure",
   "title": "React Storybook Configure",
   "description": "Set up Storybook for a React app or library.",
   "type": "object",
   "properties": {
-    "name": {
+    "project": {
       "type": "string",
-      "aliases": ["project", "projectName"],
+      "aliases": ["name", "projectName"],
       "description": "Project for which to generate Storybook configuration.",
       "$default": {
         "$source": "argv",
@@ -29,7 +29,7 @@
     "configureCypress": {
       "type": "boolean",
       "description": "Run the cypress-configure generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "generateStories": {
       "type": "boolean",
@@ -41,7 +41,7 @@
     "generateCypressSpecs": {
       "type": "boolean",
       "description": "Automatically generate test files in the Cypress E2E app generated by the `cypress-configure` generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "configureStaticServe": {
       "type": "boolean",
@@ -53,7 +53,7 @@
     "cypressDirectory": {
       "type": "string",
       "description": "A directory where the Cypress project will be placed. Placed at the root by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v18."
+      "x-deprecated": "Use interactionTests instead. This option will be removed in v19."
     },
     "js": {
       "type": "boolean",
@@ -90,6 +90,6 @@
       ]
     }
   },
-  "required": ["name"],
+  "required": ["project"],
   "examplesFile": "../../../docs/storybook-configuration-examples.md"
 }

package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
+async function default_1(tree) {
+    if (!hasModuleFederationProject(tree)) {
+        return;
+    }
+    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;
+function hasModuleFederationProject(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const project of projects.values()) {
+        const targets = project.targets || {};
+        for (const [_, target] of Object.entries(targets)) {
+            if (target.executor === '@nx/webpack:webpack' &&
+                (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.ts')) ||
+                    tree.exists((0, devkit_1.joinPathFragments)(project.root, 'module-federation.config.js')))) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

package/src/migrations/update-18-1-1/fix-target-defaults-inputs.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;