Merge pull request #147 from marp-team/update-dependencies

Updgrade dependent packages to the latest version

.circleci/config.yml

@@ -95,7 +95,7 @@ commands:
           name: Jest
           command: yarn test:coverage --ci -i --reporters=default --reporters=jest-junit
           environment:
-            JEST_JUNIT_OUTPUT: tmp/test-results/jest.xml
+            JEST_JUNIT_OUTPUT_DIR: tmp/test-results
 
       - run: yarn codecov
 

CHANGELOG.md

@@ -15,6 +15,7 @@
 
 - Migrate CI for Windows into GitHub Actions ([#132](https://github.com/marp-team/marp-cli/issues/132), [#140](https://github.com/marp-team/marp-cli/pull/140), [#146](https://github.com/marp-team/marp-cli/pull/146))
 - Update CircleCI configuration to use v2.1 ([#144](https://github.com/marp-team/marp-cli/pull/144))
+- Upgrade dependent packages to the latest version ([#147](https://github.com/marp-team/marp-cli/pull/147))
 
 ## v0.13.0 - 2019-08-23
 

package.json

@@ -63,17 +63,16 @@
     "watch": "rollup -w -c"
   },
   "devDependencies": {
-    "@octokit/rest": "^16.28.7",
     "@types/cheerio": "^0.22.13",
     "@types/cosmiconfig": "^5.0.3",
     "@types/express": "^4.17.1",
     "@types/jest": "^24.0.18",
     "@types/jest-plugin-context": "^2.9.2",
-    "@types/node": "^12.7.2",
+    "@types/node": "^12.7.4",
     "@types/pug": "^2.0.4",
     "@types/puppeteer": "^1.19.1",
     "@types/supertest": "^2.0.8",
-    "@types/ws": "^6.0.2",
+    "@types/ws": "^6.0.3",
     "@types/yargs": "^13.0.2",
     "autoprefixer": "^9.6.1",
     "bespoke": "bespokejs/bespoke",
@@ -84,7 +83,7 @@
     "cssnano": "^4.1.10",
     "image-size": "^0.7.4",
     "jest": "^24.9.0",
-    "jest-junit": "^7.0.0",
+    "jest-junit": "^8.0.0",
     "jest-plugin-context": "^2.9.0",
     "nanoid": "^2.1.0",
     "npm-run-all": "^4.1.5",
@@ -93,8 +92,8 @@
     "prettier": "^1.18.2",
     "pug": "^2.0.4",
     "rimraf": "^3.0.0",
-    "rollup": "^1.20.1",
-    "rollup-plugin-commonjs": "^10.0.2",
+    "rollup": "^1.21.2",
+    "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-postcss": "^2.0.3",
@@ -104,20 +103,20 @@
     "rollup-plugin-typescript": "^1.0.1",
     "rollup-plugin-url": "^2.2.2",
     "sass": "^1.22.10",
-    "screenfull": "^4.2.1",
+    "screenfull": "^5.0.0",
     "stylelint": "^10.1.0",
     "stylelint-config-prettier": "^5.2.0",
     "stylelint-config-standard": "^18.3.0",
-    "stylelint-scss": "^3.9.4",
+    "stylelint-scss": "^3.10.1",
     "supertest": "^4.0.2",
     "tar-stream": "^2.1.0",
     "ts-jest": "24.0.2",
     "ts-keycode-enum": "^1.0.6",
     "tslib": "^1.10.0",
-    "tslint": "^5.19.0",
+    "tslint": "^5.20.0",
     "tslint-config-airbnb": "^5.11.1",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.5.3",
+    "typescript": "^3.6.2",
     "yauzl": "^2.10.0",
     "zip-stream": "^2.1.2"
   },
@@ -139,7 +138,7 @@
     "mkdirp": "^0.5.1",
     "os-locale": "^4.0.0",
     "pkg-up": "^3.1.0",
-    "portfinder": "^1.0.23",
+    "portfinder": "^1.0.24",
     "puppeteer-core": "~1.17.0",
     "serve-index": "^1.9.1",
     "strip-ansi": "^5.2.0",

src/templates/bespoke/fullscreen.ts

@@ -1,7 +1,9 @@
-import screenfull from 'screenfull'
+import { default as screenfull } from 'screenfull'
 
 export default function bespokeFullscreen(deck) {
-  deck.fullscreen = () => screenfull && screenfull.toggle(document.body)
+  deck.fullscreen = () => {
+    if (screenfull.isEnabled) screenfull.toggle(document.body)
+  }
 
   document.addEventListener('keydown', e => {
     // `f` or F11 without modifier key Alt, Control, and Command
@@ -10,8 +12,7 @@ export default function bespokeFullscreen(deck) {
       !e.altKey &&
       !e.ctrlKey &&
       !e.metaKey &&
-      screenfull &&
-      screenfull.enabled
+      screenfull.isEnabled
     ) {
       deck.fullscreen()
       e.preventDefault()

src/templates/bespoke/osc.ts

@@ -1,4 +1,4 @@
-import screenfull from 'screenfull'
+import { default as screenfull } from 'screenfull'
 
 export default function bespokeOSC(selector: string = '.bespoke-marp-osc') {
   const osc = document.querySelector(selector)
@@ -14,7 +14,7 @@ export default function bespokeOSC(selector: string = '.bespoke-marp-osc') {
   }
 
   // Hide fullscreen button in not-supported browser (e.g. phone device)
-  if (screenfull && !screenfull.enabled)
+  if (!screenfull.isEnabled)
     oscElements('fullscreen', btn => (btn.style.display = 'none'))
 
   return deck => {
@@ -28,11 +28,7 @@ export default function bespokeOSC(selector: string = '.bespoke-marp-osc') {
             deck.prev()
             break
           case 'fullscreen':
-            if (
-              typeof deck.fullscreen === 'function' &&
-              screenfull &&
-              screenfull.enabled
-            )
+            if (typeof deck.fullscreen === 'function' && screenfull.isEnabled)
               deck.fullscreen()
         }
       }
@@ -63,11 +59,15 @@ export default function bespokeOSC(selector: string = '.bespoke-marp-osc') {
       )
     })
 
-    screenfull &&
+    if (screenfull.isEnabled) {
       screenfull.onchange(() =>
         oscElements('fullscreen', fs =>
-          fs.classList.toggle('exit', screenfull && screenfull.isFullscreen)
+          fs.classList.toggle(
+            'exit',
+            screenfull.isEnabled && screenfull.isFullscreen
+          )
         )
       )
+    }
   }
 }

test/__mocks__/screenfull.ts

@@ -1,5 +1,5 @@
 module.exports = {
-  get enabled() {
+  get isEnabled() {
     return true
   },
   onchange: jest.fn(),

test/templates/bespoke.ts

@@ -1,7 +1,7 @@
 /** @jest-environment jsdom */
 import Marp from '@marp-team/marp-core'
 import { Element as MarpitElement } from '@marp-team/marpit'
-import screenfull from 'screenfull'
+import { default as screenfull, Screenfull } from 'screenfull'
 import { Key } from 'ts-keycode-enum'
 import bespoke from '../../src/templates/bespoke/bespoke'
 
@@ -205,17 +205,17 @@ describe("Bespoke template's browser context", () => {
 
     it('injects deck.fullscreen() to toggle fullscreen', async () => {
       await deck.fullscreen()
-      expect((screenfull as any).toggle).toBeCalled()
+      expect((screenfull as Screenfull).toggle).toBeCalled()
     })
 
     it('toggles fullscreen by hitting f key', () => {
       keydown({ which: Key.F })
-      expect((screenfull as any).toggle).toBeCalled()
+      expect((screenfull as Screenfull).toggle).toBeCalled()
     })
 
     it('toggles fullscreen by hitting F11 key', () => {
       keydown({ which: Key.F11 })
-      expect((screenfull as any).toggle).toBeCalled()
+      expect((screenfull as Screenfull).toggle).toBeCalled()
     })
   })
 
@@ -501,7 +501,7 @@ describe("Bespoke template's browser context", () => {
         context('when browser does not support fullscreen', () => {
           it('hides fullscreen button', () => {
             jest
-              .spyOn(screenfull as any, 'enabled', 'get')
+              .spyOn(screenfull as Screenfull, 'isEnabled', 'get')
               .mockImplementation(() => false)
 
             bespoke()