Merge branch 'release/2.4.32' into craft-webpack

nystudio107 · Apr 5, 2021 · 972a37f · 972a37f
2 parents f73706f + 2469c62
commit 972a37f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.4.32 - 2021.04.05
+### Changed
+* Use Tailwind CSS `^2.1.0` with JIT
+
 ## 2.4.31 - 2021.04.05
 ### Added
 * Added `make update` to update Composer & NPM packages

diff --git a/buildchain/package.json b/buildchain/package.json
@@ -38,7 +38,7 @@
     "core-js": "^3.0.0",
     "lazysizes": "^5.2.2",
     "regenerator-runtime": "^0.13.2",
-    "tailwindcss": "^2.0.3",
+    "tailwindcss": "^2.1.0",
     "vue": "^3.0.0",
     "vue-confetti": "^2.0.8"
   },
@@ -56,7 +56,6 @@
     "@babel/register": "^7.12.1",
     "@babel/runtime": "^7.12.1",
     "@gfx/zopfli": "^1.0.15",
-    "@tailwindcss/jit": "latest",
     "@types/node": "^14.11.10",
     "@types/webpack-env": "^1.15.3",
     "@typescript-eslint/eslint-plugin": "^3.6.1",

diff --git a/buildchain/tailwind.config.js b/buildchain/tailwind.config.js
@@ -1,5 +1,6 @@
 // module exports
 module.exports = {
+  mode: 'jit',
   purge: {
     content: [
       '../cms/templates/**/*.{twig,html}',

diff --git a/buildchain/webpack-configs/postcss-loader.config.js b/buildchain/webpack-configs/postcss-loader.config.js
@@ -6,7 +6,7 @@ const path = require('path');
 
 // webpack plugins
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const TailwindCssJit = require('@tailwindcss/jit');
+const TailwindCss = require('tailwindcss');
 
 // return a webpack config
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -37,7 +37,7 @@ module.exports = (type = 'modern', settings) => {
                                         ['postcss-import', {
                                             path: ['./node_modules'],
                                         }],
-                                        TailwindCssJit('./tailwind.config.js'),
+                                        TailwindCss('./tailwind.config.js'),
                                         ['postcss-mixins', {
                                         }],
                                         ['postcss-nested', {