Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade dependent packages to the latest version #158

Merged
merged 4 commits into from
May 5, 2019
Merged

Upgrade dependent packages to the latest version #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b954c7
Update dependent packages to the latest version
yhatt May 5, 2019
099b6cf
Use Dart Sass instead of node-sass
yhatt May 5, 2019
68ae0c1
Remove fibers to support carbon build
yhatt May 5, 2019
72f5bbf
Update CHANGELOG.md
yhatt May 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
### Changed

- Use browser-sync instead of docsify-cli to serve docs on local ([#157](https://github.com/marp-team/marpit/pull/157))
- Upgrade dependent packages to the latest version ([#158](https://github.com/marp-team/marpit/pull/158))
- Swap Sass compiler for document from node-sass to Dart Sass ([#158](https://github.com/marp-team/marpit/pull/158))

### Removed

Expand Down
32 changes: 16 additions & 16 deletions docsify/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ const fs = require('fs')
const mkdirp = require('mkdirp')
const postcss = require('postcss')
const path = require('path')
const sass = require('node-sass')
const sass = require('sass')

const from = path.join(__dirname, './docsify.scss')
const to = path.join(__dirname, '../docs/style/docsify.css')

sass.render(
{ file: from, outFile: to, sourceMap: true, sourceMapEmbed: true },
(err, { css }) => {
if (err) throw err
const { css } = sass.renderSync({
file: from,
outFile: to,
sourceMap: true,
sourceMapEmbed: true,
})

postcss([
autoprefixer,
cssnano({ preset: ['default', { mergeLonghand: false }] }),
])
.process(css, { from, to, map: { annotation: false, inline: false } })
.then(ret => {
mkdirp.sync(path.dirname(to))
fs.writeFileSync(to, ret.css)
})
}
)
postcss([
autoprefixer,
cssnano({ preset: ['default', { mergeLonghand: false }] }),
])
.process(css, { from, to, map: { annotation: false, inline: false } })
.then(ret => {
mkdirp.sync(path.dirname(to))
fs.writeFileSync(to, ret.css)
})
51 changes: 23 additions & 28 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,41 +56,41 @@
"watch": "babel src --out-dir lib -w --verbose"
},
"devDependencies": {
"@babel/cli": "^7.4.3",
"@babel/core": "^7.4.3",
"@babel/plugin-proposal-class-properties": "^7.4.0",
"@babel/plugin-proposal-object-rest-spread": "^7.4.3",
"@babel/plugin-proposal-private-methods": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"autoprefixer": "^9.5.0",
"@babel/cli": "^7.4.4",
"@babel/core": "^7.4.4",
"@babel/plugin-proposal-class-properties": "^7.4.4",
"@babel/plugin-proposal-object-rest-spread": "^7.4.4",
"@babel/plugin-proposal-private-methods": "^7.4.4",
"@babel/preset-env": "^7.4.4",
"autoprefixer": "^9.5.1",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.7.0",
"babel-jest": "^24.8.0",
"browser-sync": "^2.26.5",
"cheerio": "^1.0.0-rc.2",
"cheerio": "^1.0.0-rc.3",
"codecov": "^3.3.0",
"cross-env": "^5.2.0",
"cssnano": "^4.1.10",
"dedent": "^0.7.0",
"docsify-themeable": "^0.7.1",
"docsify-themeable": "^0.7.2",
"eslint": "^5.16.0",
"eslint-config-airbnb-base": "13.1.0",
"eslint-config-prettier": "^4.1.0",
"eslint-plugin-import": "^2.16.0",
"jest": "^24.7.0",
"jest-junit": "^6.3.0",
"jsdoc": "^3.5.5",
"eslint-config-prettier": "^4.2.0",
"eslint-plugin-import": "^2.17.2",
"jest": "^24.8.0",
"jest-junit": "^6.4.0",
"jsdoc": "^3.6.0",
"minami": "^1.2.3",
"mkdirp": "^0.5.1",
"node-sass": "^4.11.0",
"nodemon": "^1.18.10",
"nodemon": "^1.19.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.16.4",
"prettier": "^1.17.0",
"rimraf": "^2.6.3",
"stylelint": "^9.10.1",
"stylelint-config-prettier": "^5.0.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-scss": "^3.5.4"
"sass": "^1.20.1",
"stylelint": "^10.0.1",
"stylelint-config-prettier": "^5.1.0",
"stylelint-config-standard": "^18.3.0",
"stylelint-scss": "^3.6.1"
},
"dependencies": {
"color-string": "^1.5.3",
Expand All @@ -99,12 +99,7 @@
"lodash.kebabcase": "^4.1.1",
"markdown-it": "^8.4.2",
"markdown-it-front-matter": "^0.1.2",
"postcss": "^7.0.14"
},
"resolutions": {
"braces": "^2.3.2",
"marked": "^0.6.2",
"tar": "^4.4.8"
"postcss": "^7.0.16"
},
"publishConfig": {
"access": "public"
Expand Down
Loading