Skip to content

Commit 1ea40cb

Browse files
authored
Merge pull request #29 from marp-team/upgrade-dependencies
Upgrade dependent packages to latest
2 parents 4c94fbd + a0bb868 commit 1ea40cb

File tree

5 files changed

+518
-502
lines changed

5 files changed

+518
-502
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
### Changed
1111

1212
- Recognize theme CSS in input directory specified by `--input-dir` (`-I`) option ([#28](https://github.com/marp-team/marp-cli/pull/28))
13+
- Upgrade dependent packages to latest version, includes [Marpit v0.1.3](https://github.com/marp-team/marpit/releases/tag/v0.1.3) and [marp-team/marp-core v0.0.10](https://github.com/marp-team/marp-core/releases/tag/v0.0.10) ([#29](https://github.com/marp-team/marp-cli/pull/29))
1314

1415
## v0.0.10 - 2018-09-20
1516

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,55 +48,55 @@
4848
"@types/cosmiconfig": "^5.0.3",
4949
"@types/express": "^4.16.0",
5050
"@types/get-stdin": "^5.0.1",
51-
"@types/jest": "^23.3.2",
51+
"@types/jest": "^23.3.3",
5252
"@types/jest-plugin-context": "^2.9.0",
53-
"@types/node": "^10.10.1",
53+
"@types/node": "^10.11.4",
5454
"@types/pug": "^2.0.4",
55-
"@types/puppeteer": "^1.6.4",
55+
"@types/puppeteer": "^1.9.0",
5656
"@types/supertest": "^2.0.6",
5757
"@types/ws": "^6.0.1",
58-
"@types/yargs": "^12.0.0",
58+
"@types/yargs": "^12.0.1",
5959
"autoprefixer": "^9.1.5",
6060
"bespoke": "^1.1.0",
6161
"bespoke-keys": "^1.1.0",
6262
"codecov": "^3.1.0",
63-
"cssnano": "^4.1.0",
63+
"cssnano": "^4.1.4",
6464
"jest": "^23.6.0",
65-
"jest-junit": "^5.1.0",
65+
"jest-junit": "^5.2.0",
6666
"jest-plugin-context": "^2.9.0",
6767
"node-sass": "^4.9.3",
6868
"npm-run-all": "^4.1.3",
6969
"prettier": "^1.14.3",
7070
"pug": "^2.0.3",
7171
"rimraf": "^2.6.2",
72-
"rollup": "^0.66.1",
72+
"rollup": "^0.66.4",
7373
"rollup-plugin-commonjs": "^9.1.8",
7474
"rollup-plugin-json": "^3.1.0",
7575
"rollup-plugin-node-resolve": "^3.4.0",
7676
"rollup-plugin-postcss": "^1.6.2",
7777
"rollup-plugin-pug": "^1.0.0",
7878
"rollup-plugin-terser": "^3.0.0",
7979
"rollup-plugin-typescript": "^1.0.0",
80-
"strip-ansi": "^4.0.0",
81-
"stylelint": "^9.5.0",
80+
"strip-ansi": "^5.0.0",
81+
"stylelint": "^9.6.0",
8282
"stylelint-config-prettier": "^4.0.0",
8383
"stylelint-config-standard": "^18.2.0",
84-
"stylelint-scss": "^3.3.0",
84+
"stylelint-scss": "^3.3.1",
8585
"supertest": "^3.3.0",
86-
"ts-jest": "23.10.0",
86+
"ts-jest": "23.10.3",
8787
"ts-keycode-enum": "^1.0.6",
8888
"tslib": "^1.9.3",
8989
"tslint": "^5.11.0",
9090
"tslint-config-airbnb": "^5.11.0",
9191
"tslint-config-prettier": "^1.15.0",
92-
"typescript": "^3.0.3"
92+
"typescript": "^3.1.1"
9393
},
9494
"dependencies": {
95-
"@marp-team/marp-core": "^0.0.9",
96-
"@marp-team/marpit": "^0.1.2",
95+
"@marp-team/marp-core": "^0.0.10",
96+
"@marp-team/marpit": "^0.1.3",
9797
"chalk": "^2.4.1",
9898
"chokidar": "^2.0.4",
99-
"chrome-launcher": "^0.10.4",
99+
"chrome-launcher": "^0.10.5",
100100
"cosmiconfig": "^5.0.6",
101101
"express": "^4.16.3",
102102
"get-stdin": "^6.0.0",
@@ -107,9 +107,9 @@
107107
"os-locale": "^3.0.1",
108108
"pkg-up": "^2.0.0",
109109
"portfinder": "^1.0.17",
110-
"puppeteer-core": "^1.8.0",
110+
"puppeteer-core": "^1.9.0",
111111
"tmp": "^0.0.33",
112-
"ws": "^6.0.0",
112+
"ws": "^6.1.0",
113113
"yargs": "^12.0.2"
114114
}
115115
}

src/marp-cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import chalk from 'chalk'
33
import { Argv } from 'yargs'
44
import yargs from 'yargs/yargs'
55
import * as cli from './cli'
6-
import fromArguments, { IMarpCLIArguments } from './config'
6+
import fromArguments from './config'
77
import { Converter, ConvertedCallback } from './converter'
88
import { CLIError, error } from './error'
99
import { File, FileType } from './file'

test/marp-cli.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ describe('Marp CLI', () => {
200200
})
201201

202202
context('with --theme option', () => {
203-
let convert: jest.SpyInstance
204-
let info: jest.SpyInstance
203+
let convert: jest.MockInstance<any>
204+
let info: jest.MockInstance<any>
205205

206206
beforeEach(() => {
207207
convert = jest.spyOn(Converter.prototype, 'convert')
@@ -267,8 +267,8 @@ describe('Marp CLI', () => {
267267
const themeB = assetFn('_files/themes/b.css')
268268
const themeC = assetFn('_files/themes/nested/c.css')
269269

270-
let convert: jest.SpyInstance
271-
let observeSpy: jest.SpyInstance
270+
let convert: jest.MockInstance<Converter['convert']>
271+
let observeSpy: jest.MockInstance<ThemeSet['observe']>
272272

273273
beforeEach(() => {
274274
convert = jest.spyOn(Converter.prototype, 'convert')

0 commit comments

Comments
 (0)