Merge branch 'master' into dependencies.io-update-build-282.1.0

This commit is contained in:
Filipp Riabchun 2018-03-04 20:41:43 +03:00 committed by GitHub
commit a0adf3c383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 9 deletions

View File

@ -89,6 +89,7 @@ export default class BackgroundPanel extends Component {
this.channel.on('background-unset', () => {
this.setState({ backgrounds: [] });
api.setQueryParams({ background: null });
this.updateIframe('none');
});
}

View File

@ -55,7 +55,7 @@
"uglifyjs-webpack-plugin": "^1.2.2",
"util-deprecate": "^1.0.2",
"webpack": "^3.11.0",
"webpack-hot-middleware": "^2.21.1",
"webpack-hot-middleware": "^2.21.2",
"zone.js": "^0.8.20"
},
"devDependencies": {

View File

@ -56,7 +56,7 @@
"uglifyjs-webpack-plugin": "^1.2.2",
"util-deprecate": "^1.0.2",
"webpack": "^3.11.0",
"webpack-hot-middleware": "^2.21.1"
"webpack-hot-middleware": "^2.21.2"
},
"devDependencies": {
"nodemon": "^1.17.1"

View File

@ -63,7 +63,7 @@
"uuid": "^3.2.1",
"webpack": "^3.11.0",
"webpack-dev-middleware": "^1.12.2",
"webpack-hot-middleware": "^2.21.1",
"webpack-hot-middleware": "^2.21.2",
"ws": "^4.1.0"
},
"devDependencies": {

View File

@ -61,7 +61,7 @@
"uglifyjs-webpack-plugin": "^1.2.2",
"util-deprecate": "^1.0.2",
"webpack": "^3.11.0",
"webpack-hot-middleware": "^2.21.1"
"webpack-hot-middleware": "^2.21.2"
},
"devDependencies": {
"nodemon": "^1.17.1"

View File

@ -53,7 +53,7 @@
"uglifyjs-webpack-plugin": "^1.2.2",
"util-deprecate": "^1.0.2",
"webpack": "^3.11.0",
"webpack-hot-middleware": "^2.21.1"
"webpack-hot-middleware": "^2.21.2"
},
"devDependencies": {
"nodemon": "^1.17.1",

View File

@ -45,6 +45,6 @@
"url-loader": "^0.6.2",
"webpack": "^3.11.0",
"webpack-dev-middleware": "^1.12.2",
"webpack-hot-middleware": "^2.21.1"
"webpack-hot-middleware": "^2.21.2"
}
}

View File

@ -16341,9 +16341,9 @@ webpack-dev-server@~2.11.0:
webpack-dev-middleware "1.12.2"
yargs "6.6.0"
webpack-hot-middleware@^2.21.1:
version "2.21.1"
resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.1.tgz#1b03b20a1a65a2e2ea0ea987476a5d23370ff176"
webpack-hot-middleware@^2.21.2:
version "2.21.2"
resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.21.2.tgz#2e2aa65563b8b32546b67e53b5a9667dcd80f327"
dependencies:
ansi-html "0.0.7"
html-entities "^1.2.0"