@nx/react 22.7.0-pr.35356.e1b62ce → 22.7.0-rc.1

package/migrations.json

@@ -195,6 +195,47 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "22.7.0": {
+      "version": "22.7.0-beta.18",
+      "packages": {
+        "react-router": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-router/dev": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-router/node": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-router/serve": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-router/express": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-router/fs-routes": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-router/cloudflare": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-router/architect": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@react-router/remix-routes-option-adapter": {
+          "version": "7.14.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "22.7.0-pr.35356.e1b62ce",
+  "version": "22.7.0-rc.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": {
@@ -38,28 +38,28 @@
     "minimatch": "10.2.4",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "22.7.0-pr.35356.e1b62ce",
-    "@nx/js": "22.7.0-pr.35356.e1b62ce",
-    "@nx/eslint": "22.7.0-pr.35356.e1b62ce",
-    "@nx/web": "22.7.0-pr.35356.e1b62ce",
-    "@nx/module-federation": "22.7.0-pr.35356.e1b62ce",
-    "@nx/rollup": "22.7.0-pr.35356.e1b62ce",
+    "@nx/devkit": "22.7.0-rc.1",
+    "@nx/js": "22.7.0-rc.1",
+    "@nx/eslint": "22.7.0-rc.1",
+    "@nx/web": "22.7.0-rc.1",
+    "@nx/module-federation": "22.7.0-rc.1",
+    "@nx/rollup": "22.7.0-rc.1",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.5",
     "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@nx/cypress": "22.7.0-pr.35356.e1b62ce",
-    "@nx/playwright": "22.7.0-pr.35356.e1b62ce",
-    "@nx/rsbuild": "22.7.0-pr.35356.e1b62ce",
-    "@nx/vite": "22.7.0-pr.35356.e1b62ce",
-    "@nx/vitest": "22.7.0-pr.35356.e1b62ce",
-    "@nx/webpack": "22.7.0-pr.35356.e1b62ce",
-    "@nx/storybook": "22.7.0-pr.35356.e1b62ce",
-    "nx": "22.7.0-pr.35356.e1b62ce"
+    "@nx/cypress": "22.7.0-rc.1",
+    "@nx/playwright": "22.7.0-rc.1",
+    "@nx/rsbuild": "22.7.0-rc.1",
+    "@nx/vite": "22.7.0-rc.1",
+    "@nx/vitest": "22.7.0-rc.1",
+    "@nx/webpack": "22.7.0-rc.1",
+    "@nx/storybook": "22.7.0-rc.1",
+    "nx": "22.7.0-rc.1"
   },
   "optionalDependencies": {
-    "@nx/vite": "22.7.0-pr.35356.e1b62ce"
+    "@nx/vite": "22.7.0-rc.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/lib/bundlers/add-vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-vite.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/react/src/generators/application/lib/bundlers/add-vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAoC,MAAM,YAAY,CAAC;AAEzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAExD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA2Db;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA0Cb"}
+{"version":3,"file":"add-vite.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/react/src/generators/application/lib/bundlers/add-vite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAoC,MAAM,YAAY,CAAC;AAGzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAExD,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA8Db;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA0Cb"}

package/src/generators/application/lib/bundlers/add-vite.js

@@ -37,6 +37,7 @@ exports.setupViteConfiguration = setupViteConfiguration;
 exports.setupVitestConfiguration = setupVitestConfiguration;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../../utils/versions");
+const version_utils_1 = require("../../../../utils/version-utils");
 async function setupViteConfiguration(tree, options, tasks) {
     const { createOrEditViteConfig, viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
     // We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
@@ -56,6 +57,9 @@ async function setupViteConfiguration(tree, options, tasks) {
         ],
         plugins: ['react()'],
     };
+    // @react-router/dev < 7.14.0 caps its Vite peer dep at ^7, so fall back to
+    // Vite 7 when an older version is already installed in the workspace.
+    const forceViteV7 = options.useReactRouter && !(0, version_utils_1.reactRouterSupportsVite8)(tree);
     const viteTask = await viteConfigurationGenerator(tree, {
         uiFramework: 'react',
         project: options.projectName,
@@ -67,8 +71,7 @@ async function setupViteConfiguration(tree, options, tasks) {
         addPlugin: options.addPlugin,
         projectType: 'application',
         port: options.port,
-        // React Router does not yet support Vite 8, so force Vite 7.
-        ...(options.useReactRouter ? { useViteV7: true } : {}),
+        ...(forceViteV7 ? { useViteV7: true } : {}),
     });
     tasks.push(viteTask);
     createOrEditViteConfig(tree, {

package/src/utils/lint.d.ts

@@ -11,27 +11,5 @@ export declare const extraEslintDependencies: {
 /**
  * @deprecated Use `addExtendsToLintConfig` from `@nx/eslint` instead.
  */
-export declare const extendReactEslintJson: (json: Linter.Config) => {
-    ignorePatterns?: string | string[] | undefined;
-    root?: boolean | undefined;
-    $schema?: string | undefined;
-    env?: {
-        [name: string]: boolean;
-    } | undefined;
-    globals?: {
-        [name: string]: boolean | "off" | "readonly" | "readable" | "writable" | "writeable";
-    } | undefined;
-    noInlineConfig?: boolean | undefined;
-    overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
-    parser?: string | undefined;
-    parserOptions?: Linter.ParserOptions | undefined;
-    plugins?: string[] | undefined;
-    processor?: string | undefined;
-    reportUnusedDisableDirectives?: boolean | undefined;
-    settings?: {
-        [name: string]: any;
-    } | undefined;
-    rules?: Partial<Linter.RulesRecord>;
-    extends: string[];
-};
+export declare const extendReactEslintJson: (json: Linter.LegacyConfig) => Linter.LegacyConfig;
 //# sourceMappingURL=lint.d.ts.map

package/src/utils/lint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/lint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAQhC,eAAO,MAAM,uBAAuB;;;;;;;;CAQnC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAAI,MAAM,MAAM,CAAC,MAAM;;;;;;;;;;;;;;;;;;;;;;CAOxD,CAAC"}
+{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/lint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAQhC,eAAO,MAAM,uBAAuB;;;;;;;;CAQnC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,MAAM,CAAC,YAAY,KACxB,MAAM,CAAC,YAOT,CAAC"}

package/src/utils/version-utils.d.ts

@@ -11,5 +11,7 @@ export declare function getReactDependenciesVersionsToInstall(tree: Tree): Promi
 export declare function isReact18(tree: Tree): Promise<boolean>;
 export declare function getInstalledReactVersion(tree: Tree): string;
 export declare function getInstalledReactVersionFromGraph(): Promise<string>;
+export declare function getInstalledReactRouterDevVersion(tree: Tree): string | undefined;
+export declare function reactRouterSupportsVite8(tree: Tree): boolean;
 export {};
 //# sourceMappingURL=version-utils.d.ts.map

package/src/utils/version-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAiBpB,KAAK,yBAAyB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAsB,qCAAqC,CACzD,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,yBAAyB,CAAC,CAoBpC;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,IAAI,oBAMzC;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAe3D;AAED,wBAAsB,iCAAiC,oBAOtD"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAiBpB,KAAK,yBAAyB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAsB,qCAAqC,CACzD,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,yBAAyB,CAAC,CAoBpC;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,IAAI,oBAMzC;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAe3D;AAED,wBAAsB,iCAAiC,oBAOtD;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GACT,MAAM,GAAG,SAAS,CAWpB;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAU5D"}

package/src/utils/version-utils.js

@@ -4,6 +4,8 @@ exports.getReactDependenciesVersionsToInstall = getReactDependenciesVersionsToIn
 exports.isReact18 = isReact18;
 exports.getInstalledReactVersion = getInstalledReactVersion;
 exports.getInstalledReactVersionFromGraph = getInstalledReactVersionFromGraph;
+exports.getInstalledReactRouterDevVersion = getInstalledReactRouterDevVersion;
+exports.reactRouterSupportsVite8 = reactRouterSupportsVite8;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const versions_1 = require("./versions");
@@ -53,3 +55,21 @@ async function getInstalledReactVersionFromGraph() {
     }
     return (0, semver_1.clean)(reactDep.data.version) ?? (0, semver_1.coerce)(reactDep.data.version).version;
 }
+function getInstalledReactRouterDevVersion(tree) {
+    const installed = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@react-router/dev');
+    if (!installed || installed === 'latest' || installed === 'next') {
+        return undefined;
+    }
+    return (0, semver_1.clean)(installed) ?? (0, semver_1.coerce)(installed)?.version;
+}
+function reactRouterSupportsVite8(tree) {
+    const installed = getInstalledReactRouterDevVersion(tree);
+    if (!installed) {
+        return true;
+    }
+    const coerced = (0, semver_1.coerce)(installed);
+    if (!coerced) {
+        return true;
+    }
+    return coerced.major > 7 || (coerced.major === 7 && coerced.minor >= 14);
+}

package/src/utils/versions.d.ts

@@ -24,7 +24,7 @@ export declare const emotionReactVersion = "11.14.0";
 export declare const emotionBabelPlugin = "11.13.5";
 export declare const styledJsxVersion = "5.1.2";
 export declare const reactRouterDomVersion = "6.30.3";
-export declare const reactRouterVersion = "^7.12.0";
+export declare const reactRouterVersion = "^7.14.2";
 export declare const reactRouterIsBotVersion = "^4.4.0";
 export declare const testingLibraryReactVersion = "16.3.0";
 export declare const testingLibraryDomVersion = "10.4.0";

package/src/utils/versions.js

@@ -30,7 +30,7 @@ exports.emotionBabelPlugin = '11.13.5';
 // WARNING: This needs to be in sync with Next.js' dependency or else there might be issues.
 exports.styledJsxVersion = '5.1.2';
 exports.reactRouterDomVersion = '6.30.3';
-exports.reactRouterVersion = '^7.12.0';
+exports.reactRouterVersion = '^7.14.2';
 exports.reactRouterIsBotVersion = '^4.4.0';
 exports.testingLibraryReactVersion = '16.3.0';
 exports.testingLibraryDomVersion = '10.4.0';