@nx/next 20.5.0-rc.2 → 20.5.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "20.5.0-rc.2",
+  "version": "20.5.0-rc.3",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,7 +35,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.5.0-rc.2",
+    "@nx/devkit": "20.5.0-rc.3",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -44,11 +44,11 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "20.5.0-rc.2",
-    "@nx/eslint": "20.5.0-rc.2",
-    "@nx/react": "20.5.0-rc.2",
-    "@nx/web": "20.5.0-rc.2",
-    "@nx/webpack": "20.5.0-rc.2",
+    "@nx/js": "20.5.0-rc.3",
+    "@nx/eslint": "20.5.0-rc.3",
+    "@nx/react": "20.5.0-rc.3",
+    "@nx/web": "20.5.0-rc.3",
+    "@nx/webpack": "20.5.0-rc.3",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/tailwind.d.ts

@@ -1,6 +1,7 @@
 /**
  * Generates a set of glob patterns based off the source root of the app and its dependencies
  * @param dirPath workspace relative directory path that will be used to infer the parent project and dependencies
- * @param fileGlobPattern pass a custom glob pattern to be used
+ * @param fileGlobPatternToInclude pass a custom glob pattern to be used
+ * @param fileGlobPatternToExclude pass a custom glob pattern for files to be excluded
  */
-export declare function createGlobPatternsForDependencies(dirPath: string, fileGlobPatternToInclude?: string, fileGlobPatternToExclude?: string): string[];
+export declare function createGlobPatternsForDependencies(dirPath: string, fileGlobPatternToInclude?: string, fileGlobPatternToExclude?: string): any;

package/tailwind.js

@@ -6,27 +6,36 @@ const path_1 = require("path");
 /**
  * Generates a set of glob patterns based off the source root of the app and its dependencies
  * @param dirPath workspace relative directory path that will be used to infer the parent project and dependencies
- * @param fileGlobPattern pass a custom glob pattern to be used
+ * @param fileGlobPatternToInclude pass a custom glob pattern to be used
+ * @param fileGlobPatternToExclude pass a custom glob pattern for files to be excluded
  */
 function createGlobPatternsForDependencies(dirPath, fileGlobPatternToInclude = '/**/*.{tsx,ts,jsx,js,html}', fileGlobPatternToExclude = '/**/*.{stories,spec}.{tsx,ts,jsx,js,html}') {
-    try {
-        return [
-            ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToInclude).map((glob) => (0, path_1.relative)(dirPath, glob)),
-            ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToExclude).map((glob) => `!${(0, path_1.relative)(dirPath, glob)}`),
-        ];
-    }
-    catch (e) {
-        /**
-         * It should not be possible to reach this point when the utility is invoked as part of the normal
-         * lifecycle of Nx executors. However, other tooling, such as the VSCode Tailwind IntelliSense plugin
-         * or JetBrains editors such as WebStorm, may execute the tailwind.config.js file in order to provide
-         * autocomplete features, for example.
-         *
-         * In order to best support that use-case, we therefore do not hard error when the ProjectGraph is
-         * fundamently unavailable in this tailwind-specific context.
-         */
-        console.warn('\nWARNING: There was an error creating glob patterns, returning an empty array\n' +
-            `${e.message}\n`);
-        return [];
+    /**
+     * There is an issue with TailwindCSS v4 and how globs patterns are consumed.
+     * This is a temporary workaround to support both TailwindCSS v4 and v3.
+     * Once TailwindCSS v3 is no longer supported, this workaround can be removed.
+     */
+    const tailwindVersion = require(require.resolve('tailwindcss/package.json', {
+        paths: [dirPath],
+    })).version;
+    if (tailwindVersion && typeof tailwindVersion === 'string') {
+        const majorVersion = parseInt(tailwindVersion.split('.')[0], 10);
+        if (majorVersion >= 4) {
+            try {
+                return [
+                    ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToInclude).map((glob) => (0, path_1.relative)(dirPath, glob)),
+                    ...(0, generate_globs_1.createGlobPatternsForDependencies)(dirPath, fileGlobPatternToExclude).map((glob) => `!${(0, path_1.relative)(dirPath, glob)}`),
+                ];
+            }
+            catch (e) {
+                console.warn('\nWARNING: There was an error creating glob patterns, returning an empty array\n' +
+                    `${e.message}\n`);
+            }
+        }
+        else {
+            const { createGlobPatternsForDependencies: reactGlobPatternFunction, } = require('@nx/react/tailwind');
+            return reactGlobPatternFunction(dirPath, fileGlobPatternToInclude);
+        }
     }
+    return [];
 }