Skip to content

Commit

Permalink
Merge pull request #255 from marp-team/update-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 Aug 23, 2020
2 parents d11d222 + 58f25a9 commit 35abe72
Show file tree
Hide file tree
Showing 6 changed files with 1,367 additions and 1,449 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
test-node12:
executor:
name: node
version: '12.16.3' # Specify LTS version for development
version: '12.18.3' # Specify LTS version for development
steps:
- test

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.16.3
12.18.3
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 the latest version ([#255](https://github.com/marp-team/marpit/pull/255))

## v1.6.2 - 2020-06-08

### Changed
Expand Down
7 changes: 2 additions & 5 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
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 }],
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-private-methods',
presets: [
['@babel/preset-env', { targets: { node: '8' }, shippedProposals: true }],
],
}
36 changes: 16 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,38 +59,34 @@
"watch": "babel src --out-dir lib -w --verbose"
},
"devDependencies": {
"@babel/cli": "^7.10.1",
"@babel/core": "^7.10.2",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-object-rest-spread": "^7.10.1",
"@babel/plugin-proposal-private-methods": "^7.10.1",
"@babel/preset-env": "^7.10.2",
"autoprefixer": "^9.8.0",
"@babel/cli": "^7.10.5",
"@babel/core": "^7.11.4",
"@babel/preset-env": "^7.11.0",
"autoprefixer": "^9.8.6",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.0.1",
"cheerio": "^1.0.0-rc.3",
"chokidar": "^3.4.0",
"codecov": "^3.7.0",
"chokidar": "^3.4.2",
"codecov": "^3.7.2",
"cssnano": "^4.1.10",
"dedent": "^0.7.0",
"docsify-themeable": "^0.8.1",
"eslint": "^7.2.0",
"eslint": "^7.7.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "~2.20.2",
"jest": "^26.0.1",
"jest-junit": "^10.0.0",
"jsdoc": "^3.6.4",
"eslint-plugin-import": "^2.22.0",
"jest": "^26.4.2",
"jest-junit": "^11.1.0",
"jsdoc": "^3.6.5",
"minami": "^1.2.3",
"npm-run-all": "^4.1.5",
"prettier": "^2.0.5",
"rimraf": "^3.0.2",
"sass": "1.26.8",
"sass": "1.26.10",
"serve-handler": "^6.1.3",
"stylelint": "^13.6.0",
"stylelint-config-prettier": "^8.0.1",
"stylelint": "^13.6.1",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^20.0.0",
"stylelint-scss": "^3.17.2",
"ws": "^7.3.0"
"stylelint-scss": "^3.18.0",
"ws": "^7.3.1"
},
"dependencies": {
"color-string": "^1.5.3",
Expand Down
Loading

0 comments on commit 35abe72

Please sign in to comment.