@nx/react 19.6.0-rc.0 → 19.6.1

package/migrations.json

@@ -53,6 +53,12 @@
       "version": "19.6.0-beta.4",
       "description": "Update the server file for Module Federation SSR port value to be the same as the 'serve' target port value.",
       "factory": "./src/migrations/update-19-6-0/update-ssr-server-port"
+    },
+    "update-19-6-1-ensure-module-federation-target-defaults": {
+      "cli": "nx",
+      "version": "19.6.1-beta.0",
+      "description": "Ensure Target Defaults are set correctly for Module Federation.",
+      "factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "19.6.0-rc.0",
+  "version": "19.6.1",
   "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": {
@@ -39,11 +39,11 @@
     "minimatch": "9.0.3",
     "tslib": "^2.3.0",
     "@module-federation/enhanced": "~0.2.3",
-    "@nx/devkit": "19.6.0-rc.0",
-    "@nx/js": "19.6.0-rc.0",
-    "@nx/eslint": "19.6.0-rc.0",
-    "@nx/web": "19.6.0-rc.0",
-    "@nrwl/react": "19.6.0-rc.0"
+    "@nx/devkit": "19.6.1",
+    "@nx/js": "19.6.1",
+    "@nx/eslint": "19.6.1",
+    "@nx/web": "19.6.1",
+    "@nrwl/react": "19.6.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/library/library.js

@@ -137,7 +137,11 @@ async function libraryGeneratorInternal(host, schema) {
                 "'react-dom'",
                 "'react/jsx-runtime'",
             ],
-            imports: [`import react from '@vitejs/plugin-react'`],
+            imports: [
+                options.compiler === 'swc'
+                    ? `import react from '@vitejs/plugin-react-swc'`
+                    : `import react from '@vitejs/plugin-react'`,
+            ],
             plugins: ['react()'],
         }, true);
     }

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

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

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

@@ -29,6 +29,7 @@ function storybookConfigurationGenerator(host, schema) {
     });
 }
 async function storybookConfigurationGeneratorInternal(host, schema) {
+    const tasks = [];
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
@@ -42,6 +43,9 @@ async function storybookConfigurationGeneratorInternal(host, schema) {
         projectConfig.targets['build']?.executor === '@nx/expo:build') {
         uiFramework = '@storybook/react-webpack5';
     }
+    if (uiFramework === '@storybook/react-vite') {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@vitejs/plugin-react': versions_1.reactViteVersion }));
+    }
     const installTask = await configurationGenerator(host, {
         project: schema.project,
         configureCypress: schema.configureCypress,
@@ -55,11 +59,12 @@ async function storybookConfigurationGeneratorInternal(host, schema) {
         skipFormat: true,
         addPlugin: schema.addPlugin,
     });
+    tasks.push(installTask);
     if (schema.generateStories) {
         await generateStories(host, schema);
     }
     await (0, devkit_1.formatFiles)(host);
-    return installTask;
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.default = storybookConfigurationGenerator;
 function findWebpackConfig(tree, projectRoot) {

package/src/migrations/update-19-6-1/ensure-depends-on-for-mf.d.ts

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

package/src/migrations/update-19-6-1/ensure-depends-on-for-mf.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+async function default_1(tree) {
+    let usesModuleFederation = false;
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (options, projectName, targetName) => {
+        const webpackConfig = options.webpackConfig;
+        if (!webpackConfig) {
+            return;
+        }
+        const webpackContents = tree.read(webpackConfig, 'utf-8');
+        if (['withModuleFederation', 'withModuleFederationForSSR'].some((p) => webpackContents.includes(p))) {
+            usesModuleFederation = true;
+        }
+    });
+    if (!usesModuleFederation) {
+        return;
+    }
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxMFDevRemotesEnvVar = 'NX_MF_DEV_REMOTES';
+    if (!nxJson.targetDefaults ||
+        !nxJson.targetDefaults?.['@nx/webpack:webpack']) {
+        nxJson.targetDefaults ??= {};
+        nxJson.targetDefaults['@nx/webpack:webpack'] = {
+            cache: true,
+            inputs: ['production', '^production', { env: nxMFDevRemotesEnvVar }],
+            dependsOn: ['^build'],
+        };
+    }
+    else {
+        nxJson.targetDefaults['@nx/webpack:webpack'].dependsOn ??= [];
+        if (!nxJson.targetDefaults['@nx/webpack:webpack'].dependsOn.includes('^build')) {
+            nxJson.targetDefaults['@nx/webpack:webpack'].dependsOn.push('^build');
+        }
+        nxJson.targetDefaults['@nx/webpack:webpack'].inputs ??= [];
+        if (!nxJson.targetDefaults['@nx/webpack:webpack'].inputs.find((i) => typeof i === 'string' ? false : i['env'] === nxMFDevRemotesEnvVar)) {
+            nxJson.targetDefaults['@nx/webpack:webpack'].inputs.push({
+                env: nxMFDevRemotesEnvVar,
+            });
+        }
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/utils/add-mf-env-to-inputs.js

@@ -12,6 +12,7 @@ function addMfEnvToTargetDefaultInputs(tree) {
         'production',
         '^production',
     ];
+    nxJson.targetDefaults[webpackExecutor].dependsOn ??= ['^build'];
     let mfEnvVarExists = false;
     for (const input of nxJson.targetDefaults[webpackExecutor].inputs) {
         if (typeof input === 'object' && input['env'] === mfEnvVar) {

package/src/utils/versions.d.ts

@@ -8,6 +8,7 @@ export declare const babelLoaderVersion = "^9.1.2";
 export declare const typesReactVersion = "18.3.1";
 export declare const typesReactDomVersion = "18.3.0";
 export declare const typesReactIsVersion = "18.3.0";
+export declare const reactViteVersion = "^4.2.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const babelPresetReactVersion = "^7.14.5";
 export declare const babelCoreVersion = "^7.14.5";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swcPluginStyledComponentsVersion = exports.swcPluginEmotionVersion = exports.swcPluginStyledJsxVersion = exports.svgrRollupVersion = exports.rollupPluginUrlVersion = exports.sassVersion = exports.lessVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.typesCorsVersion = exports.corsVersion = exports.isbotVersion = exports.typesExpressVersion = exports.expressVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.babelCoreVersion = exports.babelPresetReactVersion = exports.typesNodeVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxRspackVersion = exports.nxVersion = void 0;
+exports.swcPluginStyledComponentsVersion = exports.swcPluginEmotionVersion = exports.swcPluginStyledJsxVersion = exports.svgrRollupVersion = exports.rollupPluginUrlVersion = exports.sassVersion = exports.lessVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.typesCorsVersion = exports.corsVersion = exports.isbotVersion = exports.typesExpressVersion = exports.expressVersion = exports.autoprefixerVersion = exports.tailwindcssVersion = exports.postcssVersion = exports.tsLibVersion = exports.babelPluginStyledComponentsVersion = exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.reactTestRendererVersion = exports.reactReduxVersion = exports.reduxjsToolkitVersion = exports.testingLibraryReactVersion = exports.reactRouterDomVersion = exports.styledJsxVersion = exports.emotionBabelPlugin = exports.emotionReactVersion = exports.emotionStyledVersion = exports.typesStyledComponentsVersion = exports.styledComponentsVersion = exports.babelCoreVersion = exports.babelPresetReactVersion = exports.typesNodeVersion = exports.reactViteVersion = exports.typesReactIsVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.babelLoaderVersion = exports.swcLoaderVersion = exports.reactIsVersion = exports.reactDomVersion = exports.reactVersion = exports.nxRspackVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 // Always pull the latest version until we merge rspack plugin into the repo.
 exports.nxRspackVersion = '*';
@@ -12,6 +12,7 @@ exports.babelLoaderVersion = '^9.1.2';
 exports.typesReactVersion = '18.3.1';
 exports.typesReactDomVersion = '18.3.0';
 exports.typesReactIsVersion = '18.3.0';
+exports.reactViteVersion = '^4.2.0';
 exports.typesNodeVersion = '18.16.9';
 exports.babelPresetReactVersion = '^7.14.5';
 exports.babelCoreVersion = '^7.14.5';