@nx/react 17.3.0-beta.1 → 17.3.0-beta.3

package/migrations.json

@@ -290,6 +290,15 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "17.3.0": {
+      "version": "17.3.0-beta.3",
+      "packages": {
+        "@types/node": {
+          "version": "18.16.9",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "17.3.0-beta.1",
+  "version": "17.3.0-beta.3",
   "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, 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": {
@@ -37,11 +37,11 @@
     "file-loader": "^6.2.0",
     "minimatch": "3.0.5",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.3.0-beta.1",
-    "@nx/js": "17.3.0-beta.1",
-    "@nx/eslint": "17.3.0-beta.1",
-    "@nx/web": "17.3.0-beta.1",
-    "@nrwl/react": "17.3.0-beta.1"
+    "@nx/devkit": "17.3.0-beta.3",
+    "@nx/js": "17.3.0-beta.3",
+    "@nx/eslint": "17.3.0-beta.3",
+    "@nx/web": "17.3.0-beta.3",
+    "@nrwl/react": "17.3.0-beta.3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/files/nx-welcome/src/app/nx-welcome.tsx

@@ -727,7 +727,7 @@ export function NxWelcome({ title }: { title: string }) {
                     />
                   </svg>
                   <h2>
-                    NxCloud
+                    Nx Cloud
                     <span>Enable faster CI & better DX</span>
                   </h2>
                 </div>

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

@@ -2,3 +2,4 @@ import { StorybookConfigureSchema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function storybookConfigurationGenerator(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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storybookConfigurationGenerator = void 0;
+exports.findWebpackConfig = exports.storybookConfigurationGenerator = void 0;
 const stories_1 = require("../stories/stories");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
@@ -24,8 +24,7 @@ async function storybookConfigurationGenerator(host, schema) {
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
     let uiFramework = '@storybook/react-vite';
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
-    if (projectConfig.targets['build']?.executor === '@nx/webpack:webpack' ||
-        projectConfig.targets['build']?.executor === '@nrwl/webpack:webpack' ||
+    if (findWebpackConfig(host, projectConfig.root) ||
         projectConfig.targets['build']?.executor === '@nx/rollup:rollup' ||
         projectConfig.targets['build']?.executor === '@nrwl/rollup:rollup') {
         uiFramework = '@storybook/react-webpack5';
@@ -50,3 +49,13 @@ async function storybookConfigurationGenerator(host, schema) {
 }
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 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/utils/versions.d.ts

@@ -8,7 +8,7 @@ export declare const babelLoaderVersion = "^9.1.2";
 export declare const typesReactVersion = "18.2.33";
 export declare const typesReactDomVersion = "18.2.14";
 export declare const typesReactIsVersion = "18.2.2";
-export declare const typesNodeVersion = "18.14.2";
+export declare const typesNodeVersion = "18.16.9";
 export declare const babelPresetReactVersion = "^7.14.5";
 export declare const babelCoreVersion = "^7.14.5";
 export declare const styledComponentsVersion = "5.3.6";

package/src/utils/versions.js

@@ -12,7 +12,7 @@ exports.babelLoaderVersion = '^9.1.2';
 exports.typesReactVersion = '18.2.33';
 exports.typesReactDomVersion = '18.2.14';
 exports.typesReactIsVersion = '18.2.2';
-exports.typesNodeVersion = '18.14.2';
+exports.typesNodeVersion = '18.16.9';
 exports.babelPresetReactVersion = '^7.14.5';
 exports.babelCoreVersion = '^7.14.5';
 exports.styledComponentsVersion = '5.3.6';