From d5ccfc4e33ce4394cacf6df96a486cc6fd2e0244 Mon Sep 17 00:00:00 2001
From: Yuki Hattori <yukihattori1116@gmail.com>
Date: Sun, 15 Sep 2024 20:52:19 +0900
Subject: [PATCH] Upgrade development Node.js to v20 LTS

---
 .circleci/config.yml           | 23 +++++++++++++++++++----
 .github/workflows/test-win.yml | 11 ++++++-----
 .nvmrc                         |  2 +-
 Dockerfile                     |  2 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e6f90a4c..0543084c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,7 +12,7 @@ executors:
         default: false
       version:
         type: string
-        default: '18.18.0' # Specify LTS major and minor for development
+        default: '20.17.0' # Specify LTS major and minor for development
     docker:
       - image: cimg/node:<< parameters.version >><<# parameters.browser >>-browsers<</ parameters.browser >>
     working_directory: ~/marp-cli
@@ -36,7 +36,7 @@ commands:
         default: []
       yarn:
         type: string
-        default: '^1.22.17'
+        default: '^1.22.22'
     steps:
       - run:
           name: Upgrade yarn for current user
@@ -185,11 +185,12 @@ jobs:
     steps:
       - audit
 
+  # Testing
   test-node16:
     executor:
       name: node
       browser: true
-      version: '16.18'
+      version: '16.20'
     steps:
       - test:
           force: true
@@ -199,6 +200,7 @@ jobs:
     executor:
       name: node
       browser: true
+      version: '18.20'
     steps:
       - test:
           browser: true
@@ -207,11 +209,20 @@ jobs:
     executor:
       name: node
       browser: true
-      version: '20.9'
     steps:
       - test:
           browser: true
 
+  test-node22:
+    executor:
+      name: node
+      browser: true
+      version: '22.8'
+    steps:
+      - test:
+          browser: true
+
+  # Docker
   docker-build-latest:
     executor: node
     steps:
@@ -250,6 +261,9 @@ workflows:
       - test-node20:
           requires:
             - audit
+      - test-node22:
+          requires:
+            - audit
 
       # Docker (latest)
       - docker-build-latest:
@@ -257,6 +271,7 @@ workflows:
             - test-node16
             - test-node18
             - test-node20
+            - test-node22
           filters:
             branches:
               only: main
diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
index 0a9be2e0..16702cf7 100644
--- a/.github/workflows/test-win.yml
+++ b/.github/workflows/test-win.yml
@@ -9,7 +9,7 @@ on:
 #   cancel-in-progress: true
 
 env:
-  YARN_VERSION: '^1.22.19'
+  YARN_VERSION: '^1.22.22'
 
 jobs:
   win-test:
@@ -19,11 +19,12 @@ jobs:
       fail-fast: false
       matrix:
         node-version:
-          - '^16.18.1'
-          - '18.18.0'
-          - '^20.9.0'
+          - '^16.20.2'
+          - '^18.20.4'
+          - '20.17.0'
+          - '^22.8.0'
         include:
-          - node-version: '^16.18.1'
+          - node-version: '^16.20.2'
             force: true
 
     steps:
diff --git a/.nvmrc b/.nvmrc
index 02c8b485..3516580b 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18.18.0
+20.17.0
diff --git a/Dockerfile b/Dockerfile
index 05abe777..f7dd4705 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.17.0-alpine
+FROM node:20.17.0-alpine
 LABEL maintainer "Marp team"
 
 RUN apk update && apk upgrade && \