@nx/react 18.3.0-beta.0 → 18.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "18.3.0-beta.0",
+  "version": "18.3.0-beta.2",
   "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": "9.0.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.3.0-beta.0",
-    "@nx/js": "18.3.0-beta.0",
-    "@nx/eslint": "18.3.0-beta.0",
-    "@nx/web": "18.3.0-beta.0",
-    "@nrwl/react": "18.3.0-beta.0"
+    "@nx/devkit": "18.3.0-beta.2",
+    "@nx/js": "18.3.0-beta.2",
+    "@nx/eslint": "18.3.0-beta.2",
+    "@nx/web": "18.3.0-beta.2",
+    "@nrwl/react": "18.3.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/plugins/component-testing/index.js

@@ -28,7 +28,7 @@ function nxComponentTestingPreset(pathToConfig, options) {
     const basePresetSettings = (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, {
         testingType: 'component',
     });
-    if (global.NX_GRAPH_CREATION || global.NX_CYPRESS_INIT_GENERATOR_RUNNING) {
+    if (global.NX_GRAPH_CREATION) {
         // this is only used by plugins, so we don't need the component testing
         // options, cast to any to avoid type errors
         return basePresetSettings;

package/src/generators/setup-tailwind/lib/add-tailwind-style-imports.js

@@ -2,22 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTailwindStyleImports = void 0;
 const devkit_1 = require("@nx/devkit");
-const knownLocations = [
-    // Plain React
-    'src/styles.css',
-    'src/styles.scss',
-    'src/styles.less',
-    // Next.js
-    'pages/styles.css',
-    'pages/styles.scss',
-    'pages/styles.less',
-    'app/global.css',
-    'app/global.scss',
-    'app/global.less',
-];
+// base directories and file types to simplify locating the stylesheet
+const baseDirs = ['src', 'pages', 'src/pages', 'src/app', 'app'];
+const fileNames = ['styles', 'global'];
+const extensions = ['.css', '.scss', '.less'];
+const knownLocations = baseDirs.flatMap((dir) => fileNames.flatMap((name) => extensions.map((ext) => `${dir}/${name}${ext}`)));
 function addTailwindStyleImports(tree, project, _options) {
-    const candidates = knownLocations.map((x) => (0, devkit_1.joinPathFragments)(project.root, x));
-    const stylesPath = candidates.find((x) => tree.exists(x));
+    const candidates = knownLocations.map((currentPath) => (0, devkit_1.joinPathFragments)(project.root, currentPath));
+    const stylesPath = candidates.find((currentStylePath) => tree.exists(currentStylePath));
     if (stylesPath) {
         const content = tree.read(stylesPath).toString();
         tree.write(stylesPath, `@tailwind base;\n@tailwind components;\n@tailwind utilities;\n${content}`);