Merge branch 'storybook' into react-find-bar

2016-07-06 15:51:43 -03:00
parent 0a359f253e 409f0e2ec0
commit cc505a4025
8 changed files with 107 additions and 5 deletions
--- a/webpack.config.js
+++ b/webpack.config.js
@ -7,12 +7,12 @@ module.exports = {
    loaders: [
      {
        test: /\.((png)|(eot)|(woff)|(woff2)|(ttf)|(svg)|(gif))(\?v=\d+\.\d+\.\d+)?$/,
-        loader: 'file?name=/[hash].[ext]'
+        loader: 'url-loader?limit=100000'
      },
      { test: /\.json$/, loader: 'json-loader' },
      {
        test: /\.css$/,
-        loader: 'style!css?modules!postcss'
+        loader: 'style!css?modules&importLoaders=1!postcss'
      },
      {
        loader: 'babel',
@ -28,6 +28,7 @@ module.exports = {
  },

  postcss: [
+    require('postcss-import')({ addDependencyTo: webpack }),
    require('postcss-cssnext')
  ],