Skip to content

Commit

Permalink
Merge pull request #101 from marp-team/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependent packages to the latest version
  • Loading branch information
yhatt committed Jun 3, 2019
2 parents 6a88484 + 86f0c56 commit e1893c6
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 160 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## [Unreleased]

### Changed

- Upgrade to [Marpit v1.1.0](https://github.com/marp-team/marpit/releases/tag/v1.1.0) and [Marp Core v0.10.0](https://github.com/marp-team/marp-core/releases/tag/v0.10.0) ([#101](https://github.com/marp-team/marp-cli/pull/101))
- Upgrade dependent packages to the latest version ([#101](https://github.com/marp-team/marp-cli/pull/101))

## v0.9.3 - 2019-05-25

### Added
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@
"watch": "rollup -w -c"
},
"devDependencies": {
"@octokit/rest": "^16.27.0",
"@octokit/rest": "^16.27.3",
"@types/cheerio": "^0.22.11",
"@types/cosmiconfig": "^5.0.3",
"@types/express": "^4.16.1",
"@types/jest": "^24.0.13",
"@types/jest-plugin-context": "^2.9.2",
"@types/node": "^12.0.2",
"@types/node": "^12.0.4",
"@types/pug": "^2.0.4",
"@types/puppeteer": "^1.12.4",
"@types/supertest": "^2.0.7",
Expand All @@ -90,41 +90,41 @@
"postcss-url": "^8.0.0",
"prettier": "^1.17.1",
"pug": "^2.0.3",
"rollup": "^1.12.3",
"rollup": "^1.13.1",
"rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^5.0.0",
"rollup-plugin-node-resolve": "^5.0.1",
"rollup-plugin-postcss": "^2.0.3",
"rollup-plugin-pug": "^1.1.1",
"rollup-plugin-terser": "^5.0.0",
"rollup-plugin-typescript": "^1.0.1",
"rollup-plugin-url": "^2.2.1",
"sass": "^1.20.1",
"sass": "^1.20.3",
"screenfull": "^4.2.0",
"stylelint": "^10.0.1",
"stylelint-config-prettier": "^5.2.0",
"stylelint-config-standard": "^18.3.0",
"stylelint-scss": "^3.6.1",
"stylelint-scss": "^3.8.0",
"supertest": "^4.0.2",
"tar-stream": "^2.0.1",
"ts-jest": "24.0.2",
"ts-keycode-enum": "^1.0.6",
"tslib": "^1.9.3",
"tslint": "^5.16.0",
"tslint": "^5.17.0",
"tslint-config-airbnb": "^5.11.1",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.4.5",
"typescript": "^3.5.1",
"zip-stream": "^2.0.1"
},
"dependencies": {
"@marp-team/marp-core": "^0.9.0",
"@marp-team/marpit": "^1.0.0",
"@marp-team/marp-core": "^0.10.0",
"@marp-team/marpit": "^1.1.0",
"carlo": "^0.9.45",
"chalk": "^2.4.2",
"chokidar": "^3.0.0",
"chokidar": "^3.0.1",
"chrome-launcher": "^0.10.7",
"cosmiconfig": "^5.2.1",
"express": "^4.17.0",
"express": "^4.17.1",
"get-stdin": "^7.0.0",
"globby": "^9.2.0",
"import-from": "^3.0.0",
Expand Down
1 change: 0 additions & 1 deletion src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { TemplateOption } from './templates'

const lstat = promisify(fs.lstat)

type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>
type Overwrite<T, U> = Omit<T, Extract<keyof T, keyof U>> & U

export type IMarpCLIArguments = IMarpCLIBaseArguments & IMarpCLIBespokeArguments
Expand Down
Loading

0 comments on commit e1893c6

Please sign in to comment.