Skip to content

Commit 31307d1

Browse files
committed
Merge branch 'main' into print-color-adjust
2 parents f25f3a3 + c0f5c43 commit 31307d1

File tree

8 files changed

+2547
-1289
lines changed

8 files changed

+2547
-1289
lines changed

.circleci/config.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ jobs:
9898
name: node
9999
version: '18.20'
100100
steps:
101-
- prepare
102-
- lint
101+
- prepare:
102+
force: true
103103
- test
104104

105105
test-node20:
106106
executor:
107107
name: node
108-
version: '20.18'
108+
version: '20.19'
109109
steps:
110110
- prepare
111111
- lint
@@ -114,7 +114,16 @@ jobs:
114114
test-node22:
115115
executor:
116116
name: node
117-
version: '22.12.0' # Specify LTS version for development
117+
version: '22.15.0' # Specify LTS version for development
118+
steps:
119+
- prepare
120+
- lint
121+
- test
122+
123+
test-node24:
124+
executor:
125+
name: node
126+
version: '24.0'
118127
steps:
119128
- prepare
120129
- lint
@@ -133,3 +142,6 @@ workflows:
133142
- test-node22:
134143
requires:
135144
- audit
145+
- test-node24:
146+
requires:
147+
- audit

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.12.0
1+
22.15.0

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## [Unreleased]
44

5+
### Added
6+
7+
- Test against Node.js 24 ([#413](https://github.com/marp-team/marpit/pull/413))
8+
9+
### Changed
10+
11+
- Upgrade Node.js LTS and dependent packages to the latest version ([#413](https://github.com/marp-team/marpit/pull/413))
12+
513
## v3.1.2 - 2024-12-23
614

715
### Changed

docs/jsdoc.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ section td {
2121

2222
.attributes,
2323
.default {
24-
word-break: break-word;
24+
overflow-wrap: anywhere;
2525
}

docsify/_layout.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ body * {
172172
@media (width <= 30em) {
173173
.table-wrapper {
174174
overflow-x: auto;
175-
overflow-x: overlay;
176175
-webkit-overflow-scrolling: touch;
177176

178177
th,

eslint.config.mjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import babelParser from '@babel/eslint-parser'
22
import js from '@eslint/js'
33
import eslintConfigPrettier from 'eslint-config-prettier'
4-
import eslintPluginImportX from 'eslint-plugin-import-x'
4+
import eslintPluginImportX, {
5+
flatConfigs as eslintPluginImportXConfigs,
6+
} from 'eslint-plugin-import-x'
57
import globals from 'globals'
68

79
export default [
810
js.configs.recommended,
9-
eslintPluginImportX.flatConfigs.recommended,
11+
eslintPluginImportXConfigs.recommended,
1012
eslintConfigPrettier,
1113
{
1214
languageOptions: {

0 commit comments

Comments
 (0)