update for gulp build

Author: zensh

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jsGen",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "main": "index.html",
   "dependencies": {
     "angular": ">=1.3.0",

gulpfile.js

@@ -4,7 +4,6 @@ var gulp = require('gulp'),
   gutil = require('gulp-util'),
   clean = require('gulp-clean'),
   gulpSequence = require('gulp-sequence'),
-  gulpMerge = require('gulp-merge'),
   jshint = require('gulp-jshint'),
   concat = require('gulp-concat'),
   imagemin = require('gulp-imagemin'),
@@ -15,6 +14,7 @@ var gulp = require('gulp'),
   rev = require('gulp-rev'),
   replace = require('gulp-replace'),
   usemin = require('gulp-usemin'),
+  merge2 = require('merge2'),
   version = 'v' + require('./package.json').version,
   cdnHost = require('./package.json').cdnHost;
 
@@ -69,7 +69,7 @@ gulp.task('js-lib', function () {
 });
 
 gulp.task('js-app', function () {
-  return gulpMerge(
+  return merge2(
       gulp.src([
         'static/src/js/app.js',
         'static/src/js/locale_zh-cn.js',
@@ -83,8 +83,9 @@ gulp.task('js-app', function () {
       gulp.src('static/src/tpl/*.html')
         .pipe(minifyHtml({empty: true, quotes: true}))
         .pipe(ngtemplate({
-          module: 'jsGen',
-          standalone: false
+          module: 'genTemplates',
+          standalone: true,
+          filePath: 'templates.js'
         })
       )
     )

package.json

@@ -5,7 +5,7 @@
     "url": "http://weibo.com/zensh"
   },
   "name": "jsgen",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "cdnHost": "http://cdn.angularjs.cn",
   "description": "",
   "keywords": [
@@ -40,15 +40,15 @@
     "gulp-jshint": ">=1.5.1",
     "gulp-minify-css": ">=0.3.0",
     "gulp-minify-html": "^0.1.4",
-    "gulp-ngtemplate": "^0.2.3",
+    "gulp-ngtemplate": "https://github.com/teambition/gulp-ngtemplate.git",
     "gulp-rename": ">=1.2.0",
     "gulp-replace": "^0.4.0",
     "gulp-rev": ">=0.4.2",
     "gulp-sequence": "^0.1.0",
     "gulp-uglify": ">=0.3.1",
     "gulp-usemin": ">=0.3.6",
     "gulp-util": ">=2.2.14",
-    "gulp-merge": "^0.1.0"
+    "merge2": "^0.2.0"
   },
   "scripts": {
     "start": "node app.js"