Merge pull request #365 from marp-team/upgrade-dependencies

Upgrade dependent packages to the latest

Author: yhatt

.circleci/config.yml

@@ -158,25 +158,25 @@ jobs:
     executor:
       name: node
       browser: true
-      version: '12'
+      version: '12.22'
     steps:
       - test
 
   test-node14:
     executor:
       name: node
       browser: true
-      version: '14.16.1' # Specify LTS version for development
+      version: '14.17.3' # Specify LTS version for development
     steps:
       - test
 
-  # test-node16:
-  #   executor:
-  #     name: node
-  #     browser: true
-  #     version: '16'
-  #   steps:
-  #     - test
+  test-node16:
+    executor:
+      name: node
+      browser: true
+      version: '16.5'
+    steps:
+      - test
 
   docker-image-latest:
     executor: docker
@@ -202,14 +202,14 @@ workflows:
       - test-node14:
           requires:
             - audit
-      # - test-node16:
-      #     requires:
-      #       - audit
+      - test-node16:
+          requires:
+            - audit
       - docker-image-latest:
           requires:
             - test-node12
             - test-node14
-            # - test-node16
+            - test-node16
           filters:
             branches:
               only: main

.github/workflows/test-win.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         node-version:
           - '^12.20.0'
-          - '14.16.1'
+          - '14.17.3'
           - '^16.0.0'
 
     steps:
@@ -45,8 +45,13 @@ jobs:
       - name: Install dependencies with yarn
         run: yarn install
 
+      # Retry tests up to 3 times due to flaky tests on Windows CI
+      # https://stackoverflow.com/a/59365905
       - name: Jest
-        run: yarn test:coverage --ci -i --reporters=default --reporters=jest-junit
+        run: >-
+          yarn test:coverage --ci -i --reporters=default --reporters=jest-junit ||
+          yarn test:coverage --ci -i --reporters=default --reporters=jest-junit --no-cache ||
+          yarn test:coverage --ci -i --reporters=default --reporters=jest-junit --no-cache
         env:
           CI: true
 

.nvmrc

@@ -1 +1 @@
-14.16.1
+14.17.3

CHANGELOG.md

@@ -2,10 +2,22 @@
 
 ## [Unreleased]
 
+### Breaking
+
+- Now required Node.js 12.20 and later ([#365](https://github.com/marp-team/marp-cli/pull/365))
+
 ### Added
 
 - Installation guide for Homebrew ([#353](https://github.com/marp-team/marp-cli/pull/353))
-- Mention Node.js >= 12 requirement in README ([#359](https://github.com/marp-team/marp-cli/issues/359), [#361](https://github.com/marp-team/marp-cli/pull/361) by [@jlevon](https://github.com/jlevon))
+- Mention Node.js >= 12.20 requirement in README ([#359](https://github.com/marp-team/marp-cli/issues/359), [#361](https://github.com/marp-team/marp-cli/pull/361) by [@jlevon](https://github.com/jlevon), [#365](https://github.com/marp-team/marp-cli/pull/365))
+
+### Changed
+
+- Upgrade Marpit to [v2.1.0](https://github.com/marp-team/marpit/releases/tag/v2.1.0) ([#365](https://github.com/marp-team/marp-cli/pull/365))
+  - Follow the latest [CommonMark spec 0.30](https://spec.commonmark.org/0.30/)
+- Upgrade Marp Core to [v2.1.0](https://github.com/marp-team/marp-core/releases/tag/v2.1.0) ([#365](https://github.com/marp-team/marp-cli/pull/365))
+  - [`math` global directive](https://github.com/marp-team/marp-core#math-global-directive) for switching math typesetting library in current Markdown
+- Upgrade dependent packages to the latest ([#365](https://github.com/marp-team/marp-cli/pull/365))
 
 ### Removed
 

Dockerfile

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

README.md

@@ -19,29 +19,28 @@ It can convert Marp / Marpit Markdown files into static HTML / CSS, PDF, PowerPo
 
 ### npx
 
-[npx](https://docs.npmjs.com/cli/v7/commands/npx) is the best way if you wanted
-one-shot Markdown conversion without install. Just run below if you have
-installed [Node.js](https://nodejs.org/). Only Node.js version 12 or higher
-works.
+[npx (`npm exec`)](https://docs.npmjs.com/cli/v7/commands/npx) is the best way to use the latest Marp CLI if you wanted
+one-shot Markdown conversion _without install_. Just run below if you have
+installed [Node.js](https://nodejs.org/) 12.20 and later.
 
 ```bash
 # Convert slide deck into HTML
-npx @marp-team/marp-cli slide-deck.md
-npx @marp-team/marp-cli slide-deck.md -o output.html
+npx @marp-team/marp-cli@latest slide-deck.md
+npx @marp-team/marp-cli@latest slide-deck.md -o output.html
 
 # Convert slide deck into PDF
-npx @marp-team/marp-cli slide-deck.md --pdf
-npx @marp-team/marp-cli slide-deck.md -o output.pdf
+npx @marp-team/marp-cli@latest slide-deck.md --pdf
+npx @marp-team/marp-cli@latest slide-deck.md -o output.pdf
 
 # Convert slide deck into PowerPoint document (PPTX)
-npx @marp-team/marp-cli slide-deck.md --pptx
-npx @marp-team/marp-cli slide-deck.md -o output.pptx
+npx @marp-team/marp-cli@latest slide-deck.md --pptx
+npx @marp-team/marp-cli@latest slide-deck.md -o output.pptx
 
 # Watch mode
-npx @marp-team/marp-cli -w slide-deck.md
+npx @marp-team/marp-cli@latest -w slide-deck.md
 
 # Server mode (Pass directory to serve)
-npx @marp-team/marp-cli -s ./slides
+npx @marp-team/marp-cli@latest -s ./slides
 ```
 
 > :information_source: You have to install [Google Chrome], [Chromium], or [Microsoft Edge] to convert slide deck into PDF, PPTX, and image(s).
@@ -60,6 +59,18 @@ Do you hate to install Node and Chrome locally? We have [an official Docker imag
 
 ## Install
 
+### Use package manager
+
+You can use the package manager to install/update Marp CLI easily.
+
+- **macOS**
+  - **[Homebrew](https://brew.sh/)**: `brew install marp-cli` ([Refer to the formula...](https://github.com/Homebrew/homebrew-core/blob/master/Formula/marp-cli.rb))
+
+* **Windows**
+  - **[Scoop](https://scoop.sh/)**: `scoop install marp` ([Refer to the manifest in Main bucket...](https://github.com/ScoopInstaller/Main/blob/master/bucket/marp.json))
+
+_Disclaimer: Package manifests are maintained by the community, not Marp team._
+
 ### Local installation
 
 We recommend to install Marp CLI into your Node project. You may control the CLI (and engine) version exactly.
@@ -68,7 +79,7 @@ We recommend to install Marp CLI into your Node project. You may control the CLI
 npm install --save-dev @marp-team/marp-cli
 ```
 
-The installed `marp` command is available in [npm-scripts](https://docs.npmjs.com/misc/scripts) or `npx marp`.
+Node.js 12.20 and later is required to install Marp CLI. The installed `marp` command is available in [npm-scripts](https://docs.npmjs.com/misc/scripts) or `npx marp`.
 
 #### Global installation
 
@@ -78,18 +89,6 @@ You can install with `-g` option if you want to use `marp` command globally.
 npm install -g @marp-team/marp-cli
 ```
 
-### Use package manager
-
-You can use the package manager to install/update Marp CLI easily.
-
-- **macOS**
-  - **[Homebrew](https://brew.sh/)**: `brew install marp-cli` ([Refer to the formula...](https://github.com/Homebrew/homebrew-core/blob/master/Formula/marp-cli.rb))
-
-* **Windows**
-  - **[Scoop](https://scoop.sh/)**: `scoop install marp` ([Refer to the manifest in Main bucket...](https://github.com/ScoopInstaller/Main/blob/master/bucket/marp.json))
-
-_Disclaimer: Package manifests are maintained by the community, not Marp team._
-
 ### [Standalone binary][releases]
 
 We also provide standalone binaries for Linux, macOS, and Windows.

babel.config.js

@@ -1,4 +1,7 @@
 // This setting is used only to transform ESM while running Jest.
 module.exports = {
   presets: [['@babel/env', { targets: { node: 'current' } }]],
+  plugins: [
+    ['transform-rename-import', { original: '^node:(.+)$', replacement: '$1' }],
+  ],
 }

jest.config.js

@@ -1,6 +1,6 @@
 const { jsWithBabel } = require('ts-jest/presets')
 
-const esModules = ['ansi-regex', 'strip-ansi']
+const esModules = ['ansi-regex', 'array-union', 'globby', 'slash', 'strip-ansi']
 
 module.exports = {
   collectCoverageFrom: ['src/**/*.ts', 'src/**/*.tsx'],

package.json

@@ -26,7 +26,7 @@
     "url": "https://github.com/marp-team/marp-cli"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=12.20"
   },
   "main": "lib/index.js",
   "types": "types/src/index.d.ts",
@@ -44,7 +44,7 @@
   "scripts": {
     "build": "yarn -s clean && rollup -c",
     "build:standalone": "run-s build standalone",
-    "check:audit": "echo \"[WARNING] Temporally limited yarn audit only to dependencies: https://github.com/marp-team/marp-cli/pull/347\" && yarn audit --groups dependencies",
+    "check:audit": "yarn audit",
     "check:format": "yarn -s format -c",
     "check:ts": "tsc --noEmit",
     "clean": "rimraf lib",
@@ -63,92 +63,93 @@
     "watch": "rollup -w -c"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.14.2",
-    "@rollup/plugin-commonjs": "^19.0.0",
+    "@babel/preset-env": "^7.14.8",
+    "@rollup/plugin-commonjs": "^19.0.1",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.0",
-    "@rollup/plugin-replace": "^2.4.2",
-    "@rollup/plugin-typescript": "^8.2.1",
+    "@rollup/plugin-node-resolve": "^13.0.2",
+    "@rollup/plugin-replace": "^3.0.0",
+    "@rollup/plugin-typescript": "^8.2.3",
     "@rollup/plugin-url": "^6.0.0",
-    "@types/cheerio": "^0.22.28",
-    "@types/express": "^4.17.11",
-    "@types/jest": "^26.0.23",
-    "@types/node": "~14.14.45",
-    "@types/pug": "^2.0.4",
+    "@types/cheerio": "^0.22.30",
+    "@types/express": "^4.17.13",
+    "@types/jest": "^26.0.24",
+    "@types/node": "~14.17.5",
+    "@types/pug": "^2.0.5",
     "@types/supertest": "^2.0.11",
-    "@types/ws": "^7.4.4",
-    "@types/yargs": "^16.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.24.0",
-    "@typescript-eslint/parser": "^4.24.0",
-    "autoprefixer": "^10.2.5",
+    "@types/ws": "^7.4.7",
+    "@types/yargs": "^17.0.2",
+    "@typescript-eslint/eslint-plugin": "^4.28.4",
+    "@typescript-eslint/parser": "^4.28.4",
+    "autoprefixer": "^10.3.1",
+    "babel-plugin-transform-rename-import": "^2.3.0",
     "bespoke": "bespokejs/bespoke",
     "builtin-modules": "^3.2.0",
     "chalk": "^4.1.1",
-    "cheerio": "^1.0.0-rc.9",
-    "codecov": "^3.8.2",
-    "cssnano": "^5.0.2",
-    "eslint": "^7.26.0",
+    "cheerio": "^1.0.0-rc.10",
+    "codecov": "^3.8.3",
+    "cssnano": "^5.0.7",
+    "eslint": "^7.31.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.2",
-    "eslint-plugin-jest": "^24.3.6",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-jest": "^24.4.0",
     "get-stdin": "^9.0.0",
+    "globby": "^12.0.0",
     "image-size": "^1.0.0",
     "is-wsl": "^2.2.0",
-    "jest": "^26.6.3",
-    "jest-junit": "^12.0.0",
+    "jest": "^27.0.6",
+    "jest-junit": "^12.2.0",
     "nanoid": "^3.1.23",
     "npm-run-all": "^4.1.5",
     "os-locale": "^5.0.0",
-    "pkg": "^5.1.0",
+    "pkg": "^5.3.1",
     "pkg-up": "^3.1.0",
     "portfinder": "^1.0.28",
-    "postcss": "^8.2.15",
+    "postcss": "^8.3.6",
     "postcss-url": "^10.1.3",
-    "prettier": "^2.3.0",
+    "prettier": "^2.3.2",
     "pug": "^3.0.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.48.0",
-    "rollup-plugin-license": "^2.3.0",
+    "rollup": "^2.53.3",
+    "rollup-plugin-license": "^2.5.0",
     "rollup-plugin-postcss": "^4.0.0",
     "rollup-plugin-pug": "^1.1.1",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.32.13",
+    "sass": "^1.35.2",
     "screenfull": "^5.1.0",
     "strip-ansi": "^7.0.0",
     "stylelint": "^13.13.1",
     "stylelint-config-prettier": "^8.0.2",
     "stylelint-config-standard": "^22.0.0",
-    "stylelint-scss": "^3.19.0",
-    "supertest": "^6.1.3",
+    "stylelint-scss": "^3.20.1",
+    "supertest": "^6.1.4",
     "tar-stream": "^2.2.0",
-    "ts-jest": "^26.5.6",
+    "ts-jest": "^27.0.4",
     "ts-key-enum": "^2.0.7",
-    "tslib": "^2.2.0",
-    "typescript": "^4.2.4",
+    "tslib": "^2.3.0",
+    "typescript": "^4.3.5",
     "vhtml": "^2.2.0",
     "wrap-ansi": "^8.0.0",
     "yauzl": "^2.10.0",
     "zip-stream": "^4.1.0"
   },
   "dependencies": {
-    "@marp-team/marp-core": "^2.0.3",
-    "@marp-team/marpit": "^2.0.1",
-    "chokidar": "^3.5.1",
-    "chrome-launcher": "^0.13.4",
+    "@marp-team/marp-core": "^2.1.0",
+    "@marp-team/marpit": "^2.1.0",
+    "chokidar": "^3.5.2",
+    "chrome-launcher": "^0.14.0",
     "cosmiconfig": "^7.0.0",
     "express": "^4.17.1",
-    "globby": "^11.0.3",
-    "import-from": "^3.0.0",
-    "pptxgenjs": "^3.6.0",
-    "puppeteer-core": "9.1.1",
+    "import-from": "^4.0.0",
+    "pptxgenjs": "^3.7.1",
+    "puppeteer-core": "10.1.0",
     "serve-index": "^1.9.1",
     "tmp": "^0.2.1",
     "v8-compile-cache": "^2.3.0",
-    "ws": "^7.4.6",
+    "ws": "^7.5.3",
     "yargs": "^17.0.1"
   },
   "resolutions": {
-    "cssnano": "^5.0.2",
+    "cssnano": "^5.0.7",
     "pug": "^3.0.2",
     "pug-runtime": "^3.0.1"
   },

rollup.config.js

@@ -65,7 +65,11 @@ const browser = (opts = {}) => ({
 })
 
 const cli = {
-  external: external([...builtinModules, ...Object.keys(dependencies)]),
+  external: external([
+    ...builtinModules,
+    ...builtinModules.map((m) => `node:${m}`),
+    ...Object.keys(dependencies),
+  ]),
   plugins: plugins(),
 }
 

src/file.ts

@@ -5,7 +5,7 @@ import path from 'path'
 import * as url from 'url'
 import { promisify } from 'util'
 import getStdin from 'get-stdin'
-import globby, { GlobbyOptions } from 'globby'
+import { globby, Options as GlobbyOptions } from 'globby'
 import { tmpName } from 'tmp'
 
 const tmpNamePromise = promisify(tmpName)