Merge pull request #309 from marp-team/upgrade-node-and-dependencies

Upgrade Node LTS and dependent packages to the latest version

.circleci/config.yml

@@ -32,23 +32,23 @@ commands:
         default: []
       yarn:
         type: string
-        default: '^1.22.4'
+        default: '^1.22.5'
     steps:
       - run:
           name: Upgrade yarn for current user
           command: cd ~ && yarn policies set-version << parameters.yarn >>
 
       - restore_cache:
           keys:
-            - v2.2-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
-            - v2.2-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
-            - v2.2-dependencies-{{ .Environment.CIRCLE_JOB }}-
+            - v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
+            - v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-
+            - v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-
 
       - run: yarn install
       - steps: << parameters.postinstall >>
 
       - save_cache:
-          key: v2.2-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
+          key: v2.3-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
           paths:
             - ~/.cache/yarn
 
@@ -140,15 +140,15 @@ jobs:
     executor:
       name: node
       browser: true
-      version: '12.18.2' # Specify LTS version for development
+      version: '12'
     steps:
       - test
 
   test-node14:
     executor:
       name: node
       browser: true
-      version: '14'
+      version: '14.15.1' # Specify LTS version for development
     steps:
       - test
 

.github/workflows/test-win.yml

@@ -5,7 +5,7 @@ on:
   - push
 
 env:
-  YARN_VERSION: '^1.22.4'
+  YARN_VERSION: '^1.22.5'
 
 jobs:
   validate:
@@ -23,8 +23,8 @@ jobs:
       matrix:
         node-version:
           - '^10.17.0'
-          - '12.18.2'
-          - '^14.5.0'
+          - '^12.20.0'
+          - '14.15.1'
 
     steps:
       - uses: actions/checkout@v2

.nvmrc

@@ -1 +1 @@
-12.18.2
+14.15.1

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Upgrade [Marpit v1.6.3](https://github.com/marp-team/marpit/releases/tag/v1.6.3) and [Marp Core v1.4.0](https://github.com/marp-team/marp-core/releases/tag/v1.4.0) ([#309](https://github.com/marp-team/marp-cli/pull/309))
+- Upgrade Node.js to 14 ([#309](https://github.com/marp-team/marp-cli/pull/309))
+- Upgrade dependent packages to the latest version ([#309](https://github.com/marp-team/marp-cli/pull/309))
+
 ## v0.22.1 - 2020-11-28
 
 ### Added

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.18.2-alpine
+FROM node:14.15.1-alpine
 LABEL maintainer "Marp team"
 
 RUN apk update && apk upgrade && \

package.json

@@ -63,31 +63,31 @@
     "watch": "rollup -w -c"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^16.0.0",
+    "@rollup/plugin-commonjs": "^17.0.0",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^10.0.0",
+    "@rollup/plugin-node-resolve": "^11.0.0",
     "@rollup/plugin-replace": "^2.3.4",
-    "@rollup/plugin-typescript": "^6.1.0",
-    "@rollup/plugin-url": "^5.0.1",
+    "@rollup/plugin-typescript": "^8.0.0",
+    "@rollup/plugin-url": "^6.0.0",
     "@types/cheerio": "^0.22.22",
     "@types/express": "^4.17.9",
-    "@types/jest": "^26.0.15",
-    "@types/node": "~12.19.7",
+    "@types/jest": "^26.0.16",
+    "@types/node": "~14.14.10",
     "@types/pug": "^2.0.4",
-    "@types/puppeteer": "^5.4.0",
+    "@types/puppeteer": "^5.4.1",
     "@types/supertest": "^2.0.10",
     "@types/ws": "^7.4.0",
-    "@types/yargs": "^15.0.10",
-    "@typescript-eslint/eslint-plugin": "^4.8.2",
-    "@typescript-eslint/parser": "^4.8.2",
+    "@types/yargs": "^15.0.11",
+    "@typescript-eslint/eslint-plugin": "^4.9.0",
+    "@typescript-eslint/parser": "^4.9.0",
     "autoprefixer": "^9.8.6",
     "bespoke": "bespokejs/bespoke",
     "builtin-modules": "^3.1.0",
     "chalk": "^4.1.0",
     "cheerio": "^1.0.0-rc.3",
     "codecov": "^3.8.1",
     "cssnano": "^4.1.10",
-    "eslint": "^7.14.0",
+    "eslint": "^7.15.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^24.1.3",
@@ -98,7 +98,7 @@
     "jest": "^26.6.3",
     "jest-junit": "^12.0.0",
     "mkdirp": "^1.0.4",
-    "nanoid": "^3.1.18",
+    "nanoid": "^3.1.20",
     "npm-run-all": "^4.1.5",
     "os-locale": "^5.0.0",
     "pkg": "^4.4.9",
@@ -108,11 +108,11 @@
     "prettier": "^2.2.1",
     "pug": "^3.0.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.33.3",
+    "rollup": "^2.34.1",
     "rollup-plugin-postcss": "^3.1.8",
     "rollup-plugin-pug": "^1.1.1",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.29.0",
+    "sass": "^1.30.0",
     "screenfull": "^5.0.2",
     "strip-ansi": "^6.0.0",
     "stylelint": "^13.8.0",
@@ -131,8 +131,8 @@
     "zip-stream": "^4.0.4"
   },
   "dependencies": {
-    "@marp-team/marp-core": "^1.3.0",
-    "@marp-team/marpit": "^1.6.2",
+    "@marp-team/marp-core": "^1.4.0",
+    "@marp-team/marpit": "^1.6.3",
     "chokidar": "^3.4.3",
     "chrome-launcher": "^0.13.4",
     "cosmiconfig": "^7.0.0",
@@ -144,7 +144,7 @@
     "serve-index": "^1.9.1",
     "tmp": "^0.2.1",
     "v8-compile-cache": "^2.2.0",
-    "ws": "^7.4.0",
+    "ws": "^7.4.1",
     "yargs": "^16.1.1"
   },
   "publishConfig": {

src/marp-cli.ts

@@ -213,7 +213,10 @@ export const marpCli = async (
         },
       })
 
-    const args = program.argv
+    const args = {
+      ...program.argv,
+      _: program.argv._.map((v) => v.toString()),
+    }
 
     if (args.help) {
       program.showHelp()