From 3f6ad0d950afc05ba8e291cccd57361249251925 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 20 Feb 2023 11:57:10 +0100 Subject: [PATCH] CSS build fixes - Bump postcss. - Remove postcss-clean. It's incompatible with newer versions and apparently unnecesary. - Finally got CSS source maps to work again --- dev.html | 2 +- package-lock.json | 51 ++------------------------------------- package.json | 5 ++-- postcss.config.js | 1 - webpack/webpack.build.js | 8 +++--- webpack/webpack.common.js | 9 +++++-- 6 files changed, 17 insertions(+), 59 deletions(-) diff --git a/dev.html b/dev.html index 51aab55b2..b189a3053 100644 --- a/dev.html +++ b/dev.html @@ -42,7 +42,7 @@ websocket_url: 'wss://conversejs.org/xmpp-websocket', // websocket_url: 'ws://chat.example.org:5380/xmpp-websocket', whitelisted_plugins: ['converse-debug'], - connection_options: { worker: '/dist/shared-connection-worker.js' } + // connection_options: { worker: '/dist/shared-connection-worker.js' } }); diff --git a/package-lock.json b/package-lock.json index 3158eaac7..8fe6bf211 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "autoprefixer": "^10.4.5", "babel-loader": "^9.1.0", "bootstrap.native-loader": "2.0.0", - "clean-css-cli": "^5.6.0", + "clean-css-cli": "^5.6.2", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.7.1", "eslint": "^8.21.0", @@ -61,8 +61,7 @@ "minimist": "^1.2.6", "po-loader": "0.7.0", "po2json": "^1.0.0-beta-3", - "postcss": "^8.4.14", - "postcss-clean": "1.2.0", + "postcss": "^8.4.16", "postcss-loader": "^7.0.1", "prettierx": "^0.19.0", "sass": "^1.51.0", @@ -12868,31 +12867,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss-clean": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-clean/-/postcss-clean-1.2.0.tgz", - "integrity": "sha512-L0ONqPN3zZnz+wJk3eyrWnsAdPq5toUfkpNiuWrgn/yXHEcys+Gm1PMRYSZ+B2GDdH/giIJCLh/0cFQgNtXB1w==", - "dev": true, - "dependencies": { - "clean-css": "^4.1", - "postcss": "^8.x" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/postcss-clean/node_modules/clean-css": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", - "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", - "dev": true, - "dependencies": { - "source-map": "~0.6.0" - }, - "engines": { - "node": ">= 4.0" - } - }, "node_modules/postcss-less": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-4.0.1.tgz", @@ -26590,27 +26564,6 @@ "source-map-js": "^1.0.2" } }, - "postcss-clean": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-clean/-/postcss-clean-1.2.0.tgz", - "integrity": "sha512-L0ONqPN3zZnz+wJk3eyrWnsAdPq5toUfkpNiuWrgn/yXHEcys+Gm1PMRYSZ+B2GDdH/giIJCLh/0cFQgNtXB1w==", - "dev": true, - "requires": { - "clean-css": "^4.1", - "postcss": "^8.x" - }, - "dependencies": { - "clean-css": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", - "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", - "dev": true, - "requires": { - "source-map": "~0.6.0" - } - } - } - }, "postcss-less": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-4.0.1.tgz", diff --git a/package.json b/package.json index 8e5141fbc..b061ae203 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "autoprefixer": "^10.4.5", "babel-loader": "^9.1.0", "bootstrap.native-loader": "2.0.0", - "clean-css-cli": "^5.6.0", + "clean-css-cli": "^5.6.2", "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.7.1", "eslint": "^8.21.0", @@ -92,8 +92,7 @@ "minimist": "^1.2.6", "po-loader": "0.7.0", "po2json": "^1.0.0-beta-3", - "postcss": "^8.4.14", - "postcss-clean": "1.2.0", + "postcss": "^8.4.16", "postcss-loader": "^7.0.1", "prettierx": "^0.19.0", "sass": "^1.51.0", diff --git a/postcss.config.js b/postcss.config.js index 6e0ebf430..77c9c7a46 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -2,6 +2,5 @@ module.exports = { plugins: [ require('autoprefixer'), - require('postcss-clean') ] } diff --git a/webpack/webpack.build.js b/webpack/webpack.build.js index 0ecab634d..2b44cddb8 100644 --- a/webpack/webpack.build.js +++ b/webpack/webpack.build.js @@ -50,10 +50,12 @@ module.exports = merge(common, { options: { url: false, sourceMap: true - } }, - 'postcss-loader', + { + loader: "postcss-loader", + options: { sourceMap: true } + }, { loader: 'sass-loader', options: { @@ -65,7 +67,7 @@ module.exports = merge(common, { }, sourceMap: true } - } + }, ] }] } diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js index 571da2d7e..ab7d001d4 100644 --- a/webpack/webpack.common.js +++ b/webpack/webpack.common.js @@ -59,10 +59,15 @@ module.exports = { { loader: 'css-loader', options: { + url: false, sourceMap: true + } }, - 'postcss-loader', + { + loader: "postcss-loader", + options: { sourceMap: true } + }, { loader: 'sass-loader', options: { @@ -74,7 +79,7 @@ module.exports = { }, sourceMap: true } - } + }, ] }, { test: /\.js$/,