Merge branch 'broken-tailwind-2.x' into works-tailwind-1.x

# Conflicts:
#	buildchain/package-lock.json
#	buildchain/package.json

Author: Andrew Welch

buildchain/package-lock.json

@@ -55,61 +55,40 @@
     "@babel/preset-typescript": "^7.12.1",
     "@babel/register": "^7.12.1",
     "@babel/runtime": "^7.12.1",
-    "@gfx/zopfli": "^1.0.15",
     "@types/node": "^14.11.10",
     "@types/webpack-env": "^1.15.3",
     "@typescript-eslint/eslint-plugin": "^3.6.1",
     "@typescript-eslint/parser": "^3.6.1",
     "@vue/compiler-sfc": "^3.0.1",
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
-    "compression-webpack-plugin": "^6.0.0",
-    "copy-webpack-plugin": "^6.3.0",
-    "create-symlink-webpack-plugin": "^1.0.0",
-    "critical": "^2.0.0",
-    "critical-css-webpack-plugin": "^2.0.0",
     "css-loader": "^5.0.0",
     "css-minimizer-webpack-plugin": "^1.1.5",
     "cssnano": "^4.1.0",
     "dotenv": "^6.1.0",
     "eslint": "^7.4.0",
-    "eslint-plugin-vue": "^7.0.0-alpha.10",
-    "favicons-webpack-plugin": "^5.0.0-alpha.3",
-    "file-loader": "^6.0.0",
+    "eslint-plugin-vue": "^7.2.0",
     "glob-all": "^3.1.0",
-    "html-webpack-plugin": "^4.5.0",
     "ignore-loader": "^0.1.2",
-    "imagemin": "^7.0.0",
-    "imagemin-gifsicle": "^7.0.0",
-    "imagemin-mozjpeg": "^9.0.0",
-    "imagemin-optipng": "^8.0.0",
-    "imagemin-svgo": "^8.0.0",
-    "imagemin-webp": "^6.0.0",
-    "imagemin-webp-webpack-plugin": "^3.3.0",
-    "img-loader": "^3.0.0",
     "mini-css-extract-plugin": "^1.2.0",
     "postcss": "^8.1.1",
-    "postcss-import": "^12.0.0",
+    "postcss-import": "^13.0.0",
     "postcss-loader": "^4.0.0",
-    "save-remote-file-webpack-plugin": "^1.0.0",
     "style-loader": "^2.0.0",
     "stylelint": "^13.7.0",
     "stylelint-config-recommended": "^3.0.0",
-    "symlink-webpack-plugin": "^0.0.4",
-    "tailwindcss": "^1.0.0",
+    "tailwindcss": "^2.0.0",
     "terser-webpack-plugin": "^5.0.0",
     "ts-loader": "^8.0.5",
     "tsconfig-paths-webpack-plugin": "^3.3.0",
     "typescript": "latest",
     "typings-for-css-modules-loader": "^1.7.0",
-    "vue-loader": "^16.0.0-rc.1",
+    "vue-loader": "^16.1.0",
     "webpack": "^5.3.0",
-    "webpack-bundle-analyzer": "^4.0.0-rc1",
     "webpack-cli": "^4.1.0",
-    "webpack-dev-server": "^3.3.0",
-    "webpack-manifest-plugin": "^3.0.0-rc.0",
-    "webpack-merge": "^5.3.0",
-    "workbox-webpack-plugin": "^6.0.0-alpha.3"
+    "webpack-dev-server": "^4.0.0-beta.0",
+    "webpack-manifest-plugin": "^3.0.0",
+    "webpack-merge": "^5.3.0"
   },
   "homepage": "https://github.com/example-developer/example-project",
   "keywords": [

buildchain/package.json

@@ -27,6 +27,9 @@ module.exports = (type = 'modern', settings) => {
                 path.resolve(__dirname, '../node_modules'),
             ],
         },
+        stats: {
+            colors: true,
+        },
     });
     // configs
     const configs = {

buildchain/webpack-configs/app.config.js

@@ -12,8 +12,13 @@ module.exports = (type = 'modern', settings) => {
     // common config
     const common = () => ({
         devServer: {
-            contentBase: path.resolve(__dirname, settings.contentBase()),
-            disableHostCheck: true,
+            client: {
+                progress: false,
+            },
+            dev: {
+                publicPath: '/',
+            },
+            firewall: false,
             headers: {
                 'Access-Control-Allow-Origin': '*'
             },
@@ -23,11 +28,13 @@ module.exports = (type = 'modern', settings) => {
             overlay: true,
             port: settings.port(),
             public: settings.public(),
-            publicPath: '/',
-            watchContentBase: true,
-            watchOptions: {
-                poll: !!parseInt(settings.poll()),
-                ignored: /node_modules/,
+            static: {
+                directory: path.resolve(__dirname, settings.contentBase()),
+                publicPath: '/',
+                watch: {
+                    poll: !!parseInt(settings.poll()),
+                    ignored: /node_modules/,
+                },
             },
         },
         devtool: false,
@@ -48,7 +55,6 @@ module.exports = (type = 'modern', settings) => {
                 exclude: /\.(pcss|css)($|\?)/i,
             }),
         ],
-        target: 'web',
     });
     // configs
     const configs = {