Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18, 20]
node-version: [22]
mongodb-version: [4.4, 5.0, 6.0, 7.0]

# Steps represent a sequence of tasks that will be executed as part of the job
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## UNRELEASED

### Changes

* Dropped support for Node.js 18 and Node.js 20.

### Fixes

* Fixed incorrect sizing and spacing across the admin UI. A byte order mark preserved by PostCSS 8.5.24 invalidated the stylesheet rule setting `line-height` and `box-sizing` for `.apos-` elements. Sass is now compiled with `charset: false`, so the marker is never emitted.

## 3.67.3 (2025-03-31)

### Fixes
Expand Down
5 changes: 5 additions & 0 deletions modules/@apostrophecms/asset/lib/webpack/apos/webpack.scss.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ module.exports = (options, apos) => {
{
loader: 'sass-loader',
options: {
sassOptions: {
// Without this Sass emits a BOM, which postcss 8.5.24+ keeps.
// A BOM in the middle of a stylesheet kills the rule after it.
charset: false
},
sourceMap: false,
// "use" rules must come first or sass throws an error
additionalData: `
Expand Down
11 changes: 10 additions & 1 deletion modules/@apostrophecms/asset/lib/webpack/src/webpack.scss.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,16 @@ module.exports = (options, apos, srcBuildNames) => {
}
},
// Parses SASS imports
'sass-loader'
{
loader: 'sass-loader',
options: {
sassOptions: {
// Without this Sass emits a BOM, which postcss 8.5.24+ keeps.
// A BOM in the middle of a stylesheet kills the rule after it.
charset: false
}
}
}
],
// https://stackoverflow.com/a/60482491/389684
sideEffects: true
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"url": "git@github.com:apostrophecms/apostrophe.git"
},
"engines": {
"node": ">=16.0.0"
"node": ">=22.0.0"
},
"keywords": [
"apostrophe",
Expand Down Expand Up @@ -154,7 +154,7 @@
"nyc": "^15.1.0",
"replace-in-file": "^6.1.0",
"stylelint": "^14.6.1",
"stylelint-declaration-strict-value": "^1.8.0",
"stylelint-declaration-strict-value": "~1.10.11",
"stylelint-order": "^5.0.0",
"vue-eslint-parser": "^7.1.1"
},
Expand Down
7 changes: 2 additions & 5 deletions test/workspaces-project/app.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
module.exports = {
root: module,
shortName: 'workspaces-project',
baseUrl: 'http://localhost:3000',
modules: {
'@apostrophecms/express': {
options: {
address: '127.0.0.1'
}
},
'@apostrophecms/sitemap': {
options: {
baseUrl: 'http://localhost:3000'
}
}
'@apostrophecms/sitemap': {}
}
};
Loading