Skip to content

Commit

Permalink
Merge pull request #58 from marp-team/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade Node and dependent packages to latest
  • Loading branch information
yhatt committed Jan 20, 2019
2 parents bfad3f9 + a800f72 commit 6159ca6
Show file tree
Hide file tree
Showing 5 changed files with 422 additions and 383 deletions.
26 changes: 17 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ references:
&& ln -snf /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
&& rm yarn-v$YARN_VERSION.tar.gz'
environment:
YARN_VERSION: 1.12.3
YARN_VERSION: 1.13.0

- checkout

Expand Down Expand Up @@ -64,15 +64,20 @@ references:

version: 2
jobs:
'10.14.1':
'10.15.0':
<<: *base
docker:
- image: circleci/node:10.14.1-browsers
- image: circleci/node:10.15.0-browsers

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

least-version:
<<: *base
docker:
- image: circleci/node:8.9.0-browsers

docker-image:
docker:
Expand All @@ -96,12 +101,15 @@ workflows:
version: 2
build:
jobs:
- 10.14.1
- 8.14.0
- 10.15.0
- 8.15.0
# NOTE: Node 8.9 in test environment cannot close Chrome correctly.
# - least-version
- docker-image:
requires:
- 10.14.1
- 8.14.0
- 10.15.0
- 8.15.0
# - least-version
filters:
branches:
only: master
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v10.14.1
v10.15.0
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Changed

- Upgrade Node and dependent packages to latest version, included [Marpit v0.6.0](https://github.com/marp-team/marpit/releases/tag/v0.6.0) and [Marp Core v0.5.0](https://github.com/marp-team/marp-core/releases/tag/v0.5.0) ([#58](https://github.com/marp-team/marp-cli/pull/58))

## v0.2.0 - 2018-12-31

### Fixed
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,65 +50,65 @@
"@types/cosmiconfig": "^5.0.3",
"@types/express": "^4.16.0",
"@types/get-stdin": "^5.0.1",
"@types/jest": "^23.3.11",
"@types/jest": "^23.3.13",
"@types/jest-plugin-context": "^2.9.0",
"@types/node": "^10.12.18",
"@types/pug": "^2.0.4",
"@types/puppeteer": "^1.11.1",
"@types/supertest": "^2.0.7",
"@types/ws": "^6.0.1",
"@types/yargs": "^12.0.5",
"autoprefixer": "^9.4.3",
"autoprefixer": "^9.4.5",
"bespoke": "^1.1.0",
"bespoke-forms": "^1.0.0",
"bespoke-keys": "^1.1.0",
"cheerio": "^1.0.0-rc.2",
"codecov": "^3.1.0",
"cssnano": "^4.1.8",
"jest": "^23.6.0",
"jest-junit": "^5.2.0",
"jest-junit": "^6.0.1",
"jest-plugin-context": "^2.9.0",
"node-sass": "^4.11.0",
"npm-run-all": "^4.1.5",
"postcss-url": "^8.0.0",
"prettier": "^1.15.3",
"prettier": "^1.16.0",
"pug": "^2.0.3",
"rimraf": "^2.6.2",
"rollup": "^1.0.0",
"rimraf": "^2.6.3",
"rollup": "^1.1.1",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-json": "^3.1.0",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-postcss": "^1.6.3",
"rollup-plugin-pug": "^1.1.0",
"rollup-plugin-terser": "^3.0.0",
"rollup-plugin-terser": "^4.0.2",
"rollup-plugin-typescript": "^1.0.0",
"rollup-plugin-url": "^2.1.0",
"screenfull": "^4.0.0",
"strip-ansi": "^5.0.0",
"stylelint": "^9.9.0",
"stylelint": "^9.10.1",
"stylelint-config-prettier": "^4.0.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-scss": "^3.4.4",
"supertest": "^3.3.0",
"stylelint-scss": "^3.5.1",
"supertest": "^3.4.1",
"ts-jest": "23.10.5",
"ts-keycode-enum": "^1.0.6",
"tslib": "^1.9.3",
"tslint": "^5.12.0",
"tslint": "^5.12.1",
"tslint-config-airbnb": "^5.11.1",
"tslint-config-prettier": "^1.17.0",
"typescript": "^3.2.2"
"typescript": "^3.2.4"
},
"dependencies": {
"@marp-team/marp-core": "^0.4.1",
"@marp-team/marpit": "^0.5.0",
"@marp-team/marp-core": "^0.5.0",
"@marp-team/marpit": "^0.6.0",
"carlo": "^0.9.43",
"chalk": "^2.4.1",
"chalk": "^2.4.2",
"chokidar": "^2.0.4",
"chrome-launcher": "^0.10.5",
"cosmiconfig": "^5.0.7",
"express": "^4.16.4",
"get-stdin": "^6.0.0",
"globby": "^8.0.1",
"globby": "^9.0.0",
"import-from": "^2.1.0",
"is-wsl": "^1.1.0",
"mkdirp": "^0.5.1",
Expand Down
Loading

0 comments on commit 6159ca6

Please sign in to comment.