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 dependent packages to the latest version #557

Merged
merged 6 commits into from
Oct 28, 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
12 changes: 10 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ executors:
commands:
install:
parameters:
force:
type: boolean
default: false
postinstall:
type: steps
default: []
Expand All @@ -45,7 +48,7 @@ commands:
- v2.4-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
- v2.4-dependencies-{{ .Environment.CIRCLE_JOB }}-

- run: yarn install --frozen-lockfile
- run: yarn install --frozen-lockfile <<# parameters.force >>--ignore-engines<</ parameters.force >>
- steps: << parameters.postinstall >>

- save_cache:
Expand All @@ -65,11 +68,15 @@ commands:
browser:
type: boolean
default: false
force:
type: boolean
default: false
steps:
- run: node --version

- checkout
- install
- install:
force: << parameters.force >>

- when:
condition: << parameters.browser >>
Expand Down Expand Up @@ -185,6 +192,7 @@ jobs:
version: '16.18'
steps:
- test:
force: true
browser: true

test-node18:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
github-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: github.event_name == 'push'

- uses: marp-team/actions@v1
Expand All @@ -37,9 +37,9 @@ jobs:
- macOS-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
- name: Install yarn
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,18 @@ jobs:
node-version:
- '^16.18.1'
- '18.18.0'
include:
- node-version: '^16.18.1'
force: true

steps:
# - name: Output concurrency group
# run: echo "${{ github.workflow }}-${{ (github.ref_name == 'main' && github.run_id) || format('{0}-{1}', github.actor, github.head_ref || github.ref_name) }}"

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand All @@ -50,7 +53,7 @@ jobs:
yarn_cache-${{ runner.os }}-
- name: Install dependencies with yarn
run: yarn install --frozen-lockfile
run: yarn install --frozen-lockfile ${{ matrix.force && '--ignore-engines' || '' }}

# Retry tests up to 3 times due to flaky tests on Windows CI
# https://stackoverflow.com/a/59365905
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## [Unreleased]

### Changed

- Upgrade Marpit to [v2.6.1](https://github.com/marp-team/marpit/releases/tag/v2.6.1) ([#557](https://github.com/marp-team/marp-cli/pull/557))
- Upgrade Marp Core to [v3.9.0](https://github.com/marp-team/marp-core/releases/v3.9.0) ([#557](https://github.com/marp-team/marp-cli/pull/557))
- Upgrade dependent packages to the latest versions ([#557](https://github.com/marp-team/marp-cli/pull/557))

## v3.3.1 - 2023-10-01

### Fixed
Expand Down
71 changes: 35 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,42 +70,42 @@
"watch": "rollup -w -c"
},
"devDependencies": {
"@babel/preset-env": "^7.22.20",
"@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-terser": "^0.4.3",
"@rollup/plugin-typescript": "^11.1.3",
"@rollup/plugin-url": "^8.0.1",
"@babel/preset-env": "^7.23.2",
"@rollup/plugin-alias": "^5.0.1",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-json": "^6.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.4",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^11.1.5",
"@rollup/plugin-url": "^8.0.2",
"@tsconfig/node14": "^14.1.0",
"@types/cheerio": "^0.22.32",
"@types/express": "^4.17.17",
"@types/jest": "^29.5.5",
"@types/markdown-it": "^13.0.1",
"@types/cheerio": "^0.22.33",
"@types/express": "^4.17.20",
"@types/jest": "^29.5.6",
"@types/markdown-it": "^13.0.5",
"@types/node": "~16.18.38",
"@types/pug": "^2.0.6",
"@types/supertest": "^2.0.12",
"@types/ws": "^8.5.5",
"@types/yargs": "^17.0.24",
"@typescript-eslint/eslint-plugin": "^6.7.2",
"@typescript-eslint/parser": "^6.7.2",
"@types/pug": "^2.0.8",
"@types/supertest": "^2.0.15",
"@types/ws": "^8.5.8",
"@types/yargs": "^17.0.29",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"autoprefixer": "^10.4.16",
"babel-plugin-transform-rename-import": "^2.3.0",
"bespoke": "bespokejs/bespoke",
"builtin-modules": "^3.3.0",
"chalk": "^5.3.0",
"cheerio": "^1.0.0-rc.12",
"chrome-launcher": "^1.0.0",
"chrome-launcher": "^1.1.0",
"css.escape": "^1.5.1",
"cssnano": "^6.0.1",
"eslint": "^8.50.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-exports": "^1.0.0-beta.5",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jest": "^27.4.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jest": "^27.6.0",
"express": "^4.18.2",
"fast-plist": "^0.1.3",
"get-stdin": "^9.0.0",
Expand All @@ -114,30 +114,30 @@
"import-from": "^4.0.0",
"import-meta-resolve": "^3.0.0",
"is-inside-container": "^1.0.0",
"is-wsl": "^3.0.0",
"is-wsl": "^3.1.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-junit": "^16.0.0",
"nanoid": "^4.0.2",
"npm-run-all2": "^6.0.6",
"nanoid": "^5.0.2",
"npm-run-all2": "^6.1.1",
"os-locale": "^6.0.2",
"pdf-lib": "^1.17.1",
"pkg": "^5.8.1",
"pkg-up": "^4.0.0",
"portfinder": "1.0.32",
"postcss": "^8.4.30",
"postcss": "^8.4.31",
"postcss-url": "^10.1.3",
"pptxgenjs": "^3.12.0",
"prettier": "^3.0.3",
"pug": "^3.0.2",
"rimraf": "^5.0.1",
"rollup": "^3.29.2",
"rollup-plugin-license": "^3.1.0",
"rimraf": "^5.0.5",
"rollup": "^4.1.4",
"rollup-plugin-license": "^3.2.0",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-pug": "^1.1.1",
"sass": "^1.68.0",
"sass": "^1.69.5",
"strip-ansi": "^7.1.0",
"stylelint": "^15.10.3",
"stylelint": "^15.11.0",
"stylelint-config-standard-scss": "^11.0.0",
"supertest": "^6.3.3",
"tar-stream": "^3.1.6",
Expand All @@ -152,12 +152,11 @@
"zip-stream": "^5.0.1"
},
"dependencies": {
"@marp-team/marp-core": "^3.8.1",
"@marp-team/marpit": "^2.5.3",
"@marp-team/marp-core": "^3.9.0",
"@marp-team/marpit": "^2.6.1",
"chokidar": "^3.5.3",
"cosmiconfig": "^8.3.6",
"puppeteer-core": "21.3.4",
"remove": "^0.1.5",
"puppeteer-core": "21.4.1",
"serve-index": "^1.9.1",
"tmp": "^0.2.1",
"ws": "^8.14.2",
Expand Down
Loading