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 #502

Merged
merged 6 commits into from
Feb 18, 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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ executors:
default: false
version:
type: string
default: '18.12' # Specify LTS major and minor for development
default: '18.14.1' # Specify LTS major and minor for development
docker:
- image: cimg/node:<< parameters.version >><<# parameters.browser >>-browsers<</ parameters.browser >>
working_directory: ~/marp-cli
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
node-version:
- '^14.21.1'
- '^16.18.1'
- '18.13.0'
- '18.14.1'

steps:
# - name: Output concurrency group
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.13.0
18.14.1
1 change: 0 additions & 1 deletion .stylelintrc.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
extends:
- stylelint-config-standard-scss
- stylelint-config-prettier

rules:
at-rule-no-unknown:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## [Unreleased]

### Changed

- Upgrade Marp Core to [v3.5.0](https://github.com/marp-team/marp-core/releases/v3.5.0) ([#502](https://github.com/marp-team/marp-cli/pull/502))
- Upgrade Node.js and dependent packages ([#502](https://github.com/marp-team/marp-cli/pull/502))

## v2.3.0 - 2023-01-08

### Breaking
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.13.0-alpine
FROM node:18.14.1-alpine
LABEL maintainer "Marp team"

RUN apk update && apk upgrade && \
Expand Down
63 changes: 31 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,50 +68,50 @@
},
"devDependencies": {
"@babel/preset-env": "^7.20.2",
"@rollup/plugin-alias": "^4.0.2",
"@rollup/plugin-commonjs": "^24.0.0",
"@rollup/plugin-alias": "^4.0.3",
"@rollup/plugin-commonjs": "^24.0.1",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-terser": "^0.3.0",
"@rollup/plugin-terser": "^0.4.0",
"@rollup/plugin-typescript": "^11.0.0",
"@rollup/plugin-url": "^8.0.1",
"@tsconfig/node14": "^1.0.3",
"@types/cheerio": "^0.22.31",
"@types/express": "^4.17.15",
"@types/jest": "^29.2.5",
"@types/express": "^4.17.17",
"@types/jest": "^29.4.0",
"@types/markdown-it": "^12.2.3",
"@types/node": "~18.11.18",
"@types/node": "~18.14.0",
"@types/pug": "^2.0.6",
"@types/supertest": "^2.0.12",
"@types/ws": "^8.5.4",
"@types/yargs": "^17.0.19",
"@typescript-eslint/eslint-plugin": "^5.48.0",
"@typescript-eslint/parser": "^5.48.0",
"@types/yargs": "^17.0.22",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"autoprefixer": "^10.4.13",
"babel-plugin-transform-rename-import": "^2.3.0",
"bespoke": "bespokejs/bespoke",
"builtin-modules": "^3.3.0",
"chalk": "^5.2.0",
"cheerio": "^1.0.0-rc.12",
"chrome-launcher": "^0.15.1",
"cssnano": "^5.1.14",
"eslint": "^8.31.0",
"cssnano": "^5.1.15",
"eslint": "^8.34.0",
"eslint-config-prettier": "^8.6.0",
"eslint-import-resolver-exports": "^1.0.0-beta.3",
"eslint-import-resolver-typescript": "^3.5.2",
"eslint-plugin-import": "^2.26.0",
"eslint-import-resolver-exports": "^1.0.0-beta.4",
"eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.1",
"express": "^4.18.2",
"fast-plist": "^0.1.3",
"get-stdin": "^9.0.0",
"globby": "^13.1.3",
"image-size": "^1.0.2",
"is-docker": "^3.0.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"jest": "^29.4.3",
"jest-environment-jsdom": "^29.4.3",
"jest-junit": "^15.0.0",
"nanoid": "^4.0.0",
"nanoid": "^4.0.1",
"npm-run-all": "^4.1.5",
"os-locale": "^6.0.2",
"pdf-lib": "^1.17.1",
Expand All @@ -121,44 +121,43 @@
"postcss": "^8.4.21",
"postcss-url": "^10.1.3",
"pptxgenjs": "^3.11.0",
"prettier": "^2.8.2",
"prettier": "^2.8.4",
"pug": "^3.0.2",
"rimraf": "^3.0.2",
"rollup": "^3.9.1",
"rimraf": "^4.1.2",
"rollup": "^3.17.1",
"rollup-plugin-license": "^3.0.1",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-pug": "^1.1.1",
"sass": "^1.57.1",
"sass": "^1.58.3",
"strip-ansi": "^7.0.1",
"stylelint": "^14.16.1",
"stylelint-config-prettier": "^9.0.4",
"stylelint-config-standard-scss": "^6.1.0",
"stylelint": "^15.1.0",
"stylelint-config-standard-scss": "^7.0.1",
"supertest": "^6.3.3",
"tar-stream": "^3.0.0",
"ts-jest": "^29.0.3",
"ts-jest": "^29.0.5",
"ts-key-enum": "^3.0.12",
"tslib": "^2.4.1",
"tslib": "^2.5.0",
"typed-emitter": "^2.1.0",
"typescript": "^4.9.4",
"typescript": "^4.9.5",
"vhtml": "^2.2.0",
"wrap-ansi": "^8.0.1",
"wrap-ansi": "^8.1.0",
"yauzl": "^2.10.0",
"zip-stream": "^4.1.0"
},
"dependencies": {
"@marp-team/marp-core": "^3.4.2",
"@marp-team/marp-core": "^3.5.0",
"@marp-team/marpit": "^2.4.2",
"chokidar": "^3.5.3",
"cosmiconfig": "^8.0.0",
"import-from": "^4.0.0",
"is-wsl": "^2.2.0",
"puppeteer-core": "19.4.1",
"puppeteer-core": "19.7.1",
"remove": "^0.1.5",
"serve-index": "^1.9.1",
"tmp": "^0.2.1",
"v8-compile-cache": "^2.3.0",
"ws": "^8.12.0",
"yargs": "^17.6.2"
"ws": "^8.12.1",
"yargs": "^17.7.0"
},
"resolutions": {
"pug": "^3.0.2",
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/cover.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
transform: translateX(10%);
}
}

@keyframes marp-incoming-transition-backward-__builtin__cover {
@include utils.send-backward;
}
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/coverflow.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
z-index: 0;
}
}

@keyframes marp-incoming-transition-__builtin__coverflow {
from {
animation-timing-function: ease-in-out;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/cube.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
translateZ(50vw);
}
}

@keyframes marp-incoming-transition-__builtin__cube {
from {
z-index: 0;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/diamond.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@keyframes marp-incoming-transition-backward-__builtin__diamond {
@include utils.send-backward;
}

@keyframes marp-outgoing-transition-backward-__builtin__diamond {
0% {
clip-path: polygon(50% -50%, 150% 50%, 50% 150%, -50% 50%);
Expand Down
2 changes: 2 additions & 0 deletions src/engine/transition/keyframes/drop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
box-shadow: var(--bespoke-marp-transition-drop-shadow);
}
}

@keyframes marp-outgoing-transition-__builtin__drop {
35% {
filter: none;
Expand All @@ -50,6 +51,7 @@
filter: none;
}
}

@keyframes marp-outgoing-transition-backward-__builtin__drop {
0% {
z-index: 1;
Expand Down
2 changes: 2 additions & 0 deletions src/engine/transition/keyframes/explode.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@keyframes marp-incoming-transition-__builtin__explode {
@include utils.send-backward;
}

@keyframes marp-outgoing-transition-__builtin__explode {
from {
animation-timing-function: ease-out;
Expand All @@ -21,5 +22,6 @@
opacity: 0;
}
}

@keyframes marp-outgoing-transition-backward-__builtin__explode {
}
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/fade.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
opacity: 0;
}
}

@keyframes marp-incoming-transition-__builtin__fade {
from {
mix-blend-mode: plus-lighter;
Expand Down
2 changes: 2 additions & 0 deletions src/engine/transition/keyframes/fall.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@keyframes marp-incoming-transition-__builtin__fall {
@include utils.send-backward;
}

@keyframes marp-outgoing-transition-__builtin__fall {
from {
animation-timing-function: cubic-bezier(0.4, 0, 1, 0.6);
Expand Down Expand Up @@ -30,5 +31,6 @@
transform-origin: 50% 100%;
}
}

@keyframes marp-outgoing-transition-backward-__builtin__fall {
}
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/flip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
opacity: 0;
}
}

@keyframes marp-incoming-transition-__builtin__flip {
0% {
opacity: 0;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/glow.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
opacity: 0;
}
}

@keyframes marp-incoming-transition-__builtin__glow {
@include utils.send-backward;

Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/implode.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@keyframes marp-incoming-transition-backward-__builtin__implode {
@include utils.send-backward;
}

@keyframes marp-outgoing-transition-backward-__builtin__implode {
from {
animation-timing-function: ease-out;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/in-out.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
scale(0.45) translateX(calc(var(--marp-transition-direction, 1) * -25vw));
}
}

@keyframes marp-incoming-transition-__builtin__in-out {
0% {
z-index: -1;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/iris-in.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
clip-path: circle(0);
}
}

@keyframes marp-incoming-transition-backward-__builtin__iris-in {
@include utils.send-backward;
}
2 changes: 2 additions & 0 deletions src/engine/transition/keyframes/iris-out.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
clip-path: circle(0);
}
}

@keyframes marp-incoming-transition-__builtin__iris-out {
@include utils.send-backward;
}
Expand All @@ -22,5 +23,6 @@
clip-path: circle(75vmax);
}
}

@keyframes marp-outgoing-transition-backward-__builtin__iris-out {
}
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/overlap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
filter: contrast(0);
}
}

@keyframes marp-incoming-transition-__builtin__overlap {
0% {
mix-blend-mode: overlay;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/pivot.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@keyframes marp-incoming-transition-backward-__builtin__pivot {
@include utils.send-backward;
}

@keyframes marp-outgoing-transition-backward-__builtin__pivot {
from {
transform-origin: left top;
Expand Down
2 changes: 2 additions & 0 deletions src/engine/transition/keyframes/pull.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
transform: translateX(-100%);
}
}

@keyframes marp-incoming-transition-__builtin__pull {
@include utils.send-backward;
}
Expand All @@ -19,5 +20,6 @@
transform: translateX(-100%);
}
}

@keyframes marp-outgoing-transition-backward-__builtin__pull {
}
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/push.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
transform: translateX(100%);
}
}

@keyframes marp-incoming-transition-backward-__builtin__push {
@include utils.send-backward;
}
2 changes: 2 additions & 0 deletions src/engine/transition/keyframes/reveal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
transform: translateX(-10%);
}
}

@keyframes marp-incoming-transition-__builtin__reveal {
@include utils.send-backward;
}

@keyframes marp-outgoing-transition-backward-__builtin__reveal {
}

@keyframes marp-incoming-transition-backward-__builtin__reveal {
from {
opacity: 0;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/rotate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
opacity: 0;
}
}

@keyframes marp-incoming-transition-__builtin__rotate {
from {
opacity: 0;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/slide.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
animation-timing-function: ease-in-out;
}
}

@keyframes marp-outgoing-transition-__builtin__slide {
from {
animation-timing-function: ease-in-out;
Expand Down
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/star.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
}
}
}

@keyframes marp-incoming-transition-backward-__builtin__star {
@include utils.send-backward;
}
1 change: 1 addition & 0 deletions src/engine/transition/keyframes/swap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
z-index: 0;
}
}

@keyframes marp-incoming-transition-__builtin__swap {
0% {
filter: brightness(0.75);
Expand Down
Loading