@nx/react 22.1.0-beta.5 → 22.1.0-beta.7

package/package.json

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

package/src/generators/application/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAoCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAoM5B;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAoCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAqM5B;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -152,6 +152,7 @@ async function applicationGeneratorInternal(tree, schema) {
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
             const types = new Set(json.compilerOptions?.types || []);
             types.add('@react-router/node');
+            types.add('node');
             return {
                 ...json,
                 compilerOptions: {

package/src/generators/application/files/react-router-ssr/common/tsconfig.json__tmpl__

@@ -2,7 +2,7 @@
   "extends": "<%= offsetFromRoot %>tsconfig.base.json",
   "compilerOptions": {
       "lib": ["DOM", "DOM.Iterable", "ES2019"],
-      "types": ["@react-router/node", "vite/client"],
+      "types": ["@react-router/node", "vite/client", "node"],
       "isolatedModules": true,
       "esModuleInterop": true,
       "jsx": "react-jsx",

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,iBAwDb;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBAsCb"}
+{"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,iBAwDb;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,EACjC,KAAK,EAAE,GAAG,EAAE,iBA2Cb"}

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

@@ -50,8 +50,9 @@ async function setupViteConfiguration(tree, options, tasks) {
     }, false);
 }
 async function setupVitestConfiguration(tree, options, tasks) {
-    const { createOrEditViteConfig, vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-    const vitestTask = await vitestGenerator(tree, {
+    const { createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
+    const vitestTask = await configurationGenerator(tree, {
         uiFramework: 'react',
         coverageProvider: 'v8',
         project: options.projectName,

package/src/generators/application/lib/update-jest-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-jest-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/update-jest-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAE9C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAoCrE"}
+{"version":3,"file":"update-jest-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/update-jest-config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAc,MAAM,YAAY,CAAC;AAE9C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAoCrE"}

package/src/generators/application/lib/update-jest-config.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateSpecConfig = updateSpecConfig;
-const maybe_js_1 = require("../../../utils/maybe-js");
 const jest_utils_1 = require("../../../utils/jest-utils");
 const devkit_1 = require("@nx/devkit");
 function updateSpecConfig(host, options) {
@@ -27,7 +26,10 @@ function updateSpecConfig(host, options) {
     if (options.unitTestRunner !== 'jest') {
         return;
     }
-    const configPath = (0, maybe_js_1.maybeJs)(options, `${options.appProjectRoot}/jest.config.ts`);
+    const configPath = (0, jest_utils_1.findProjectJestConfig)(host, options.appProjectRoot);
+    if (!configPath) {
+        return;
+    }
     const originalContent = host.read(configPath, 'utf-8');
     const content = (0, jest_utils_1.updateJestConfigContent)(originalContent);
     host.write(configPath, content);

package/src/generators/component-test/component-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,iBAsB7B;AAqED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,iBAkB7B;AAqED,eAAe,sBAAsB,CAAC"}

package/src/generators/component-test/component-test.js

@@ -11,8 +11,6 @@ const versions_1 = require("../../utils/versions");
 let tsModule;
 async function componentTestGenerator(tree, options) {
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { assertMinimumCypressVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/versions'));
-    assertMinimumCypressVersion(10);
     // normalize any windows paths
     options.componentPath = options.componentPath.replace(/\\/g, '/');
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);

package/src/generators/library/files/common/tsconfig.lib.json__tmpl__

@@ -9,6 +9,6 @@
       "@nx/react/typings/image.d.ts"
     ]
   },
-  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
+  "exclude": ["jest.config.ts", "jest.config.cts", "src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAgCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqRxE;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAgCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAyRxE;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -139,7 +139,7 @@ async function libraryGeneratorInternal(host, schema) {
             skipFormat: true,
         });
         tasks.push(jestTask);
-        const jestConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, options.js ? 'jest.config.js' : 'jest.config.ts');
+        const jestConfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, options.js ? 'jest.config.js' : 'jest.config.cts');
         if (options.compiler === 'babel' && host.exists(jestConfigPath)) {
             const updatedContent = (0, jest_utils_1.updateJestConfigContent)(host.read(jestConfigPath, 'utf-8'));
             host.write(jestConfigPath, updatedContent);
@@ -148,8 +148,9 @@ async function libraryGeneratorInternal(host, schema) {
     else if (options.unitTestRunner === 'vitest' &&
         options.bundler !== 'vite' // tests are already configured if bundler is vite
     ) {
-        const { vitestGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
-        const vitestTask = await vitestGenerator(host, {
+        const { createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
+        const vitestTask = await configurationGenerator(host, {
             uiFramework: 'react',
             project: options.name,
             coverageProvider: 'v8',

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

@@ -1,2 +1,4 @@
+import { type Tree } from '@nx/devkit';
 export declare function updateJestConfigContent(content: string): string;
+export declare function findProjectJestConfig(tree: Tree, projectRoot: string): string | null;
 //# sourceMappingURL=jest-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"jest-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/jest-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,UAUtD"}
+{"version":3,"file":"jest-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/jest-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAE1D,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,UAUtD;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAWf"}

package/src/utils/jest-utils.js

@@ -1,8 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfigContent = updateJestConfigContent;
+exports.findProjectJestConfig = findProjectJestConfig;
+const devkit_1 = require("@nx/devkit");
 function updateJestConfigContent(content) {
     return content
         .replace('transform: {', "transform: {\n    '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',")
         .replace(`'babel-jest'`, `['babel-jest', { presets: ['@nx/react/babel'] }]`);
 }
+function findProjectJestConfig(tree, projectRoot) {
+    const extensions = ['js', 'ts', 'cts'];
+    for (const ext of extensions) {
+        const configPath = (0, devkit_1.joinPathFragments)(projectRoot, `jest.config.${ext}`);
+        if (tree.exists(configPath)) {
+            return configPath;
+        }
+    }
+    return null;
+}