@nx/react 17.1.1 → 17.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "17.1.1",
+  "version": "17.1.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.1.1",
-    "@nx/js": "17.1.1",
-    "@nx/eslint": "17.1.1",
-    "@nx/web": "17.1.1",
-    "@nrwl/react": "17.1.1"
+    "@nx/devkit": "17.1.3",
+    "@nx/js": "17.1.3",
+    "@nx/eslint": "17.1.3",
+    "@nx/web": "17.1.3",
+    "@nrwl/react": "17.1.3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -132,7 +132,7 @@ async function applicationGeneratorInternal(host, schema) {
         const { createOrEditViteConfig, vitestGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         const vitestTask = await vitestGenerator(host, {
             uiFramework: 'react',
-            coverageProvider: 'c8',
+            coverageProvider: 'v8',
             project: options.projectName,
             inSourceTests: options.inSourceTests,
             skipFormat: true,

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

@@ -8,15 +8,14 @@ function updateSpecConfig(host, options) {
         return;
     }
     (0, devkit_1.updateJson)(host, `${options.appProjectRoot}/tsconfig.spec.json`, (json) => {
-        json.types = json.types || [];
+        const compilerOptions = json.compilerOptions ?? {};
+        const types = compilerOptions.types ?? [];
         if (options.style === 'styled-jsx') {
-            json.types.push('@nx/react/typings/styled-jsx.d.ts');
+            types.push('@nx/react/typings/styled-jsx.d.ts');
         }
-        json.types = [
-            ...json.types,
-            '@nx/react/typings/cssmodule.d.ts',
-            '@nx/react/typings/image.d.ts',
-        ];
+        types.push('@nx/react/typings/cssmodule.d.ts', '@nx/react/typings/image.d.ts');
+        compilerOptions.types = types;
+        json.compilerOptions = compilerOptions;
         return json;
     });
     if (options.unitTestRunner !== 'jest') {

package/src/generators/host/files/common/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/host/host.js

@@ -72,6 +72,9 @@ async function hostGeneratorInternal(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.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/library/library.js

@@ -113,7 +113,7 @@ async function libraryGeneratorInternal(host, schema) {
         const vitestTask = await vitestGenerator(host, {
             uiFramework: 'react',
             project: options.name,
-            coverageProvider: 'c8',
+            coverageProvider: 'v8',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             testEnvironment: 'jsdom',

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/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/remote.js

@@ -75,6 +75,9 @@ 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.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

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

@@ -8,10 +8,10 @@ async function generateStories(host, schema) {
     // TODO(katerina): Nx 18 -> 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,
@@ -23,7 +23,7 @@ async function generateStories(host, schema) {
 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.name);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, schema.project);
     if (projectConfig.targets['build']?.executor === '@nx/webpack:webpack' ||
         projectConfig.targets['build']?.executor === '@nrwl/webpack:webpack' ||
         projectConfig.targets['build']?.executor === '@nx/rollup:rollup' ||
@@ -31,7 +31,7 @@ async function storybookConfigurationGenerator(host, schema) {
         uiFramework = '@storybook/react-webpack5';
     }
     const installTask = await configurationGenerator(host, {
-        name: schema.name,
+        project: schema.project,
         configureCypress: schema.configureCypress,
         js: schema.js,
         linter: schema.linter,

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;

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

@@ -6,9 +6,9 @@
   "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",
@@ -90,6 +90,6 @@
       ]
     }
   },
-  "required": ["name"],
+  "required": ["project"],
   "examplesFile": "../../../docs/storybook-configuration-examples.md"
 }