Merge branch 'master' into unset-background

storybookjs · Mar 4, 2018 · b7ea38e · b7ea38e
2 parents 724dcd9 + 83aac95
commit b7ea38e
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 41 deletions.
diff --git a/app/angular/src/server/config/webpack.config.js b/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';

diff --git a/app/polymer/src/server/config/webpack.config.js b/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';

diff --git a/app/react-native/package.json b/app/react-native/package.json
@@ -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",

diff --git a/app/react-native/src/server/config/utils.js b/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');
diff --git a/app/react-native/src/server/config/webpack.config.js b/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: [

diff --git a/app/react/src/server/config/webpack.config.js b/app/react/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';

diff --git a/app/vue/src/server/config/webpack.config.js b/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';

diff --git a/lib/core/server.js b/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'),
 });
diff --git a/lib/core/src/server/config/WatchMissingNodeModulesPlugin.js b/lib/core/src/server/config/WatchMissingNodeModulesPlugin.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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');