Merge branch 'dev'

Author: kk.shen

generators/app/templates/_package.json

@@ -22,8 +22,8 @@
     "prebuild":
       "npm run clean && npm run format && npm run lint && echo Using TypeScript && tsc --version",
     "build": "tsc --pretty && webpack",
-    "dev": "cp demo/index.html dist/ && webpack-dev-server --progress --open-page dist/",
-    "demo": "npm run build && cp demo/index.html dist/ && http-server dist -o",
+    "dev": "webpack-dev-server --progress --open-page dist/",
+    "demo": "npm run build && http-server dist -o",
     "test": "jest",
     "coverage": "jest --coverage",
     "watch": "npm run build -- --watch",
@@ -36,6 +36,7 @@
     "babel-loader": "^7.1.2",
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-2": "^6.24.1",
+    "copy-webpack-plugin": "^4.4.1",
     "coveralls": "^2.0.0",
     "http-server": "^0.11.1",
     "jest": "^22.0.4",

generators/app/templates/_package_ava.json

@@ -20,8 +20,8 @@
     "prepare": "npm run build",
     "prebuild": "npm run clean && npm run format && npm run lint && echo Using TypeScript && tsc --version",
     "build": "tsc --pretty && tsc -p tsconfig.test.json --pretty",
-    "dev": "cp demo/index.html dist/ && webpack-dev-server --progress --open-page dist/",
-    "demo": "npm run build && cp demo/index.html dist/ && http-server dist -o",
+    "dev": "webpack-dev-server --progress --open-page dist/",
+    "demo": "npm run build && http-server dist -o",
     "test": "npm run clean && tsc -p tsconfig.test.json --pretty && nyc --exclude \"**/*-spec.js\" ava \"**/*-spec.js\" --verbose",
     "coverage": "nyc report --reporter=lcov --reporter=text --reporter=html",
     "watch": "npm run build -- --watch",
@@ -37,6 +37,7 @@
     "babel-loader": "^7.1.2",
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-2": "^6.24.1",
+    "copy-webpack-plugin": "^4.4.1",
     "coveralls": "^2.0.0",
     "http-server": "^0.11.1",
     "npm-run-all": "^4.0.2",

generators/app/templates/_package_mocha.json

@@ -16,8 +16,8 @@
     "prepare": "npm run build",
     "build":
       "npm run format && npm run clean && npm run lint && echo Using TypeScript && tsc --version && tsc --pretty",
-    "dev": "cp demo/index.html dist/ && webpack-dev-server --progress --open-page dist/",
-    "demo": "npm run build && cp demo/index.html dist/ && http-server dist -o",
+    "dev": "webpack-dev-server --progress --open-page dist/",
+    "demo": "npm run build && http-server dist -o",
     "test":
       "npm run build && mocha --compilers ts:ts-node/register --recursive \"test/**/*-spec.ts\"",
     "coverage":
@@ -34,6 +34,7 @@
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-2": "^6.24.1",
     "chai": "^3.0.0",
+    "copy-webpack-plugin": "^4.4.1",
     "http-server": "^0.11.1",
     "mocha": "^3.0.0",
     "nyc": "^10.0.0",

generators/app/templates/webpack.config.js

@@ -1,4 +1,5 @@
 const webpack = require("webpack");
+const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
   devtool: 'inline-source-map',
@@ -24,6 +25,9 @@ module.exports = {
     new webpack.optimize.UglifyJsPlugin({
       include: /\.min\.js$/,
       minimize: true
-    })
+    }) , 
+    new CopyWebpackPlugin([
+      { from: 'demo/index.html', to: 'dist/' }
+    ])
   ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-node-typescript-webpack",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A minimal Yeoman Generator for creating NodeJS modules using TypeScript and webpack it",
   "license": "MIT",
   "main": "app/index.js",