Skip to content

Commit

Permalink
CSS build fixes
Browse files Browse the repository at this point in the history
- Bump postcss.
- Remove postcss-clean. It's incompatible with newer versions and
  apparently unnecesary.
- Finally got CSS source maps to work again
  • Loading branch information
jcbrand committed Feb 20, 2023
1 parent 9899351 commit 3f6ad0d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 59 deletions.
2 changes: 1 addition & 1 deletion dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
51 changes: 2 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
1 change: 0 additions & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
module.exports = {
plugins: [
require('autoprefixer'),
require('postcss-clean')
]
}
8 changes: 5 additions & 3 deletions webpack/webpack.build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -65,7 +67,7 @@ module.exports = merge(common, {
},
sourceMap: true
}
}
},
]
}]
}
Expand Down
9 changes: 7 additions & 2 deletions webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -74,7 +79,7 @@ module.exports = {
},
sourceMap: true
}
}
},
]
}, {
test: /\.js$/,
Expand Down

0 comments on commit 3f6ad0d

Please sign in to comment.