fix: compatiable with tailwindcss v3.3.0 (#13)

await-ovo · Apr 3, 2023 · 97bd783 · 97bd783
1 parent e5f76ed
commit 97bd783
Show file tree

Hide file tree

Showing 11 changed files with 3,285 additions and 2,950 deletions.
diff --git a/.github/workfiows/ci.yaml → .github/workflows/ci.yaml b/.github/workfiows/ci.yaml → .github/workflows/ci.yaml
diff --git a/examples/craco/package.json b/examples/craco/package.json
@@ -11,7 +11,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.3.1",
     "tailwindcss-webpack-plugin": "workspace:*",
     "typescript": "^4.8.4",
     "web-vitals": "^2.1.4"

diff --git a/examples/next.js/package.json b/examples/next.js/package.json
@@ -15,7 +15,7 @@
     "@types/react": "17.0.38",
     "autoprefixer": "^10.4.12",
     "postcss": "^8.4.17",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.3.1",
     "tailwindcss-webpack-plugin": "workspace:*",
     "typescript": "4.5.4"
   }

diff --git a/examples/vite-react/package.json b/examples/vite-react/package.json
@@ -15,11 +15,11 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "@vitejs/plugin-react": "^2.1.0",
-    "typescript": "^4.6.4",
-    "vite": "^4",
-    "tailwindcss": "^3.1.8",
     "autoprefixer": "^10.4.12",
     "postcss": "^8.4.17",
-    "tailwindcss-vite-plugin": "workspace:*"
+    "tailwindcss": "^3.3.1",
+    "tailwindcss-vite-plugin": "workspace:*",
+    "typescript": "^4.6.4",
+    "vite": "^4"
   }
 }
diff --git a/examples/vite-vue/package.json b/examples/vite-vue/package.json
@@ -12,10 +12,10 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^3.1.0",
-    "vite": "^3.1.0",
-    "tailwindcss": "^3.1.8",
     "autoprefixer": "^10.4.12",
     "postcss": "^8.4.17",
-    "tailwindcss-vite-plugin": "workspace:*"
+    "tailwindcss": "^3.3.1",
+    "tailwindcss-vite-plugin": "workspace:*",
+    "vite": "^3.1.0"
   }
 }
diff --git a/examples/vue/package.json b/examples/vue/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "core-js": "^3.25.5",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.3.1",
     "vue": "^3.2.40"
   },
   "devDependencies": {

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -20,21 +20,21 @@
     "dev": "pnpm run build -- --watch"
   },
   "dependencies": {
+    "debug": "^4.3.4",
     "fast-glob": "^3.2.12",
     "normalize-path": "^3.0.0",
-    "tailwind-config-viewer": "^1.7.2",
-    "debug": "^4.3.4"
+    "tailwind-config-viewer": "^1.7.2"
   },
   "devDependencies": {
-    "@types/normalize-path": "^3.0.0",
     "@types/debug": "^4.1.7",
+    "@types/normalize-path": "^3.0.0",
     "@types/tailwindcss": "^3.1.0",
-    "tsup": "^6.2.3",
-    "tailwindcss": "^3.1.8",
-    "postcss": "^8.4.17"
+    "postcss": "^8.4.17",
+    "tailwindcss": "^3.3.1",
+    "tsup": "^6.2.3"
   },
   "peerDependencies": {
-    "tailwindcss": "^3.1.8",
-    "postcss": "^8.4.17"
+    "postcss": "^8.4.17",
+    "tailwindcss": "^3.1.8"
   }
 }
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -15,7 +15,7 @@ import {
 import type { PluginCreator } from 'postcss';
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { ChangedContent, UserOptions } from './types';
-import type { Config as TailwindConfig } from 'tailwindcss';
+import type { Config, Config as TailwindConfig } from 'tailwindcss';
 
 // import cjs module.
 const require = createRequire(PACKAGE_DIR);
@@ -27,7 +27,7 @@ const {
 const {
   default: getModuleDependencies,
 }: {
-  default: (file: string) => Array<{ file: string; requires: string[] }>;
+  default: (file: string) => Set<string>;
 } = require('tailwindcss/lib/lib/getModuleDependencies');
 
 const createServer = require('tailwind-config-viewer/server');
@@ -100,13 +100,12 @@ export const loadConfiguration = (
     }
   }
 
-  let config = resolveConfig(
+  let config = resolveConfig<Config>(
     configPath && existsSync(configPath) ? require(configPath) : {},
-  );
+  ) as TailwindConfig;
 
   if (configPath && existsSync(configPath)) {
-    const deps = getModuleDependencies(configPath).map(({ file }) => file);
-    dependencies = new Set(deps);
+    dependencies = getModuleDependencies(configPath);
   }
 
   return {

diff --git a/packages/vite-plugin/package.json b/packages/vite-plugin/package.json
@@ -42,8 +42,8 @@
     "vite": "^3 || ^4"
   },
   "dependencies": {
-    "tailwindcss": "^3.1.8",
     "postcss": "^8.4.17",
+    "tailwindcss": "^3.3.1",
     "tailwindcss-webpack-plugin-utils": "workspace:*"
   },
   "devDependencies": {

diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "get-port-please": "^2.6.1",
     "postcss": "^8.4.17",
-    "tailwindcss": "^3.1.8",
+    "tailwindcss": "^3.3.1",
     "tailwindcss-webpack-plugin-utils": "workspace:*"
   },
   "peerDependencies": {