Unify index across env

Kikobeats · Sep 13, 2016 · 6f9baa8 · 6f9baa8
1 parent 2e3a3b5
commit 6f9baa8
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 44 deletions.
diff --git a/dist/assets/js/bundle.js b/dist/assets/js/bundle.js
diff --git a/dist/assets/js/bundle.js.map b/dist/assets/js/bundle.js.map
diff --git a/dist/assets/js/vendor.bundle.js b/dist/assets/js/vendor.bundle.js
diff --git a/dist/assets/js/vendor.bundle.js.map b/dist/assets/js/vendor.bundle.js.map
diff --git a/server.js b/server.js
@@ -7,7 +7,8 @@ const webpack = require('webpack')
 new WebpackDevServer(webpack(config), {
  publicPath: config.output.publicPath,
  hot: true,
- historyApiFallback: true
+ historyApiFallback: true,
+ contentBase: './dist'
 }).listen(3000, 'localhost', function (err) {
  if (err) throw err
 })
diff --git a/src/App.js b/src/App.js
@@ -12,9 +12,9 @@ import Counter from './Counter'
 export default class App extends Component {
  render () {
  return (
-  <Layout>
-  <Counter />
-  </Layout>
+ <Layout>
+ <Counter />
+ </Layout>
  )
  }
 }
diff --git a/src/index.html b/src/index.html
diff --git a/src/index.js b/src/index.js
@@ -18,7 +18,7 @@ if (module.hot) {
  const NextApp = require('./App').default
  ReactDOM.render(
  <AppContainer>
-  <NextApp />
+ <NextApp />
  </AppContainer>,
  rootEl
  )

diff --git a/webpack.config.js b/webpack.config.js
@@ -13,7 +13,7 @@ module.exports = {
  './src/index'
  ],
  output: {
- path: path.resolve('dist'),
+ path: path.resolve('dist/assets/js'),
  filename: 'bundle.js',
  publicPath: '/assets/js/'
  },

diff --git a/webpack.production.config.js b/webpack.production.config.js
@@ -1,9 +1,8 @@
 'use strict'
 
-const BrowserSyncPlugin = require('browser-sync-webpack-plugin')
+const pkg = require('./package.json')
 const webpack = require('webpack')
 const path = require('path')
-const pkg = require('./package.json')
 
 module.exports = {
  devtool: 'cheap-module-source-map',
@@ -12,7 +11,7 @@ module.exports = {
  ],
  output: {
  path: path.resolve('dist/assets/js'),
- filename: 'bundle.js',
+ filename: 'bundle.js'
  },
  plugins: [
  new webpack.optimize.OccurrenceOrderPlugin(),