Merge remote-tracking branch 'origin/master' into dependencies.io-update-build-103.0.0

# Conflicts:
#	addons/knobs/package.json
This commit is contained in:
hypnos 2017-12-07 02:04:59 +03:00
commit b4792684a1
4 changed files with 9 additions and 15 deletions

View File

@ -28,7 +28,7 @@
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@types/node": "^8.0.55",
"@types/node": "^8.0.56",
"@types/react": "^16.0.27",
"raw-loader": "^0.5.1",
"style-loader": "^0.19.0",

View File

@ -33,7 +33,7 @@ collectors:
versions: "L.Y.Y"
settings:
batch_mode: true
bootstrap_command: echo 'Skip updating lockfile'
bootstrap_command: yarn
github_labels:
- dependencies:update
github_assignees:

View File

@ -22,7 +22,7 @@
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.9",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.9.5"
"webpack-dev-server": "^2.9.6"
},
"dependencies": {
"vue": "^2.5.9",

View File

@ -114,10 +114,6 @@
dependencies:
babel-runtime "^6.5.0"
"@types/events@*":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@types/events/-/events-1.1.0.tgz#93b1be91f63c184450385272c47b6496fd028e02"
"@types/inline-style-prefixer@^3.0.0":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@types/inline-style-prefixer/-/inline-style-prefixer-3.0.1.tgz#8541e636b029124b747952e9a28848286d2b5bf6"
@ -132,11 +128,9 @@
version "8.0.52"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.52.tgz#8e7f47747868e7687f2cd4922966e2d6af78d22d"
"@types/node@^8.0.54":
version "8.0.54"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.54.tgz#3fd9357db4af388b79e03845340259440edffde6"
dependencies:
"@types/events" "*"
"@types/node@^8.0.56":
version "8.0.56"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.56.tgz#c4652f88d7a677e26ccc16c1485c282ce28f1ce9"
"@types/react@^16.0.18", "@types/react@^16.0.20":
version "16.0.23"
@ -12162,9 +12156,9 @@ webpack-dev-server@2.9.4:
webpack-dev-middleware "^1.11.0"
yargs "^6.6.0"
webpack-dev-server@^2.9.5:
version "2.9.5"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.5.tgz#79336fba0087a66ae491f4869f6545775b18daa8"
webpack-dev-server@^2.9.6:
version "2.9.6"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.6.tgz#3e3b56c4222694d2b900c3e8e19dd2e990a817f3"
dependencies:
ansi-html "0.0.7"
array-includes "^3.0.3"