Merge branch 'master' of https://github.com/newtriks/generator-react-webpack

Conflicts:
	package.json

templates/common/Gruntfile.js

@@ -19,7 +19,6 @@ module.exports = function (grunt) {
 
     webpack: {
       options: webpackDistConfig,
-
       dist: {
         cache: false
       }
@@ -31,11 +30,11 @@ module.exports = function (grunt) {
         port: 8000,
         webpack: webpackDevConfig,
         publicPath: '/assets/',
-        contentBase: './<%= pkg.src %>/',
+        contentBase: './<%= pkg.src %>/'
       },
 
       start: {
-        keepAlive: true,
+        keepAlive: true
       }
     },
 
@@ -90,7 +89,7 @@ module.exports = function (grunt) {
             expand: true,
             src: ['<%= pkg.src %>/images/*'],
             dest: '<%= pkg.dist %>/images/'
-          },
+          }
         ]
       }
     },

templates/common/_webpack.config.js

@@ -19,7 +19,7 @@ module.exports = {
   devtool: false,
   entry: [
       'webpack/hot/only-dev-server',
-      './src/scripts/components/<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>.js'
+      './src/components/<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>.js'
   ],
 
   stats: {
@@ -31,10 +31,10 @@ module.exports = {
     extensions: ['', '.js'],
     alias: {
       'styles': __dirname + '/src/styles',
-      'mixins': __dirname + '/src/scripts/mixins',
-      'components': __dirname + '/src/scripts/components/'<% if(architecture==='flux'||architecture=='reflux') { %>,
-      'stores': __dirname + '/src/scripts/stores/',
-      'actions': __dirname + '/src/scripts/actions/'<% } %>
+      'mixins': __dirname + '/src/mixins',
+      'components': __dirname + '/src/components/'<% if(architecture==='flux'||architecture=='reflux') { %>,
+      'stores': __dirname + '/src/stores/',
+      'actions': __dirname + '/src/actions/'<% } %>
     }
   },
   module: {

templates/common/_webpack.dist.config.js

@@ -18,7 +18,7 @@ module.exports = {
 
   debug: false,
   devtool: false,
-  entry: './src/scripts/components/<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>.js',
+  entry: './src/components/<% if (reactRouter) { %>main<% } else { %><%= scriptAppName %><% } %>.js',
 
   stats: {
     colors: true,
@@ -36,10 +36,10 @@ module.exports = {
     extensions: ['', '.js'],
     alias: {
       'styles': __dirname + '/src/styles',
-      'mixins': __dirname + '/src/scripts/mixins',
-      'components': __dirname + '/src/scripts/components/'<% if(architecture==='flux'||architecture=='reflux') { %>,
-      'stores': __dirname + '/src/scripts/stores/',
-      'actions': __dirname + '/src/scripts/actions/'<% } %>
+      'mixins': __dirname + '/src/mixins',
+      'components': __dirname + '/src/components/'<% if(architecture==='flux'||architecture=='reflux') { %>,
+      'stores': __dirname + '/src/stores/',
+      'actions': __dirname + '/src/actions/'<% } %>
     }
   },
 

templates/common/gitignore

@@ -30,4 +30,4 @@ $RECYCLE.BIN/
 node_modules/
 .tmp
 dist
-/src/scripts/main.js
+/src/main.js

templates/common/karma.conf.js

@@ -52,9 +52,9 @@ module.exports = function (config) {
       resolve: {
         alias: {
           'styles': path.join(process.cwd(), './src/styles/'),
-          'components': path.join(process.cwd(), './src/scripts/components/')<% if(architecture === 'flux'||architecture === 'reflux') { %>,
-          'stores': '../../../src/scripts/stores/',
-          'actions': '../../../src/scripts/actions/'<% } %>
+          'components': path.join(process.cwd(), './src/components/')<% if(architecture === 'flux'||architecture === 'reflux') { %>,
+          'stores': '../../../src/stores/',
+          'actions': '../../../src/actions/'<% } %>
         }
       }
     },

templates/javascript/App.js

@@ -5,9 +5,9 @@ var ReactTransitionGroup = React.addons.TransitionGroup;
 
 // CSS
 require('normalize.css');
-require('../../styles/main.css');
+require('../styles/main.css');
 
-var imageURL = require('../../images/yeoman.png');
+var imageURL = require('../images/yeoman.png');
 
 var <%= scriptAppName %> = React.createClass({
   render: function() {