Merge branch 'release/1.0.24' into v1

nystudio107 · Apr 6, 2021 · c3244a9 · c3244a9
2 parents b5efd17 + 6339469
commit c3244a9
Show file tree

Hide file tree

Showing 37 changed files with 2,767 additions and 2,597 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Webperf Changelog
 
+## 1.0.24 - 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
+
 ## 1.0.23 - 2021.04.01
 ### Changed
 * More consistent `makefile` build commands

diff --git a/Makefile b/Makefile
@@ -31,7 +31,16 @@ docs: docker
 	mv ./docs/docs/.vuepress/dist ${DOCSDEST}
 install: docker
 	${DOCKERRUN} \
-		install
+		install --ignore-scripts
+update: docker
+	rm -f buildchain/package-lock.json
+	${DOCKERRUN} \
+		install --ignore-scripts
+update-clean: docker
+	rm -f buildchain/package-lock.json
+	rm -rf buildchain/node_modules/
+	${DOCKERRUN} \
+		install --ignore-scripts
 npm: docker
 	${DOCKERRUN} \
 		$(filter-out $@,$(MAKECMDGOALS))

diff --git a/buildchain/package-lock.json b/buildchain/package-lock.json
diff --git a/buildchain/package.json b/buildchain/package.json
@@ -39,7 +39,7 @@
     "boomerangjs": "^1.621.0",
     "core-js": "^3.0.0",
     "regenerator-runtime": "^0.13.2",
-    "tailwindcss": "^2.0.0",
+    "tailwindcss": "^2.1.0",
     "vue": "^2.6.0",
     "vee-validate": "^2.1.7",
     "vue-apexcharts": "^1.3.6",
@@ -62,7 +62,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",
@@ -138,7 +137,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"

diff --git a/buildchain/tailwind.config.js b/buildchain/tailwind.config.js
@@ -1,5 +1,6 @@
 // module exports
 module.exports = {
+  mode: 'jit',
   purge: {
     content: [
       '../src/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', {

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-webperf",
     "description": "Webperf helps you build & maintain high quality websites through Real User Measurement of your website's performance",
     "type": "craft-plugin",
-    "version": "1.0.23",
+    "version": "1.0.24",
     "keywords": [
         "craft",
         "cms",

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -4,6 +4,6 @@
     "docs:build": "vuepress build docs"
   },
   "devDependencies": {
-    "vuepress": "^1.0.3"
+    "vuepress": "^1.8.2"
   }
 }