fix demo

samueldelesque · samueldelesque · commit 2febeebc4ca0 · 2016-03-08T19:40:12.000-05:00
diff --git a/components/demo/demo.jsx b/components/demo/demo.jsx
@@ -4,8 +4,8 @@ import moment from 'moment'
 import DatePickerRange from 'react-daterange-picker'
 
 import Area from 'components/charts/area/area'
-import Pie from 'components/charts/pie/pie'
-import BarMetric from 'components/charts/bar/bar'
+import CirclePie from 'components/charts/circle-pie/circle-pie'
+import BarMetric from 'components/charts/bar-metric/bar-metric'
 
 import DemoData from './demo-data'
 
@@ -151,15 +151,15 @@ export default class Demo extends React.Component {
           <div className="small-block">
             <div className="inner">
               <div className="pie-area">
-                <Pie percent={95}/>
+                <CirclePie percent={95}/>
                 <p>Cats gifs / All gifs</p>
               </div>
             </div>
           </div>
           <div className="small-block">
             <div className="inner">
               <div className="pie-area">
-                <Pie percent={15}/>
+                <CirclePie percent={15}/>
                 <p>Awesomeness / Cats</p>
               </div>
             </div>
diff --git a/demo/demo.js b/demo/demo.js
diff --git a/demo/index.html b/demo/index.html
@@ -6,6 +6,6 @@
   </head>
   <body>
     <div id="react-root"></div>
-    <script src="/dist/demo.bundle.js"></script>
+    <script src="/demo.js"></script>
   </body>
 </html>
diff --git a/devServer.js b/devServer.js
@@ -1,28 +1,14 @@
 var path = require('path'),
     express = require('express'),
     webpack = require('webpack'),
-    webpackDevMiddleware = require('webpack-dev-middleware'),
-    webpackHotMiddleware = require('webpack-hot-middleware'),
-    config = require('./webpack.config.dev')
+    config = require('./webpack.config.demo')
 
 
 var app = express(),
     compiler = webpack(config)
 
-
-app.use(webpackDevMiddleware(compiler, {
-  noInfo: true,
-  publicPath: config.output.publicPath,
-  stats: {colors: true}
-}))
-
-app.use(webpackHotMiddleware(compiler, {
-  log: console.log
-}))
-
-app.get('/dist/:file', function(req, res) {
-  console.log('Requesting build file', req.params.file)
-  res.sendFile(path.join(__dirname, 'dist', req.params.file))
+app.get('/demo.js', function(req, res) {
+  res.sendFile(path.join(__dirname, '/demo/demo.js'))
 })
 
 app.get('/style.css', function(req, res) {
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "scripts": {
     "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.config.prod.js",
+    "build:demo": "webpack --config webpack.config.demo.js && node devServer.js",
     "build": "npm run build:webpack",
     "start": "node devServer.js",
     "lint": "eslint src",
diff --git a/webpack.config.demo.js b/webpack.config.demo.js
@@ -1,30 +1,31 @@
 var path = require('path'),
     webpack = require('webpack'),
-    _ = require('lodash'),
-    directories = [path.resolve('./'), path.resolve('./js'), path.resolve('./components')],
-    entrypoints = require('./entrypoints.js')
+    directories = [path.resolve('./'), path.resolve('./js'), path.resolve('./components')]
 
 module.exports = {
   devtool: 'cheap-module-eval-source-map',
-  entry: _.zipObject(Object.keys(entrypoints), _.map(entrypoints, function(entrypoint){
-    return [
-      'eventsource-polyfill', // necessary for hot reloading with IE
-      'webpack-hot-middleware/client',
-      entrypoint
-    ]
-  })),
+  entry: 'components/demo/entrypoint.jsx',
   resolve: {
     root: directories,
     extensions: ['', '.js', '.es6 ', '.jsx'],
   },
   output: {
-    path: '/',
-    filename: '[name].bundle.js',
-    publicPath: '/dist/'
+    path: path.join(__dirname, 'demo'),
+    filename: 'demo.js',
+    publicPath: '/demo/'
   },
   plugins: [
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin()
+    new webpack.optimize.OccurenceOrderPlugin(),
+    new webpack.DefinePlugin({
+      'process.env': {
+        'NODE_ENV': JSON.stringify('production')
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      compressor: {
+        warnings: false
+      }
+    })
   ],
   module: {
     loaders: [
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
@@ -16,10 +16,7 @@ module.exports = {
     publicPath: '/dist/',
     library: true,
     libraryTarget: 'commonjs2'
-    // libraryTarget: "var",
-    // library: "ReactSimpleCharts"
   },
-  // target: "node",
   externals: {
     'react': 'commonjs react',
     'react-dom': 'commonjs react-dom',
