Skip to content

Commit

Permalink
Merge pull request #625 from marp-team/upgrade-node-and-dependencies
Browse files Browse the repository at this point in the history
Upgrade Node.js LTS and dependent packages to the latest version
  • Loading branch information
yhatt authored Dec 25, 2024
2 parents 4628dda + baa86e2 commit 96ddf1f
Show file tree
Hide file tree
Showing 18 changed files with 463 additions and 502 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: 2.1

orbs:
browser-tools: circleci/browser-tools@1.4.8
codecov: codecov/codecov@4.1.0
browser-tools: circleci/browser-tools@1.5.0
codecov: codecov/codecov@5.0.3

executors:
node:
Expand All @@ -12,7 +12,7 @@ executors:
default: false
version:
type: string
default: '20.17.0' # Specify LTS major and minor for development
default: '22.12.0' # Specify LTS major and minor for development
docker:
- image: cimg/node:<< parameters.version >><<# parameters.browser >>-browsers<</ parameters.browser >>
working_directory: ~/marp-cli
Expand Down Expand Up @@ -135,6 +135,7 @@ jobs:
executor:
name: node
browser: true
version: '20.18'
steps:
- prepare:
browser: true
Expand All @@ -145,7 +146,6 @@ jobs:
executor:
name: node
browser: true
version: '22.8'
steps:
- prepare:
browser: true
Expand Down
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ version: 2
updates:
- package-ecosystem: npm
directory: '/'
reviewers:
- 'marp-team/maintainers'
schedule:
interval: daily
allow:
Expand All @@ -13,8 +11,6 @@ updates:

- package-ecosystem: github-actions
directory: '/'
reviewers:
- 'marp-team/maintainers'
schedule:
interval: weekly
# versioning-strategy: increase-if-necessary
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
fail-fast: false
matrix:
node-version:
- '^18.20.4'
- '20.17.0'
- '^22.8.0'
- '^18.20.5'
- '^20.18.1'
- '22.12.0'

steps:
# - name: Output concurrency group
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
name: coverage-${{ matrix.node-version }}
path: coverage

- uses: codecov/codecov-action@v4
- uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: windows
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.17.0
22.12.0
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@

### Changed

- Upgrade dependent packages to the latest versions ([#623](https://github.com/marp-team/marp-cli/pull/623))
- Upgrade dependent packages to the latest versions ([#623](https://github.com/marp-team/marp-cli/pull/623), [#625](https://github.com/marp-team/marp-cli/pull/625))
- Upgrade Marpit to [v3.1.2](https://github.com/marp-team/marpit/releases/tag/v3.1.2) ([#625](https://github.com/marp-team/marp-cli/pull/625))
- Upgrade Marp Core to [v4.0.1](https://github.com/marp-team/marp-core/releases/v4.0.1) ([#625](https://github.com/marp-team/marp-cli/pull/625))
- Upgrade Node.js LTS version to the latest version ([#625](https://github.com/marp-team/marp-cli/pull/625))

## v4.0.3 - 2024-11-06

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#################### Build Marp CLI ####################
FROM --platform=$BUILDPLATFORM node:20.17.0-bookworm-slim AS build
FROM --platform=$BUILDPLATFORM node:22.12.0-bookworm-slim AS build
WORKDIR /home/node/marp-cli
COPY . .
RUN npm ci && npm run build

#################### Create Marp CLI image ####################
FROM node:20.17.0-bookworm-slim
FROM node:22.12.0-bookworm-slim

# Set up user for Marp CLI
RUN groupadd -r marp && useradd -r -g marp marp && mkdir -p /home/marp/app /home/marp/.cli && chown -R marp:marp /home/marp
Expand Down
Loading

0 comments on commit 96ddf1f

Please sign in to comment.