Skip to content

Commit

Permalink
Merge pull request #90 from marp-team/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependent packages to latest version
  • Loading branch information
yhatt authored Nov 5, 2018
2 parents 2f3389e + 0e2f489 commit 8bedb5a
Show file tree
Hide file tree
Showing 7 changed files with 207 additions and 220 deletions.
2 changes: 1 addition & 1 deletion .eslintrc → .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:

extends:
- airbnb-base
- plugin:prettier/recommended
- prettier

rules:
max-len:
Expand Down
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.git/
.nyc_output/
.vscode/
coverage/
dist/
jsdoc/
lib/
node_modules
jsdoc/
package.json
File renamed without changes.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Changed

- Support Node 10.x and use its LTS for development ([#84](https://github.com/marp-team/marpit/pull/84), [#88](https://github.com/marp-team/marpit/pull/88))
- Upgrade dependent packages to latest version ([#90](https://github.com/marp-team/marpit/pull/90))

### Fixed

Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"build": "yarn --mutex file run clean && babel src --out-dir lib",
"clean": "rimraf lib",
"docs": "docsify serve ./docs",
"format": "prettier **/*.{json,md,ts,yaml,yml}",
"format:check": "yarn --mutex file run format -l",
"format": "prettier \"**/*.{js,json,md,ts,yaml,yml}\"",
"format:check": "yarn --silent --mutex file run format -l",
"jsdoc": "rimraf jsdoc && jsdoc src -c .jsdoc.json",
"lint": "eslint",
"lint:all": "eslint .",
Expand All @@ -62,12 +62,11 @@
"codecov": "^3.1.0",
"cross-env": "^5.2.0",
"dedent": "^0.7.0",
"docsify-cli": "^4.2.1",
"eslint": "^5.6.1",
"docsify-cli": "^4.3.0",
"eslint": "^5.8.0",
"eslint-config-airbnb-base": "13.1.0",
"eslint-config-prettier": "^3.1.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-prettier": "^3.0.0",
"jest": "^23.6.0",
"jest-junit": "^5.2.0",
"jsdoc": "^3.5.5",
Expand Down
File renamed without changes.
Loading

0 comments on commit 8bedb5a

Please sign in to comment.