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

Upgrade dependent packages to the latest version

.github/workflows/github-release.yml

@@ -12,7 +12,7 @@ jobs:
   github-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: marp-team/actions@v1
         with:
           task: release
@@ -31,14 +31,11 @@ jobs:
           - macOS-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Detect Node version from .nvmrc
-        id: node_version
-        run: echo "::set-output name=nvmrc::$(cat .nvmrc)"
+      - uses: actions/checkout@v3
       - name: Use Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: ${{ steps.node_version.outputs.nvmrc }}
+          node-version-file: '.nvmrc'
       - name: Install yarn
         run: cd $HOME && yarn policies set-version $YARN_VERSION
       - run: yarn install --frozen-lockfile
@@ -48,7 +45,7 @@ jobs:
         run: yarn standalone:pack
         env:
           MATRIX_OS: ${{ matrix.os }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: assets
           path: dist

.github/workflows/test-win.yml

@@ -26,10 +26,10 @@ jobs:
       # - name: Output concurrency group
       #   run: echo "${{ github.workflow }}-${{ (github.ref_name == 'main' && github.run_id) || format('{0}-{1}', github.actor, github.head_ref || github.ref_name) }}"
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -40,7 +40,7 @@ jobs:
           echo "::set-output name=cache_dir::$(yarn cache dir)"
 
       - name: Cache yarn
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.yarn.outputs.cache_dir }}
           key: yarn_cache-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
@@ -61,7 +61,7 @@ jobs:
         env:
           CI: true
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: coverage
           path: coverage

CHANGELOG.md

@@ -9,6 +9,9 @@
 ### Changed
 
 - Docker image: Set `PATH` env to the project directory ([#462](https://github.com/marp-team/marp-cli/pull/462) by [@rhtenhove](https://github.com/rhtenhove))
+- Upgrade Marpit to [v2.4.0](https://github.com/marp-team/marpit/releases/v2.4.0) ([#467](https://github.com/marp-team/marp-cli/pull/467))
+- Upgrade Marp Core to [v3.3.0](https://github.com/marp-team/marp-core/releases/v3.3.0) ([#467](https://github.com/marp-team/marp-cli/pull/467))
+- Upgrade dependent packages to the latest version ([#467](https://github.com/marp-team/marp-cli/pull/467))
 
 ## v2.0.4 - 2022-06-08
 

jest.config.js

@@ -8,6 +8,7 @@ const esModules = [
   'globby',
   'is-docker',
   'locate-path',
+  'nanoid',
   'os-locale',
   'p-limit',
   'p-locate',

package.json

@@ -67,94 +67,94 @@
     "watch": "rollup -w -c"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.18.2",
+    "@babel/preset-env": "^7.18.10",
     "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.3.2",
+    "@rollup/plugin-typescript": "^8.3.4",
     "@rollup/plugin-url": "^7.0.0",
-    "@tsconfig/node14": "^1.0.1",
+    "@tsconfig/node14": "^1.0.3",
     "@types/cheerio": "^0.22.31",
     "@types/express": "^4.17.13",
-    "@types/jest": "^28.1.1",
+    "@types/jest": "^28.1.6",
     "@types/markdown-it": "^12.2.3",
-    "@types/node": "~16.11.38",
+    "@types/node": "~16.11.47",
     "@types/pug": "^2.0.6",
     "@types/supertest": "^2.0.12",
     "@types/ws": "^8.5.3",
-    "@types/yargs": "^17.0.10",
-    "@typescript-eslint/eslint-plugin": "^5.27.0",
-    "@typescript-eslint/parser": "^5.27.0",
-    "autoprefixer": "^10.4.7",
+    "@types/yargs": "^17.0.11",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.0",
+    "autoprefixer": "^10.4.8",
     "babel-plugin-transform-rename-import": "^2.3.0",
     "bespoke": "bespokejs/bespoke",
     "builtin-modules": "^3.3.0",
     "chalk": "^5.0.1",
-    "cheerio": "^1.0.0-rc.11",
+    "cheerio": "^1.0.0-rc.12",
     "chrome-launcher": "^0.15.1",
-    "cssnano": "^5.1.11",
-    "eslint": "^8.17.0",
+    "cssnano": "^5.1.12",
+    "eslint": "^8.21.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.5.1",
+    "eslint-plugin-jest": "^26.8.2",
     "express": "^4.18.1",
     "fast-plist": "^0.1.2",
     "get-stdin": "^9.0.0",
-    "globby": "^13.1.1",
-    "image-size": "^1.0.1",
+    "globby": "^13.1.2",
+    "image-size": "^1.0.2",
     "is-docker": "^3.0.0",
-    "jest": "^28.1.0",
-    "jest-environment-jsdom": "^28.1.0",
-    "jest-junit": "^13.2.0",
-    "nanoid": "^3.3.4",
+    "jest": "^28.1.3",
+    "jest-environment-jsdom": "^28.1.3",
+    "jest-junit": "^14.0.0",
+    "nanoid": "^4.0.0",
     "npm-run-all": "^4.1.5",
     "os-locale": "^6.0.2",
     "pdf-lib": "^1.17.1",
-    "pkg": "^5.7.0",
+    "pkg": "^5.8.0",
     "pkg-up": "^4.0.0",
-    "portfinder": "^1.0.28",
-    "postcss": "^8.4.14",
+    "portfinder": "1.0.28",
+    "postcss": "^8.4.16",
     "postcss-url": "^10.1.3",
-    "pptxgenjs": "^3.10.0",
-    "prettier": "^2.6.2",
+    "pptxgenjs": "^3.11.0",
+    "prettier": "^2.7.1",
     "pug": "^3.0.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.75.5",
-    "rollup-plugin-license": "^2.8.0",
+    "rollup": "^2.77.2",
+    "rollup-plugin-license": "^2.8.1",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-pug": "^1.1.1",
     "rollup-plugin-terser": "^7.0.2",
-    "sass": "^1.52.2",
+    "sass": "^1.54.4",
     "strip-ansi": "^7.0.1",
-    "stylelint": "^14.8.5",
+    "stylelint": "^14.10.0",
     "stylelint-config-prettier": "^9.0.3",
-    "stylelint-config-standard-scss": "^4.0.0",
-    "supertest": "^6.2.3",
+    "stylelint-config-standard-scss": "^5.0.0",
+    "supertest": "^6.2.4",
     "tar-stream": "^2.2.0",
-    "ts-jest": "^28.0.4",
-    "ts-key-enum": "^3.0.11",
+    "ts-jest": "^28.0.7",
+    "ts-key-enum": "^3.0.12",
     "tslib": "^2.4.0",
     "typed-emitter": "^2.1.0",
-    "typescript": "^4.7.3",
+    "typescript": "^4.7.4",
     "vhtml": "^2.2.0",
     "wrap-ansi": "^8.0.1",
     "yauzl": "^2.10.0",
     "zip-stream": "^4.1.0"
   },
   "dependencies": {
-    "@marp-team/marp-core": "^3.2.0",
-    "@marp-team/marpit": "^2.3.1",
+    "@marp-team/marp-core": "^3.3.0",
+    "@marp-team/marpit": "^2.4.0",
     "chokidar": "^3.5.3",
     "cosmiconfig": "^7.0.1",
     "import-from": "^4.0.0",
     "is-wsl": "^2.2.0",
-    "puppeteer-core": "14.2.1",
+    "puppeteer-core": "16.1.0",
     "serve-index": "^1.9.1",
     "tmp": "^0.2.1",
     "v8-compile-cache": "^2.3.0",
-    "ws": "^8.7.0",
+    "ws": "^8.8.1",
     "yargs": "^17.5.1"
   },
   "resolutions": {

src/converter.ts

@@ -3,7 +3,7 @@ import { URL } from 'url'
 import type { MarpOptions } from '@marp-team/marp-core'
 import { Marpit, Options as MarpitOptions } from '@marp-team/marpit'
 import chalk from 'chalk'
-import puppeteer from 'puppeteer-core'
+import type puppeteer from 'puppeteer-core'
 import { silence, warn } from './cli'
 import { Engine, ResolvedEngine } from './engine'
 import infoPlugin, { engineInfo, EngineInfo } from './engine/info-plugin'

src/preview.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-namespace */
 import { EventEmitter } from 'events'
 import { nanoid } from 'nanoid'
-import puppeteer from 'puppeteer-core'
+import type puppeteer from 'puppeteer-core'
 import TypedEmitter from 'typed-emitter'
 import macDockIcon from './assets/mac-dock-icon.png'
 import { ConvertType, mimeTypes } from './converter'

src/server/index.scss

@@ -89,7 +89,7 @@ ul#index {
   }
 
   &:not(.show-all) li {
-    &:not(.convertible):not(.directory),
+    &:not(.convertible, .directory),
     &.node-modules {
       display: none;
     }

src/utils/puppeteer.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import os from 'os'
 import path from 'path'
-import puppeteer from 'puppeteer-core'
+import { launch } from 'puppeteer-core'
 import { warn } from '../cli'
 import { CLIErrorCode, error, isError } from '../error'
 import { isDocker } from '../utils/docker'
@@ -123,16 +123,16 @@ export const generatePuppeteerLaunchArgs = async () => {
 }
 
 export const launchPuppeteer = async (
-  ...[options]: Parameters<typeof puppeteer['launch']>
+  ...[options]: Parameters<typeof launch>
 ) => {
   try {
-    return await puppeteer.launch(options)
+    return await launch(options)
   } catch (e: unknown) {
     if (isError(e)) {
       // Retry to launch Chromium with WebSocket connection instead of pipe if failed to connect to Chromium
       // https://github.com/puppeteer/puppeteer/issues/6258
       if (options?.pipe && e.message.includes('Target.setDiscoverTargets')) {
-        return await puppeteer.launch({ ...options, pipe: false })
+        return await launch({ ...options, pipe: false })
       }
 
       // Warning when tried to spawn the snap chromium within the snapd container