Merge pull request #133 from danny-andrews/fix-build

Fix test and demo

Author: roylee0704

webpack.config.js

@@ -3,7 +3,6 @@ const testConfig = require('./webpack.config.test');
 const developmentConfig = require('./webpack.config.development');
 const productionConfig = require('./webpack.config.production');
 const autoprefixer = require('autoprefixer');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 const configForEnv = (env) => {
   switch (env) {
@@ -25,19 +24,13 @@ const baseConfig = {
         test: /\.js$/,
         loader: 'babel',
         exclude: /node_modules/,
-      }, {
-        test: /\.css$/,
-        loader: ExtractTextPlugin.extract('style-loader', 'css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss')
       }
     ]
   },
   resolve: {
-    extensions: ['', '.scss', '.js', '.json']
+    extensions: ['', '.css', '.scss', '.js', '.json']
   },
-  postcss: [autoprefixer],
-  plugins: [
-    new ExtractTextPlugin('[name].css'),
-  ]
+  postcss: [autoprefixer]
 };
 
 module.exports = merge(baseConfig, configForEnv(process.env.NODE_ENV));

webpack.config.production.js

@@ -1,5 +1,7 @@
 const path = require('path');
 const pkg = require('./package.json');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const webpack = require('webpack');
 
 const LIB_NAME = pkg.name;
 
@@ -13,5 +15,19 @@ module.exports = {
     library: 'ReactFlexboxGrid',
     filename: '[name].js',
   },
-  externals: ['react']
+  module: {
+    loaders: [
+      {
+        test: /\.css$/,
+        loader: ExtractTextPlugin.extract('style-loader', 'css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss')
+      }
+    ],
+  },
+  externals: ['react'],
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify('production')
+    }),
+    new ExtractTextPlugin('[name].css')
+  ]
 };

webpack.config.test.js

@@ -3,8 +3,8 @@ const webpack = require('webpack');
 module.exports = {
   module: {
     loaders: [{
-      test: /(\.scss|\.css)$/,
-      loader: 'style!css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss!sass'
+      test: /\.css$/,
+      loader: 'style!css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]!postcss'
     }]
   },
   watch: true,