Skip to content

Commit

Permalink
🔀 Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
gluons committed Sep 2, 2018
2 parents 714e9cb + 459c370 commit c537128
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 20 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"rollup-plugin-commonjs": "^9.1.5",
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-resolve-alias": "^0.2.0",
"rollup-plugin-typescript2": "^0.16.1",
"rollup-plugin-typescript2": "^0.17.0",
"rollup-plugin-vue": "^4.3.2",
"vue-template-compiler": "^2.5.17",
"yargs": "^12.0.1"
Expand Down
31 changes: 12 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2569,17 +2569,17 @@ from2@^2.1.0:
inherits "^2.0.1"
readable-stream "^2.0.0"

fs-extra@5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
fs-extra@6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
fs-extra@7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
dependencies:
graceful-fs "^4.1.2"
jsonfile "^4.0.0"
Expand Down Expand Up @@ -6115,13 +6115,13 @@ rollup-plugin-resolve-alias@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/rollup-plugin-resolve-alias/-/rollup-plugin-resolve-alias-0.2.0.tgz#269c11e1ee09abb51ba618f5456a536f86502aaa"

rollup-plugin-typescript2@^0.16.1:
version "0.16.1"
resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.16.1.tgz#72e1f8a2e450550eabdc3d474e735feae322b474"
rollup-plugin-typescript2@^0.17.0:
version "0.17.0"
resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.17.0.tgz#a540eecfe9ad8ff5e8e86eaf5069bb2a7f84f33a"
dependencies:
fs-extra "5.0.0"
fs-extra "7.0.0"
resolve "1.8.1"
rollup-pluginutils "2.3.0"
rollup-pluginutils "2.3.1"
tslib "1.9.3"

rollup-plugin-vue@^4.3.2:
Expand All @@ -6136,14 +6136,7 @@ rollup-plugin-vue@^4.3.2:
querystring "^0.2.0"
rollup-pluginutils "^2.0.1"

[email protected]:
version "2.3.0"
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4"
dependencies:
estree-walker "^0.5.2"
micromatch "^2.3.11"

rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.0:
[email protected], rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz#760d185ccc237dedc12d7ae48c6bcd127b4892d0"
dependencies:
Expand Down

0 comments on commit c537128

Please sign in to comment.