Merge branch 'master' into master

README.md

@@ -40,11 +40,11 @@ For full documentation on using Storybook visit: [storybooks.js.org](https://sto
 - [Storybook for react-native](app/react-native) - Storybook for React components
 
 ### Sub Projects
-- [Storyshots](lib/storyshots) - Easy snapshot testing for storybook
 - [CLI](lib/cli) - Streamlined installation for a variety of app types
 - [examples](examples) - Code examples to illustrate different Storybook use cases
 
 ### Addons
+- [addon-storyshots](addons/storyshots) - Easy snapshot testing for storybook
 - [addon-actions](addons/actions/) - Log actions as users interact with components in storybook
 - [addon-comments](addons/comments/) - Comment on storybook stories
 - [addon-graphql](addons/graphql/) - Query a GraphQL server within Storybook stories

app/react/src/server/config/defaults/webpack.config.js

@@ -5,18 +5,7 @@ import { includePaths, excludePaths } from '../utils';
 // Add a default custom config which is similar to what React Create App does.
 module.exports = storybookBaseConfig => {
   const newConfig = { ...storybookBaseConfig };
-  newConfig.plugins = [
-    ...storybookBaseConfig.plugins,
-    new webpack.LoaderOptionsPlugin({
-      options: {
-        postcss: [
-          autoprefixer({
-            browsers: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie < 9'],
-          }),
-        ],
-      },
-    }),
-  ];
+
   newConfig.module.rules = [
     ...storybookBaseConfig.module.rules,
     {
@@ -31,7 +20,16 @@ module.exports = storybookBaseConfig => {
             importLoaders: 1,
           },
         },
-        'postcss-loader',
+        {
+          loader: 'postcss-loader',
+          options: {
+            plugins: () => [
+              autoprefixer({
+                browsers: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie < 9'],
+              }),
+            ],
+          },
+        },
       ],
     },
     {