marp-team/marp
1
1
Fork 0
mirror of https://github.com/marp-team/marp.git synced 2024-12-02 12:35:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into markdown-settings

Browse Source
This commit is contained in:
Yuki Hattori 2018-06-05 01:05:36 +09:00
commit e26b0f6723
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -45,7 +45,7 @@
"lerna": "^2.11.0",
"mocha": "^5.2.0",
"power-assert": "^1.5.0",
"prettier": "^1.13.3",
"prettier": "^1.13.4",
"rimraf": "^2.6.2",
"stylelint": "^9.2.1",
"stylelint-config-prettier": "^3.2.0",

4
packages/marp/package.json
View File

@ -24,7 +24,7 @@
"watch": "node ../../rollup_watch.js"
},
"devDependencies": {
"autoprefixer": "^8.5.2",
"autoprefixer": "^8.6.0",
"cheerio": "^1.0.0-rc.2",
"github-markdown-css": "^2.10.0",
"node-sass": "^4.9.0",
@ -33,7 +33,7 @@
"rollup-plugin-postcss": "^1.6.2"
},
"dependencies": {
"@marp-team/marpit": "^0.0.6",
"@marp-team/marpit": "^0.0.7",
"highlight.js": "^9.12.0",
"markdown-it-emoji": "^1.4.0"
}

37
yarn.lock
View File

@ -568,12 +568,12 @@
lodash "^4.17.5"
to-fast-properties "^2.0.0"
"@marp-team/marpit@^0.0.6":
version "0.0.6"
resolved "https://registry.yarnpkg.com/@marp-team/marpit/-/marpit-0.0.6.tgz#ace18e1b78eb924361749e91f5c00a48a784c963"
"@marp-team/marpit@^0.0.7":
version "0.0.7"
resolved "https://registry.yarnpkg.com/@marp-team/marpit/-/marpit-0.0.7.tgz#06de9716a5c30d35773b098800812292a382a1ce"
dependencies:
emoji-regex "^6.5.1"
js-yaml "^3.11.0"
js-yaml "^3.12.0"
lodash.kebabcase "^4.1.1"
markdown-it "^8.4.1"
markdown-it-front-matter "^0.1.2"
@ -847,12 +847,12 @@ autoprefixer@^8.0.0:
postcss "^6.0.20"
postcss-value-parser "^3.2.3"
autoprefixer@^8.5.2:
version "8.5.2"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.5.2.tgz#52d86a5ea51a6191024d843f88f2748ce3ab39e5"
autoprefixer@^8.6.0:
version "8.6.0"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.0.tgz#6da6b0791e15cb0ebf33c3f299414afd340672c0"
dependencies:
browserslist "^3.2.8"
caniuse-lite "^1.0.30000846"
caniuse-lite "^1.0.30000847"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.22"
@ -1124,10 +1124,14 @@ caniuse-lite@^1.0.30000817, caniuse-lite@^1.0.30000819:
version "1.0.30000820"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000820.tgz#6e36ee75187a2c83d26d6504a1af47cc580324d2"
caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000846:
caniuse-lite@^1.0.30000844:
version "1.0.30000847"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000847.tgz#be77f439be29bbc57ae08004b1e470b653b1ec1d"
caniuse-lite@^1.0.30000847:
version "1.0.30000848"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000848.tgz#ec9c0a72ec8f9ef812e4f4b8628625af9c85ade0"
capture-stack-trace@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
@ -3343,7 +3347,14 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
js-yaml@^3.11.0, js-yaml@^3.4.3, js-yaml@^3.9.0, js-yaml@^3.9.1:
js-yaml@^3.12.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
js-yaml@^3.4.3, js-yaml@^3.9.0, js-yaml@^3.9.1:
version "3.11.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
dependencies:
@ -4855,9 +4866,9 @@ prettier@^1.11.1:
version "1.11.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
prettier@^1.13.3:
version "1.13.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.3.tgz#e74c09a7df6519d472ca6febaa37cf7addb48a20"
prettier@^1.13.4:
version "1.13.4"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.4.tgz#31bbae6990f13b1093187c731766a14036fa72e6"
private@^0.1.6:
version "0.1.8"