@nx/react 20.3.0-beta.0 → 20.3.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "20.3.0-beta.0",
+  "version": "20.3.0-beta.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,11 +38,11 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.3.0-beta.0",
-    "@nx/js": "20.3.0-beta.0",
-    "@nx/eslint": "20.3.0-beta.0",
-    "@nx/web": "20.3.0-beta.0",
-    "@nx/module-federation": "20.3.0-beta.0",
+    "@nx/devkit": "20.3.0-beta.1",
+    "@nx/js": "20.3.0-beta.1",
+    "@nx/eslint": "20.3.0-beta.1",
+    "@nx/web": "20.3.0-beta.1",
+    "@nx/module-federation": "20.3.0-beta.1",
     "express": "^4.19.2",
     "http-proxy-middleware": "^3.0.3"
   },

package/plugins/nx-react-webpack-plugin/lib/apply-react-config.js

@@ -80,7 +80,9 @@ function addHotReload(config) {
 // We remove potentially conflicting rules that target SVGs because we use @svgr/webpack loader
 // See https://github.com/nrwl/nx/issues/14383
 function removeSvgLoaderIfPresent(config) {
-    const svgLoaderIdx = config.module.rules.findIndex((rule) => typeof rule === 'object' && rule.test.toString().includes('svg'));
+    const svgLoaderIdx = config.module.rules.findIndex((rule) => typeof rule === 'object' &&
+        typeof rule.test !== 'undefined' &&
+        rule.test.toString().includes('svg'));
     if (svgLoaderIdx === -1)
         return;
     config.module.rules.splice(svgLoaderIdx, 1);

package/src/generators/application/application.js

@@ -264,7 +264,9 @@ async function applicationGeneratorInternal(host, schema) {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
-    });
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/schema.json

@@ -51,15 +51,15 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)       [ https://sass-lang.com                     ]"
+            "label": "SASS(.scss)       [ https://sass-lang.com                    ]"
           },
           {
             "value": "less",
-            "label": "LESS              [ https://lesscss.org                       ]"
+            "label": "LESS              [ https://lesscss.org                      ]"
           },
           {
             "value": "tailwind",
-            "label": "tailwind [ https://tailwindcss.com/            ]"
+            "label": "tailwind          [ https://tailwindcss.com/                 ]"
           },
           {
             "value": "styled-components",

package/src/generators/component/files/__fileName__.__ext__

@@ -6,7 +6,7 @@ import { Route, Link } from 'react-router-dom';
 <%_ } _%>
 
 <%_ if (hasStyles) {
-   if (styledModule && styledModule !== 'styled-jsx') {
+   if (styledModule && styledModule !== 'styled-jsx' && styledModule !== 'tailwind') {
     var wrapper = 'Styled' + className;
     var extras = '';
   _%>
@@ -15,14 +15,14 @@ import styled from '<%= styledModule %>';
     var wrapper = 'div';
     var extras = globalCss || styledModule === 'styled-jsx' ? '' : " className={styles['container']}";
   _%>
-<%- style !== 'styled-jsx' ? globalCss ? `import './${fileName}.${style}';` : `import styles from './${fileName}.module.${style}';`: '' %>
+<%- style !== 'styled-jsx' && style!== 'tailwind' ? globalCss ? `import './${fileName}.${style}';` : `import styles from './${fileName}.module.${style}';`: '' %>
   <%_ }
 } else {
     var wrapper = 'div';
     var extras = '';
 } _%>
 
-<%_ if (styledModule && styledModule !== 'styled-jsx') { _%>
+<%_ if (styledModule && styledModule !== 'styled-jsx' && styledModule !== 'tailwind') { _%>
 const Styled<%= className %> = styled.div`
   color: pink;
 `;

package/src/generators/component/schema.json

@@ -41,6 +41,10 @@
             "value": "less",
             "label": "LESS              [ https://lesscss.org            ]"
           },
+          {
+            "value": "tailwind",
+            "label": "tailwind          [ https://tailwindcss.com/       ]"
+          },
           {
             "value": "styled-components",
             "label": "styled-components [ https://styled-components.com ]"

package/src/generators/library/library.js

@@ -222,7 +222,7 @@ async function libraryGeneratorInternal(host, schema) {
     }
     // Always run install to link packages.
     if (options.isUsingTsSolutionConfig) {
-        tasks.push(() => (0, devkit_1.installPackagesTask)(host));
+        tasks.push(() => (0, devkit_1.installPackagesTask)(host, true));
     }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);

package/src/generators/library/schema.json

@@ -52,6 +52,10 @@
             "value": "less",
             "label": "LESS              [ https://lesscss.org            ]"
           },
+          {
+            "value": "tailwind",
+            "label": "tailwind          [ https://tailwindcss.com/       ]"
+          },
           {
             "value": "styled-components",
             "label": "styled-components [ https://styled-components.com ]"