some config change

Author: likun7981

meta.js

@@ -11,15 +11,15 @@ module.exports = {
     },
     type: {
       type: 'list',
-      message: 'Which type do you want?',
+      message: 'Do you want to use router?',
       choices:[{
-        name: 'Single-Page(no react-router)',
-        value: 'single',
-        short: 'Single(No-Router)'
-      },{
-        name: 'Multi-Page(with react-router)',
+        name: 'With React-Router',
         value: 'multi',
         short: 'Multi(With-Router)'
+      },{
+        name: 'No React-Router',
+        value: 'single',
+        short: 'Single(No-Router)'
       }]
     },
     stateContainer:{
@@ -33,7 +33,7 @@ module.exports = {
     eslint: {
       type: 'confirm',
       require: true,
-      message: 'Use linting with ESLint?',
+      message: 'lint JS with ESLint?',
       default: true
     },
     eslintConfig: {

template/bin/www.js

@@ -1,15 +1,23 @@
 const debug = require('debug')('app:bin:www');
 const ip = require('internal-ip');
-const server = require('../build/server');
+const detect = require('detect-port');
 
-const port = process.env.PORT || 3000;
+let port = process.env.PORT || 3000;
 const host = ip.v4();
 
-server.listen(port, (err) => {
-  if (err) throw err;
-  debug(`Server is now running at :
+detect(port)
+  .then((_port) => {
+    if (port !== _port) {
+      debug(`Port: ${port} was occupied, try port: ${_port}`);
+      port = _port;
+    }
+    debug(`Server will running at :
   =====================================
       Local: http://${host}:${port}.       
    External: http://localhost:${port}.     
   =====================================`);
-});
+    const server = require('../build/server');
+    server.listen(port, (err) => {
+      if (err) throw err;
+    });
+  });

template/build/server.js

@@ -5,9 +5,6 @@ const paths = require('./base-config/path');
 
 const app = express();
 
-// This rewrites all routes requests to the root /index.html file
-app.use(require('connect-history-api-fallback')());
-
 // Apply gzip compression
 app.use(require('compression')());
 

template/build/webpack-config/loaders.js

@@ -19,8 +19,7 @@ module.exports = () => {
         loader: 'style-loader'
       }, {
         loader: 'css-loader',
-        // use 'options' for ExtractTextPlugin is not effect, so use 'query' to replace 'options'
-        query: {
+        options: {
           minimize: isProd,
           sourceMap: !isProd
         }
@@ -48,7 +47,7 @@ module.exports = () => {
       .forEach((rule) => {
         const first = rule.use[0];
         const rest = rule.use.slice(1);
-        rule.loader = ExtractTextPlugin.extract({ fallbackLoader: first, loader: rest });
+        rule.loader = ExtractTextPlugin.extract({ fallback: first, loader: rest });
         delete rule.use;
       });
   }

template/build/webpack-config/plugins.js

@@ -33,7 +33,7 @@ module.exports = (paths) => {
     debug('Enable HMR,noErrors for development(开启开发环境插件)');
     plugins.push(
       new webpack.HotModuleReplacementPlugin(),
-      new webpack.NoErrorsPlugin() // 报错时不退出webpack进程
+      new webpack.NoEmitOnErrorsPlugin() // 报错时不退出webpack进程
     );
   } else {
     debug('Apply ExtractTextPlugin.(非开发环境开启ExtractTextPlugin)');

template/package.json

@@ -53,7 +53,6 @@
     "better-npm-run": "^0.0.13",
     "chalk": "^1.1.3",
     "compression": "^1.6.2",
-    "connect-history-api-fallback": "^1.3.0",
     "css-loader": "^0.26.1",
     "debug": "^2.4.5",
     "eslint": "^3.12.2",
@@ -83,7 +82,8 @@
     "url-loader": "^0.5.7",
     "webpack": "^2.2.1",
     "webpack-dev-middleware": "^1.8.4",
-    "webpack-hot-middleware": "^2.13.2"
+    "webpack-hot-middleware": "^2.13.2",
+    "detect-port": "^1.1.0"
   },
   "dependencies": {
     "normalize.css": "^5.0.0",

template/src/containers/AppContainer.js

@@ -1,5 +1,5 @@
 import React, { Component, PropTypes } from 'react';
-import { browserHistory, Router } from 'react-router';
+import { hashHistory, Router } from 'react-router';
 import { Provider } from 'react-redux';
 
 class App extends Component {
@@ -14,7 +14,7 @@ class App extends Component {
     const { routes, store } = this.props;
     return (
       <Provider store={store}>
-        <Router history={browserHistory} >
+        <Router history={hashHistory} >
           {routes}
         </Router>
       </Provider>