Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Node.js and dependent packages to the latest version #358

Merged
merged 7 commits into from
Oct 15, 2023
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
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,15 @@ jobs:
name: node
version: '16.20'
steps:
- prepare
- prepare:
force: true
- lint
- test

test-node18:
executor:
name: node
version: '18.17.0' # Specify LTS version for development
version: '18.18.1' # Specify LTS version for development
steps:
- prepare
- lint
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.0
18.18.2
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

## [Unreleased]

### Changed

- Upgrade Marpit to [v2.6.1](https://github.com/marp-team/marpit/releases/v2.6.1) ([#358](https://github.com/marp-team/marp-core/pull/358))
- Added `cssContainerQuery` constructor option
- Added `lang` global directive and constructor option
- Slightly changed the color scheme of `default` theme to match as the current GitHub style ([#358](https://github.com/marp-team/marp-core/pull/358))
- Upgrade Node.js and dependent packages to the latest version ([#358](https://github.com/marp-team/marp-core/pull/358))

## v3.8.1 - 2023-09-11

### Changed
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ module.exports = {
...tsjPreset.transform,
'^.*\\.s[ac]ss$': '<rootDir>/test/_transformers/sass.js',
},
prettierPath: null,
}
67 changes: 32 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,32 +65,32 @@
"exec": "npx @marp-team/marp-cli@latest -y"
},
"devDependencies": {
"@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-commonjs": "^25.0.3",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.1.0",
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-terser": "^0.4.3",
"@rollup/plugin-typescript": "^11.1.2",
"@rollup/plugin-alias": "^5.0.1",
"@rollup/plugin-commonjs": "^25.0.5",
"@rollup/plugin-json": "^6.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.3",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^11.1.5",
"@tsconfig/node12": "^12.1.0",
"@twemoji/api": "^14.1.2",
"@types/jest": "^29.5.3",
"@typescript-eslint/eslint-plugin": "^6.2.1",
"@typescript-eslint/parser": "^6.2.1",
"autoprefixer": "^10.4.14",
"@types/jest": "^29.5.5",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"autoprefixer": "^10.4.16",
"cheerio": "^1.0.0-rc.12",
"cssnano": "^6.0.1",
"emoji-regex": "^10.2.1",
"eslint": "^8.46.0",
"eslint-config-prettier": "^8.9.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-jest": "^27.2.3",
"github-markdown-css": "^5.2.0",
"jest": "^29.6.2",
"jest-environment-jsdom": "^29.6.2",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jest": "^27.4.2",
"github-markdown-css": "^5.3.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-junit": "^16.0.0",
"jest-plugin-context": "^2.9.0",
"markdown-it": "^13.0.1",
"markdown-it": "^13.0.2",
"markdown-it-emoji": "^2.0.2",
"mkdirp": "^3.0.1",
"nodemon": "^3.0.1",
Expand All @@ -99,34 +99,31 @@
"postcss-minify-selectors": "^6.0.0",
"postcss-normalize-whitespace": "^6.0.0",
"postcss-url": "^10.1.3",
"prettier": "^3.0.0",
"rimraf": "^5.0.1",
"rollup": "^3.27.0",
"prettier": "^3.0.3",
"rimraf": "^5.0.5",
"rollup": "^4.1.1",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-string": "^3.0.0",
"sass": "^1.64.2",
"sass-extended-importer": "^0.4.2",
"sass": "^1.69.3",
"sass-extended-importer": "^1.0.1",
"self-closing-tags": "^1.0.1",
"stylelint": "^15.10.2",
"stylelint": "^15.10.3",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-standard-scss": "^10.0.0",
"stylelint-config-standard-scss": "^11.0.0",
"ts-jest": "29.1.1",
"tslib": "^2.6.1",
"typescript": "^5.1.6"
"tslib": "^2.6.2",
"typescript": "^5.2.2"
},
"dependencies": {
"@marp-team/marpit": "^2.5.3",
"@marp-team/marpit": "^2.6.1",
"@marp-team/marpit-svg-polyfill": "^2.1.0",
"highlight.js": "^11.8.0",
"katex": "^0.16.8",
"highlight.js": "11.8.0",
"katex": "^0.16.9",
"mathjax-full": "^3.2.2",
"postcss": "^8.4.27",
"postcss": "^8.4.31",
"postcss-selector-parser": "^6.0.13",
"xss": "^1.0.14"
},
"resolutions": {
"sass-extended-importer/**/minimatch": "^3.1.2"
},
"publishConfig": {
"access": "public"
}
Expand Down
40 changes: 20 additions & 20 deletions test/__snapshots__/marp.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@

exports[`Marp math option with KaTeX injects KaTeX css with replacing web font URL to CDN: katex-css-cdn 1`] = `
[
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_AMS-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_AMS-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_AMS-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Caligraphic-Bold.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Caligraphic-Bold.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Caligraphic-Bold.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Caligraphic-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Caligraphic-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Caligraphic-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Fraktur-Bold.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Fraktur-Bold.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Fraktur-Bold.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Fraktur-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Fraktur-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Fraktur-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Bold.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Bold.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Bold.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-BoldItalic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-BoldItalic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-BoldItalic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Italic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Italic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Italic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Main-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Math-BoldItalic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Math-BoldItalic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Math-BoldItalic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Math-Italic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Math-Italic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Math-Italic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Bold.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Bold.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Bold.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Italic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Italic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Italic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_SansSerif-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Script-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Script-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Script-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size1-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size1-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size1-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size2-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size2-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size2-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size3-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size3-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size3-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size4-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size4-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Size4-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Typewriter-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Typewriter-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].8/dist/fonts/KaTeX_Typewriter-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_AMS-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_AMS-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_AMS-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Caligraphic-Bold.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Caligraphic-Bold.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Caligraphic-Bold.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Caligraphic-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Caligraphic-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Caligraphic-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Fraktur-Bold.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Fraktur-Bold.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Fraktur-Bold.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Fraktur-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Fraktur-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Fraktur-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Bold.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Bold.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Bold.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-BoldItalic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-BoldItalic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-BoldItalic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Italic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Italic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Italic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Main-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Math-BoldItalic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Math-BoldItalic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Math-BoldItalic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Math-Italic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Math-Italic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Math-Italic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Bold.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Bold.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Bold.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Italic.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Italic.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Italic.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_SansSerif-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Script-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Script-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Script-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size1-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size1-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size1-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size2-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size2-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size2-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size3-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size3-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size3-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size4-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size4-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Size4-Regular.ttf') format("truetype")",
"url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Typewriter-Regular.woff2') format("woff2"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Typewriter-Regular.woff') format("woff"),url('https://cdn.jsdelivr.net/npm/[email protected].9/dist/fonts/KaTeX_Typewriter-Regular.ttf') format("truetype")",
]
`;

Expand Down
1 change: 0 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": "@tsconfig/node12/tsconfig.json",
"compilerOptions": {
"module": "esnext",
"noImplicitAny": false,
"resolveJsonModule": true,
"rootDir": ".",
Expand Down
Loading