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

Upgrade dependent package versions
marp-team · Feb 17, 2019 · 79f7ab3 · 79f7ab3
2 parents f764757 + b84f73b
commit 79f7ab3
Show file tree

Hide file tree

Showing 6 changed files with 561 additions and 733 deletions.
diff --git a/package.json b/package.json
@@ -50,23 +50,23 @@
     "@types/cosmiconfig": "^5.0.3",
     "@types/express": "^4.16.1",
     "@types/get-stdin": "^5.0.1",
-    "@types/jest": "^23.3.13",
-    "@types/jest-plugin-context": "^2.9.0",
-    "@types/node": "^10.12.21",
+    "@types/jest": "^24.0.5",
+    "@types/jest-plugin-context": "^2.9.2",
+    "@types/node": "^11.9.4",
     "@types/pug": "^2.0.4",
-    "@types/puppeteer": "^1.11.2",
+    "@types/puppeteer": "^1.12.1",
     "@types/supertest": "^2.0.7",
     "@types/ws": "^6.0.1",
-    "@types/yargs": "^12.0.8",
+    "@types/yargs": "^12.0.9",
     "autoprefixer": "^9.4.7",
     "bespoke": "^1.1.0",
     "bespoke-forms": "^1.0.0",
     "bespoke-keys": "^1.1.0",
     "cheerio": "^1.0.0-rc.2",
-    "codecov": "^3.1.0",
-    "cssnano": "^4.1.8",
-    "jest": "^24.0.0",
-    "jest-junit": "^6.2.1",
+    "codecov": "^3.2.0",
+    "cssnano": "^4.1.10",
+    "jest": "^24.1.0",
+    "jest-junit": "^6.3.0",
     "jest-plugin-context": "^2.9.0",
     "node-sass": "^4.11.0",
     "npm-run-all": "^4.1.5",
@@ -80,30 +80,30 @@
     "rollup-plugin-node-resolve": "^4.0.0",
     "rollup-plugin-postcss": "^2.0.3",
     "rollup-plugin-pug": "^1.1.0",
-    "rollup-plugin-terser": "^4.0.3",
+    "rollup-plugin-terser": "^4.0.4",
     "rollup-plugin-typescript": "^1.0.0",
     "rollup-plugin-url": "^2.2.0",
     "screenfull": "^4.0.0",
     "strip-ansi": "^5.0.0",
     "stylelint": "^9.10.1",
     "stylelint-config-prettier": "^4.0.0",
     "stylelint-config-standard": "^18.2.0",
-    "stylelint-scss": "^3.5.2",
+    "stylelint-scss": "^3.5.3",
     "supertest": "^3.4.2",
     "ts-jest": "23.10.5",
     "ts-keycode-enum": "^1.0.6",
     "tslib": "^1.9.3",
     "tslint": "^5.12.1",
     "tslint-config-airbnb": "^5.11.1",
-    "tslint-config-prettier": "^1.17.0",
-    "typescript": "^3.3.1"
+    "tslint-config-prettier": "^1.18.0",
+    "typescript": "^3.3.3"
   },
   "dependencies": {
-    "@marp-team/marp-core": "^0.6.0",
-    "@marp-team/marpit": "^0.7.1",
+    "@marp-team/marp-core": "^0.6.1",
+    "@marp-team/marpit": "^0.7.2",
     "carlo": "^0.9.43",
     "chalk": "^2.4.2",
-    "chokidar": "^2.0.4",
+    "chokidar": "^2.1.1",
     "chrome-launcher": "^0.10.5",
     "cosmiconfig": "^5.0.7",
     "express": "^4.16.4",
@@ -115,11 +115,11 @@
     "os-locale": "^3.1.0",
     "pkg-up": "^2.0.0",
     "portfinder": "^1.0.20",
-    "puppeteer-core": "^1.12.1",
+    "puppeteer-core": "^1.12.2",
     "serve-index": "^1.9.1",
     "terminate": "^2.1.2",
     "tmp": "^0.0.33",
-    "ws": "^6.1.3",
-    "yargs": "^12.0.5"
+    "ws": "^6.1.4",
+    "yargs": "^13.2.0"
   }
 }
diff --git a/src/templates/bespoke/progress.ts b/src/templates/bespoke/progress.ts
@@ -1,6 +1,8 @@
 // Based on https://github.com/bespokejs/bespoke-progress
 
-const query = '.bespoke-progress-parent > .bespoke-progress-bar'
+// TODO: Revert to the detailed scope after upgrade JSDOM
+// ".bespoke-progress-parent > .bespoke-progress-bar"
+const query = '.bespoke-progress-bar'
 
 export default function basepokeProgress(deck) {
   deck.on('activate', e => {

diff --git a/test/marp-cli.ts b/test/marp-cli.ts
@@ -17,7 +17,7 @@ import { Watcher } from '../src/watcher'
 const { version } = require('../package.json')
 const coreVersion = require('@marp-team/marp-core/package.json').version
 const marpitVersion = require('@marp-team/marpit/package.json').version
-const previewEmitter = new EventEmitter()
+const previewEmitter = new EventEmitter() as Preview
 
 jest.mock('fs')
 jest.mock('get-stdin')
@@ -42,7 +42,7 @@ describe('Marp CLI', () => {
 
   for (const cmd of ['--version', '-v'])
     context(`with ${cmd} option`, () => {
-      let log: jest.SpyInstance<Console['log']>
+      let log: jest.SpyInstance<void, any>
       let findClassPath: jest.SpyInstance<ResolvedEngine['findClassPath']>
 
       beforeEach(() => {
@@ -115,7 +115,7 @@ describe('Marp CLI', () => {
     context(`with ${cmd || 'empty'} option`, () => {
       const run = (...args) => marpCli([...(cmd ? [cmd] : []), ...args])
 
-      let error: jest.SpyInstance<Console['error']>
+      let error: jest.SpyInstance<ReturnType<Console['error']>, any>
 
       beforeEach(() => {
         error = jest.spyOn(console, 'error').mockImplementation()
@@ -237,7 +237,7 @@ describe('Marp CLI', () => {
         const info = jest.spyOn(cli, 'info')
         info.mockImplementation()
 
-        const serverStart = jest.spyOn(Server.prototype, 'start')
+        const serverStart = jest.spyOn<any, any>(Server.prototype, 'start')
         serverStart.mockResolvedValue(0)
 
         await marpCli(['--input-dir', files, '--server'])
@@ -259,7 +259,7 @@ describe('Marp CLI', () => {
 
         beforeEach(() => {
           jest.spyOn(cli, 'info').mockImplementation()
-          jest.spyOn(Server.prototype, 'start').mockResolvedValue(0)
+          jest.spyOn<any, any>(Server.prototype, 'start').mockResolvedValue(0)
         })
 
         it('opens preview window through Preview.open()', async () => {
@@ -305,8 +305,8 @@ describe('Marp CLI', () => {
   })
 
   context('with --theme option', () => {
-    let convert: jest.MockInstance<any>
-    let info: jest.MockInstance<any>
+    let convert: jest.MockInstance<any, any>
+    let info: jest.MockInstance<any, any>
 
     beforeEach(() => {
       convert = jest.spyOn(Converter.prototype, 'convert')
@@ -374,8 +374,8 @@ describe('Marp CLI', () => {
     const themeB = assetFn('_files/themes/b.css')
     const themeC = assetFn('_files/themes/nested/c.css')
 
-    let convert: jest.MockInstance<Converter['convert']>
-    let observeSpy: jest.MockInstance<ThemeSet['observe']>
+    let convert: jest.MockInstance<ReturnType<Converter['convert']>, any>
+    let observeSpy: jest.MockInstance<ReturnType<ThemeSet['observe']>, any>
 
     beforeEach(() => {
       convert = jest.spyOn(Converter.prototype, 'convert')
@@ -657,7 +657,7 @@ describe('Marp CLI', () => {
     })
 
     context('with --preview / -p option', () => {
-      let warn: jest.SpyInstance<Console['warn']>
+      let warn: jest.SpyInstance<ReturnType<Console['warn']>, any>
 
       beforeEach(
         () => (warn = jest.spyOn(console, 'warn').mockImplementation())
@@ -694,7 +694,7 @@ describe('Marp CLI', () => {
       const cliInfo = jest.spyOn(cli, 'info').mockImplementation()
 
       jest
-        .spyOn(Converter.prototype, 'convertFiles')
+        .spyOn<any, any>(Converter.prototype, 'convertFiles')
         .mockImplementation(() => [])
 
       expect(await marpCli([assetFn('_files')])).toBe(0)
@@ -707,7 +707,7 @@ describe('Marp CLI', () => {
       it('treats passed directory as an input directory of the server', async () => {
         jest.spyOn(cli, 'info').mockImplementation()
 
-        const serverStart = jest.spyOn(Server.prototype, 'start')
+        const serverStart = jest.spyOn<any, any>(Server.prototype, 'start')
         serverStart.mockResolvedValue(0)
 
         await marpCli(['--server', assetFn('_files')])

diff --git a/test/server.ts b/test/server.ts
@@ -120,7 +120,7 @@ describe('Server', () => {
           const server = await startServer()
 
           jest
-            .spyOn(server.converter, 'convertFile')
+            .spyOn<any, any>(server.converter, 'convertFile')
             .mockResolvedValue({ newFile: { buffer: 'converted' } })
 
           await request(server.server).get('/1.md')

diff --git a/test/theme.ts b/test/theme.ts
@@ -50,7 +50,9 @@ describe('ThemeSet', () => {
         expect(themeSet.themes.size).toBe(1)
 
         const [themeInstance] = [...themeSet.themes.values()]
-        const load = jest.spyOn(themeInstance, 'load').mockResolvedValue(0)
+        const load = jest
+          .spyOn<any, any>(themeInstance, 'load')
+          .mockResolvedValue(0)
 
         await themeSet.load(themeA)
         expect(themeSet.themes.size).toBe(1)