Merge remote-tracking branch 'origin/master' into webpack-4

# Conflicts:
#	app/angular/package.json
#	app/polymer/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/react/src/server/config/webpack.config.js
#	app/vue/package.json
#	lib/core/package.json

addons/a11y/package.json

@@ -29,7 +29,7 @@
     "axe-core": "^2.6.1",
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.6",
+    "glamorous": "^4.12.0",
     "prop-types": "^15.6.1"
   },
   "devDependencies": {

addons/actions/package.json

@@ -24,7 +24,7 @@
     "babel-runtime": "^6.26.0",
     "deep-equal": "^1.0.1",
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.6",
+    "glamorous": "^4.12.0",
     "global": "^4.3.2",
     "make-error": "^1.3.4",
     "prop-types": "^15.6.1",

addons/background/src/BackgroundPanel.js

@@ -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');
     });
   }
 

addons/info/package.json

@@ -19,7 +19,7 @@
     "@storybook/components": "^3.4.0-alpha.9",
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.6",
+    "glamorous": "^4.12.0",
     "global": "^4.3.2",
     "marksy": "^6.0.3",
     "nested-object-assign": "^1.0.1",

addons/jest/package.json

@@ -28,7 +28,7 @@
     "@storybook/components": "^3.4.0-alpha.9",
     "babel-runtime": "^6.26.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.6",
+    "glamorous": "^4.12.0",
     "global": "^4.3.2",
     "prop-types": "^15.6.1"
   },

addons/knobs/package.json

@@ -21,7 +21,7 @@
     "global": "^4.3.2",
     "insert-css": "^2.0.0",
     "lodash.debounce": "^4.0.8",
-    "moment": "^2.20.1",
+    "moment": "^2.21.0",
     "prop-types": "^15.6.1",
     "react-color": "^2.14.0",
     "react-datetime": "^2.14.0",

app/angular/package.json

@@ -31,7 +31,7 @@
     "airbnb-js-shims": "^1.4.1",
     "angular2-template-loader": "^0.6.2",
     "babel-loader": "^7.1.3",
-    "babel-plugin-macros": "^2.1.0",
+    "babel-plugin-macros": "^2.2.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.23.0",
@@ -55,7 +55,7 @@
     "uglifyjs-webpack-plugin": "^1.2.2",
     "util-deprecate": "^1.0.2",
     "webpack": "^4.0.1",
-    "webpack-hot-middleware": "^2.21.1",
+    "webpack-hot-middleware": "^2.21.2",
     "zone.js": "^0.8.20"
   },
   "devDependencies": {

app/angular/src/server/config/webpack.config.js

@@ -2,9 +2,10 @@ import path from 'path';
 import webpack from 'webpack';
 import Dotenv from 'dotenv-webpack';
 import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
+import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import { WatchMissingNodeModulesPlugin, managerPath } from '@storybook/core/server';
+import { managerPath } from '@storybook/core/server';
 
 import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from './utils';
 import babelLoaderConfig from './babel';

app/polymer/package.json

@@ -31,7 +31,7 @@
     "@webcomponents/webcomponentsjs": "^1.1.0",
     "airbnb-js-shims": "^1.4.1",
     "babel-loader": "^7.1.3",
-    "babel-plugin-macros": "^2.1.0",
+    "babel-plugin-macros": "^2.2.0",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.26.0",
@@ -56,7 +56,7 @@
     "uglifyjs-webpack-plugin": "^1.2.2",
     "util-deprecate": "^1.0.2",
     "webpack": "^4.0.1",
-    "webpack-hot-middleware": "^2.21.1"
+    "webpack-hot-middleware": "^2.21.2"
   },
   "devDependencies": {
     "nodemon": "^1.17.1"

app/polymer/src/server/config/webpack.config.js

@@ -2,10 +2,11 @@ import path from 'path';
 import webpack from 'webpack';
 import Dotenv from 'dotenv-webpack';
 import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
+import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
-import { WatchMissingNodeModulesPlugin, managerPath } from '@storybook/core/server';
+import { managerPath } from '@storybook/core/server';
 
 import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from './utils';
 import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';

app/react-native/package.json

@@ -32,7 +32,7 @@
     "@storybook/core": "^3.4.0-alpha.9",
     "@storybook/ui": "^3.4.0-alpha.9",
     "babel-loader": "^7.1.3",
-    "babel-plugin-macros": "^2.1.0",
+    "babel-plugin-macros": "^2.2.0",
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
@@ -53,6 +53,7 @@
     "json5": "^0.5.1",
     "markdown-loader": "^2.0.2",
     "prop-types": "^15.6.1",
+    "react-dev-utils": "^5.0.0",
     "react-native-compat": "^1.0.0",
     "react-native-iphone-x-helper": "^1.0.2",
     "shelljs": "^0.8.1",
@@ -62,7 +63,7 @@
     "uuid": "^3.2.1",
     "webpack": "^4.0.1",
     "webpack-dev-middleware": "^3.0.0",
-    "webpack-hot-middleware": "^2.21.1",
+    "webpack-hot-middleware": "^2.21.2",
     "ws": "^4.1.0"
   },
   "devDependencies": {

app/react-native/src/server/config/utils.js

@@ -10,3 +10,5 @@ export const OccurenceOrderPlugin =
 export const includePaths = [path.resolve('./')];
 
 export const excludePaths = [path.resolve('./node_modules')];
+
+export const nodeModulesPaths = path.resolve('./node_modules');

app/react-native/src/server/config/webpack.config.js

@@ -1,8 +1,9 @@
 import path from 'path';
 import webpack from 'webpack';
+import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import { OccurenceOrderPlugin, includePaths, excludePaths } from './utils';
+import { OccurenceOrderPlugin, includePaths, excludePaths, nodeModulesPaths } from './utils';
 
 const getConfig = options => ({
   devtool: '#cheap-module-eval-source-map',
@@ -25,6 +26,7 @@ const getConfig = options => ({
     new OccurenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
     new CaseSensitivePathsPlugin(),
+    new WatchMissingNodeModulesPlugin(nodeModulesPaths),
   ],
   module: {
     rules: [

app/react/package.json

@@ -33,7 +33,7 @@
     "@storybook/ui": "^3.4.0-alpha.9",
     "airbnb-js-shims": "^1.4.1",
     "babel-loader": "^7.1.3",
-    "babel-plugin-macros": "^2.1.0",
+    "babel-plugin-macros": "^2.2.0",
     "babel-plugin-react-docgen": "^1.8.3",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -48,7 +48,7 @@
     "dotenv-webpack": "^1.5.5",
     "find-cache-dir": "^1.0.0",
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.6",
+    "glamorous": "^4.12.0",
     "global": "^4.3.2",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.0.4",
@@ -61,7 +61,7 @@
     "uglifyjs-webpack-plugin": "^1.2.2",
     "util-deprecate": "^1.0.2",
     "webpack": "^4.0.1",
-    "webpack-hot-middleware": "^2.21.1"
+    "webpack-hot-middleware": "^2.21.2"
   },
   "devDependencies": {
     "nodemon": "^1.17.1"

app/vue/package.json

@@ -29,7 +29,7 @@
     "@storybook/ui": "^3.4.0-alpha.9",
     "airbnb-js-shims": "^1.4.1",
     "babel-loader": "^7.1.3",
-    "babel-plugin-macros": "^2.1.0",
+    "babel-plugin-macros": "^2.2.0",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.0",
@@ -53,7 +53,7 @@
     "uglifyjs-webpack-plugin": "^1.2.2",
     "util-deprecate": "^1.0.2",
     "webpack": "^4.0.1",
-    "webpack-hot-middleware": "^2.21.1"
+    "webpack-hot-middleware": "^2.21.2"
   },
   "devDependencies": {
     "nodemon": "^1.17.1",

app/vue/src/server/config/webpack.config.js

@@ -2,9 +2,10 @@ import path from 'path';
 import webpack from 'webpack';
 import Dotenv from 'dotenv-webpack';
 import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
+import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
-import { WatchMissingNodeModulesPlugin, managerPath } from '@storybook/core/server';
+import { managerPath } from '@storybook/core/server';
 
 import { includePaths, excludePaths, nodeModulesPaths, loadEnv, nodePaths } from './utils';
 import { getPreviewHeadHtml, getManagerHeadHtml } from '../utils';

docs/package.json

@@ -24,14 +24,14 @@
     "@storybook/react": "^3.3.14",
     "babel-loader": "^6.4.1",
     "bootstrap": "^3.3.7",
-    "gatsby": "^1.9.221",
+    "gatsby": "^1.9.223",
     "gatsby-link": "^1.6.38",
-    "gatsby-plugin-sharp": "^1.6.37",
+    "gatsby-plugin-sharp": "^1.6.38",
     "gatsby-remark-autolink-headers": "^1.4.13",
-    "gatsby-remark-copy-linked-files": "^1.5.29",
-    "gatsby-remark-images": "^1.5.53",
+    "gatsby-remark-copy-linked-files": "^1.5.30",
+    "gatsby-remark-images": "^1.5.54",
     "gatsby-remark-smartypants": "^1.4.12",
-    "gatsby-source-filesystem": "^1.5.25",
+    "gatsby-source-filesystem": "^1.5.26",
     "gatsby-transformer-remark": "^1.7.34",
     "gh-pages": "^1.1.0",
     "global": "^4.3.2",

docs/yarn.lock

@@ -4410,9 +4410,9 @@ gatsby-module-loader@^1.0.11:
     babel-runtime "^6.26.0"
     loader-utils "^0.2.16"
 
-gatsby-plugin-sharp@^1.6.37:
-  version "1.6.37"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-1.6.37.tgz#26801f6a7075508b10aaf1a016acf74b7be20aa2"
+gatsby-plugin-sharp@^1.6.38:
+  version "1.6.38"
+  resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-1.6.38.tgz#4906b236b846b383adbd30359493f76cf3bfefbd"
   dependencies:
     async "^2.1.2"
     babel-runtime "^6.26.0"
@@ -4444,9 +4444,9 @@ gatsby-remark-autolink-headers@^1.4.13:
     mdast-util-to-string "^1.0.2"
     unist-util-visit "^1.1.1"
 
-gatsby-remark-copy-linked-files@^1.5.29:
-  version "1.5.29"
-  resolved "https://registry.yarnpkg.com/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-1.5.29.tgz#9e2a1de28dc7f93be784e401ba51703181021790"
+gatsby-remark-copy-linked-files@^1.5.30:
+  version "1.5.30"
+  resolved "https://registry.yarnpkg.com/gatsby-remark-copy-linked-files/-/gatsby-remark-copy-linked-files-1.5.30.tgz#5834fb6d4a8a50c58e7e91309bd0af396474dd29"
   dependencies:
     babel-runtime "^6.26.0"
     cheerio "^1.0.0-rc.2"
@@ -4457,13 +4457,13 @@ gatsby-remark-copy-linked-files@^1.5.29:
     probe-image-size "^3.2.0"
     unist-util-visit "^1.1.1"
 
-gatsby-remark-images@^1.5.53:
-  version "1.5.53"
-  resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.53.tgz#9fb3883748e680c88ad6c42598a7e08b64c27f57"
+gatsby-remark-images@^1.5.54:
+  version "1.5.54"
+  resolved "https://registry.yarnpkg.com/gatsby-remark-images/-/gatsby-remark-images-1.5.54.tgz#d3a30dee378570b301c88bf3a0b8c47adaca0cd6"
   dependencies:
     babel-runtime "^6.26.0"
     cheerio "^1.0.0-rc.2"
-    gatsby-plugin-sharp "^1.6.37"
+    gatsby-plugin-sharp "^1.6.38"
     is-relative-url "^2.0.0"
     lodash "^4.17.4"
     slash "^1.0.0"
@@ -4478,9 +4478,9 @@ gatsby-remark-smartypants@^1.4.12:
     retext-smartypants "^2.0.0"
     unist-util-visit "^1.1.1"
 
-gatsby-source-filesystem@^1.5.25:
-  version "1.5.25"
-  resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.25.tgz#51c08f9812d3d8554721df4e32a0cdd12eccb0cd"
+gatsby-source-filesystem@^1.5.26:
+  version "1.5.26"
+  resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.26.tgz#1901649fddf31e8fab35b94aefb9e16af81f01a0"
   dependencies:
     babel-cli "^6.26.0"
     babel-runtime "^6.26.0"
@@ -4519,9 +4519,9 @@ gatsby-transformer-remark@^1.7.34:
     unist-util-select "^1.5.0"
     unist-util-visit "^1.1.1"
 
-gatsby@^1.9.221:
-  version "1.9.221"
-  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.221.tgz#3e9ce1f93c7bef59d502c79b539e24dea70b6bbd"
+gatsby@^1.9.223:
+  version "1.9.223"
+  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.223.tgz#1bf9416cd6a6ceccb1f74da7f0eb10f16fb8010b"
   dependencies:
     async "^2.1.2"
     babel-code-frame "^6.22.0"

lib/cli/package.json

@@ -30,10 +30,10 @@
     "babel-preset-env": "^1.6.0",
     "babel-register": "^6.26.0",
     "babel-runtime": "^6.26.0",
-    "chalk": "^2.3.1",
+    "chalk": "^2.3.2",
     "child-process-promise": "^2.2.1",
     "commander": "^2.14.1",
-    "cross-spawn": "^6.0.4",
+    "cross-spawn": "^6.0.5",
     "jscodeshift": "^0.4.1",
     "json5": "^0.5.1",
     "latest-version": "^3.1.0",

lib/components/package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "glamor": "^2.20.40",
-    "glamorous": "^4.11.6",
+    "glamorous": "^4.12.0",
     "prop-types": "^15.6.1"
   },
   "peerDependencies": {

lib/core/package.json

@@ -24,7 +24,7 @@
     "@storybook/ui": "^3.4.0-alpha.9",
     "autoprefixer": "^7.2.6",
     "babel-runtime": "^6.26.0",
-    "chalk": "^2.3.1",
+    "chalk": "^2.3.2",
     "commander": "^2.14.1",
     "css-loader": "^0.28.10",
     "dotenv": "^5.0.1",
@@ -45,6 +45,6 @@
     "url-loader": "^1.0.1",
     "webpack": "^4.0.1",
     "webpack-dev-middleware": "^3.0.0",
-    "webpack-hot-middleware": "^2.21.1"
+    "webpack-hot-middleware": "^2.21.2"
   }
 }

lib/core/server.js

@@ -1,10 +1,8 @@
 const assign = require('babel-runtime/core-js/object/assign').default;
 const defaultWebpackConfig = require('./dist/server/config/defaults/webpack.config');
-const WatchMissingNodeModulesPlugin = require('./dist/server/config/WatchMissingNodeModulesPlugin');
 const buildStatic = require('./dist/server/build-static');
 const buildDev = require('./dist/server/build-dev');
 
 module.exports = assign({}, defaultWebpackConfig, buildStatic, buildDev, {
-  WatchMissingNodeModulesPlugin,
   managerPath: require.resolve('./dist/client/manager'),
 });