Procházet zdrojové kódy

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
JC Brand před 2 roky
rodič
revize
3f6ad0d950
6 změnil soubory, kde provedl 17 přidání a 59 odebrání
  1. 1 1
      dev.html
  2. 2 49
      package-lock.json
  3. 2 3
      package.json
  4. 0 1
      postcss.config.js
  5. 5 3
      webpack/webpack.build.js
  6. 7 2
      webpack/webpack.common.js

+ 1 - 1
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' }
     });
 </script>
 </body>

+ 2 - 49
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",

+ 2 - 3
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",

+ 0 - 1
postcss.config.js

@@ -2,6 +2,5 @@
 module.exports = {
     plugins: [
         require('autoprefixer'),
-        require('postcss-clean')
     ]
 }

+ 5 - 3
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
                     }
-                }
+                },
             ]
         }]
     }

+ 7 - 2
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$/,