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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Feb 18, 2025
+1,189 −1,100
Merged

Upgrade Node.js and dependent packages #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d72c35e
Upgrade Node.js and dependent packages
yhatt Feb 16, 2025
6edae7e
Upgrade Node.js for test environments
yhatt Feb 16, 2025
da61806
Fix failed dependency and type error
yhatt Feb 17, 2025
1369e94
Rename WebSocketServer mock
yhatt Feb 17, 2025
381bc16
Upgrade browser-tools orb to version 1.5.1
yhatt Feb 17, 2025
6680031
Fix Prettier
yhatt Feb 17, 2025
93564c3
[ci skip] Update CHANGELOG.md
yhatt Feb 18, 2025
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
browser-tools: circleci/[email protected].0
browser-tools: circleci/[email protected].1
codecov: codecov/[email protected]

executors:
Expand All @@ -12,7 +12,7 @@ executors:
default: false
version:
type: string
default: '22.12.0' # Specify LTS major and minor for development
default: '22.14.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
6 changes: 3 additions & 3 deletions .github/workflows/test-win.yml
View file
Open in desktop
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.5'
- '^20.18.1'
- '22.12.0'
- '^18.20.6'
- '^20.18.3'
- '22.14.0'

steps:
# - name: Output concurrency group
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.12.0
22.14.0
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Changed

- Upgrade dependent packages to the latest versions ([#648](https://github.com/marp-team/marp-cli/pull/648))
- Use arm64 hosted runner to build container image for ARM64 ([#635](https://github.com/marp-team/marp-cli/issues/635), [#637](https://github.com/marp-team/marp-cli/pull/637))

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

#################### Create Marp CLI image ####################
FROM node:22.12.0-bookworm-slim
FROM node:22.14.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