Skip to content

Commit

Permalink
Merge pull request #216 from marp-team/upgrade-node-and-dependencies
Browse files Browse the repository at this point in the history
Upgrade Node and dependent packages to the latest version
  • Loading branch information
yhatt authored Jan 6, 2020
2 parents a4d4d61 + dd9279e commit 4deee92
Show file tree
Hide file tree
Showing 6 changed files with 255 additions and 254 deletions.
12 changes: 1 addition & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,6 @@ jobs:
steps:
- audit

test-node8:
executor:
name: node
version: '8'
steps:
- test

test-node10:
executor:
name: node
Expand All @@ -103,17 +96,14 @@ jobs:
test-node12:
executor:
name: node
version: '12.13.1' # Specify LTS version for development
version: '12.14.0' # Specify LTS version for development
steps:
- test

workflows:
test:
jobs:
- audit
- test-node8:
requires:
- audit
- test-node10:
requires:
- audit
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.13.1
12.14.0
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@

### Changed

- Upgrade dependent packages to the latest version ([#211](https://github.com/marp-team/marpit/pull/211), [#213](https://github.com/marp-team/marpit/pull/213))
- Bump Node LTS version ([#213](https://github.com/marp-team/marpit/pull/213))
- Upgrade dependent packages to the latest version ([#211](https://github.com/marp-team/marpit/pull/211), [#213](https://github.com/marp-team/marpit/pull/213), [#216](https://github.com/marp-team/marpit/pull/216))
- Bump Node LTS version ([#213](https://github.com/marp-team/marpit/pull/213), [#216](https://github.com/marp-team/marpit/pull/216))
- Update community health files ([#212](https://github.com/marp-team/marpit/pull/212))

### Removed

- CI test against EOL Node 8 ([#216](https://github.com/marp-team/marpit/pull/216))

## v1.4.2 - 2019-11-06

### Fixed
Expand Down
1 change: 1 addition & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
// TODO: Drop support for EOL Node <= 8 in Marpit v2
presets: [['@babel/preset-env', { targets: { node: '8' } }]],
plugins: [
['@babel/plugin-proposal-object-rest-spread', { useBuiltIns: true }],
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
"watch": "babel src --out-dir lib -w --verbose"
},
"devDependencies": {
"@babel/cli": "^7.7.5",
"@babel/core": "^7.7.5",
"@babel/cli": "^7.7.7",
"@babel/core": "^7.7.7",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-object-rest-spread": "^7.7.4",
"@babel/plugin-proposal-object-rest-spread": "^7.7.7",
"@babel/plugin-proposal-private-methods": "^7.7.4",
"@babel/preset-env": "^7.7.6",
"@babel/preset-env": "^7.7.7",
"autoprefixer": "^9.7.3",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.3",
Expand All @@ -73,9 +73,9 @@
"cssnano": "^4.1.10",
"dedent": "^0.7.0",
"docsify-themeable": "^0.7.2",
"eslint": "^6.7.2",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "14.0.0",
"eslint-config-prettier": "^6.7.0",
"eslint-config-prettier": "^6.9.0",
"eslint-plugin-import": "^2.19.1",
"jest": "^24.9.0",
"jest-junit": "^10.0.0",
Expand All @@ -86,8 +86,8 @@
"npm-run-all": "^4.1.5",
"prettier": "^1.19.1",
"rimraf": "^3.0.0",
"sass": "^1.23.7",
"stylelint": "^12.0.0",
"sass": "^1.24.2",
"stylelint": "^12.0.1",
"stylelint-config-prettier": "^8.0.0",
"stylelint-config-standard": "^19.0.0",
"stylelint-scss": "^3.13.0"
Expand All @@ -98,7 +98,7 @@
"lodash.kebabcase": "^4.1.1",
"markdown-it": "^10.0.0",
"markdown-it-front-matter": "^0.1.2",
"postcss": "^7.0.24"
"postcss": "^7.0.26"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 4deee92

Please sign in to comment.