Merge branch 'release/1.6.31' into v1

CHANGELOG.md

@@ -1,5 +1,16 @@
 # ImageOptimize Changelog
 
+## 1.6.31 - 2021.04.06
+### Added
+* Added `make update` to update NPM packages
+* Added `make update-clean` to completely remove `node_modules/`, then update NPM packages
+
+### Changed
+* Use Tailwind CSS `^2.1.0` with JIT
+
+### Fixed
+* Fixed broken link to lower quality retina images article
+
 ## 1.6.30 - 2021.04.03
 ### Added
 * Added some additional CLI command logging that shows the savings from optimization

Makefile

@@ -32,6 +32,15 @@ docs: docker
 install: docker
 	${DOCKERRUN} \
 		install
+update: docker
+	rm -f buildchain/package-lock.json
+	${DOCKERRUN} \
+		install
+update-clean: docker
+	rm -f buildchain/package-lock.json
+	rm -rf buildchain/node_modules/
+	${DOCKERRUN} \
+		install
 npm: docker
 	${DOCKERRUN} \
 		$(filter-out $@,$(MAKECMDGOALS))

buildchain/package.json

@@ -36,7 +36,7 @@
   "dependencies": {
     "core-js": "^3.0.0",
     "regenerator-runtime": "^0.13.2",
-    "tailwindcss": "^2.0.0",
+    "tailwindcss": "^2.1.0",
     "vue": "^2.6.0",
     "vue-confetti": "^0.4.2"
   },
@@ -54,7 +54,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",
@@ -130,7 +129,7 @@
     "check-types": "tsc",
     "debug": "nodemon -L",
     "dev": "nodemon -L",
-    "docs": "cd ../docs && rm -f package-lock.json && npm install && npm run docs:build",
+    "docs": "cd ../docs && rm -f package-lock.json && npm install && npm update && npm run docs:build",
     "lint": "tsc --noEmit && eslint '../../src/**/*.{js,ts,vue}' --fix"
   },
   "version": "1.0.0"

buildchain/tailwind.config.js

@@ -1,5 +1,6 @@
 // module exports
 module.exports = {
+  mode: 'jit',
   purge: {
     content: [
       '../src/templates/**/*.{twig,html}',

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', {