Skip to content

Commit

Permalink
Merge pull request #73 from marp-team/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependent packages to the latest
  • Loading branch information
yhatt authored Feb 13, 2019
2 parents bac103c + a2d8850 commit 1188738
Show file tree
Hide file tree
Showing 4 changed files with 185 additions and 131 deletions.
16 changes: 9 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ references:
base: &base
working_directory: ~/marp-core
steps:
- run: node --version

# https://github.com/nodejs/docker-node/blob/master/docs/BestPractices.md#upgradingdowngrading-yarn
- run:
name: Upgrade and configure yarn
Expand All @@ -14,7 +16,7 @@ references:
[ -n "$YARN_IGNORE_ENGINES" ] && echo '--install.ignore-engines true' >> ~/.yarnrc || true
environment:
YARN_VERSION: 1.12.3
YARN_VERSION: 1.13.0

- checkout

Expand Down Expand Up @@ -71,15 +73,15 @@ jobs:
docker:
- image: circleci/node:10.15.1

'8.15.0':
carbon:
<<: *base
docker:
- image: circleci/node:8.15.0
- image: circleci/node:carbon

'6.16.0':
boron:
<<: *base
docker:
- image: circleci/node:6.16.0
- image: circleci/node:boron
environment:
YARN_IGNORE_ENGINES: 1

Expand All @@ -95,6 +97,6 @@ workflows:
build:
jobs:
- 10.15.1
- 8.15.0
- 6.16.0
- carbon
- boron
- least-version
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Remove dependency to PostCSS ([#71](https://github.com/marp-team/marp-core/pull/71))

### Changed

- Upgrade dependent packages to the latest ([#72](https://github.com/marp-team/marp-core/pull/72))

## v0.6.0 - 2019-02-04

### Added
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@
"test": "jest",
"test:coverage": "jest --coverage",
"types": "rimraf types && tsc --declaration --emitDeclarationOnly --outDir types",
"version": "node version.js && git add -A CHANGELOG.md",
"version": "curl https://raw.githubusercontent.com/marp-team/marp/master/version.js | node && git add -A CHANGELOG.md",
"watch": "rollup -w -c"
},
"devDependencies": {
"@types/cheerio": "^0.22.10",
"@types/jest": "^23.3.13",
"@types/jest": "^24.0.3",
"autoprefixer": "^9.4.7",
"cheerio": "^1.0.0-rc.2",
"codecov": "^3.1.0",
"cssnano": "^4.1.8",
"codecov": "^3.2.0",
"cssnano": "^4.1.9",
"github-markdown-css": "^3.0.1",
"jest": "^24.0.0",
"jest-junit": "^6.2.1",
Expand Down Expand Up @@ -90,7 +90,7 @@
"typescript": "^3.3.1"
},
"dependencies": {
"@marp-team/marpit": "^0.7.1",
"@marp-team/marpit": "^0.7.2",
"@marp-team/marpit-svg-polyfill": "^0.2.0",
"emoji-regex": "^7.0.3",
"highlight.js": "^9.14.2",
Expand Down
Loading

0 comments on commit 1188738

Please sign in to comment.