Skip to content

Commit

Permalink
Merge pull request #55 from marp-team/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade Node LTS and depenent packages
  • Loading branch information
yhatt authored Aug 18, 2018
2 parents b157bb2 + 9b750df commit 3ba9c80
Show file tree
Hide file tree
Showing 5 changed files with 137 additions and 137 deletions.
12 changes: 5 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ references:
- run: yarn install

- save_cache:
key:
v1-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
key: v1-dependencies-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}-{{ .Branch }}
paths:
- node_modules
- ~/.cache/yarn
Expand All @@ -27,8 +26,7 @@ references:

- run:
name: Jest
command:
yarn test:coverage --ci --maxWorkers=2 --reporters=default --reporters=jest-junit
command: yarn test:coverage --ci --maxWorkers=2 --reporters=default --reporters=jest-junit
environment:
JEST_JUNIT_OUTPUT: tmp/test-results/jest.xml

Expand All @@ -43,10 +41,10 @@ references:

version: 2
jobs:
'8.11.3':
'8.11.4':
<<: *base
docker:
- image: circleci/node:8.11.3
- image: circleci/node:8.11.4

boron:
<<: *base
Expand All @@ -57,5 +55,5 @@ workflows:
version: 2
build:
jobs:
- 8.11.3
- 8.11.4
- boron
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.11.3
v8.11.4
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Remove Unicode Emoji support due to many issues on stable Chrome ([#53](https://github.com/marp-team/marpit/pull/53))
- Improve lazy YAML parsing to apply in defined directives only ([#54](https://github.com/marp-team/marpit/pull/54))
- Upgrade Node LTS and depenent packages ([#55](https://github.com/marp-team/marpit/pull/55))

## v0.0.11 - 2018-08-12

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@
"codecov": "^3.0.4",
"cross-env": "^5.2.0",
"dedent": "^0.7.0",
"eslint": "^5.3.0",
"eslint-config-airbnb-base": "13.0.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.13.0",
"eslint": "^5.4.0",
"eslint-config-airbnb-base": "13.1.0",
"eslint-config-prettier": "^3.0.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-prettier": "^2.6.2",
"jest": "^23.4.2",
"jest": "^23.5.0",
"jest-junit": "^5.1.0",
"jsdoc": "^3.5.5",
"minami": "^1.2.3",
"npm-run-all": "^4.1.3",
"prettier": "^1.14.0",
"prettier": "^1.14.2",
"rimraf": "^2.6.2"
},
"dependencies": {
Expand Down
Loading

0 comments on commit 3ba9c80

Please sign in to comment.