Merge pull request #2394 from angular-fullstack/feat/generate-pug

feat(gen): consolidate templates, convert html to pug during write

Author: Awk34

Diff for: package.json

@@ -37,19 +37,21 @@
   "dependencies": {
     "babel-core": "^6.18.2",
     "babel-eslint": "^7.1.0",
-    "babel-register": "^6.18.0",
     "babel-plugin-syntax-class-properties": "^6.13.0",
     "babel-plugin-syntax-flow": "^6.18.0",
     "babel-plugin-syntax-decorators": "^6.13.0",
     "babel-plugin-syntax-export-extensions": "^6.13.0",
     "babel-plugin-transform-flow-strip-types": "^6.18.0",
+    "babel-register": "^6.18.0",
     "bluebird": "^3.4.5",
     "chalk": "^1.1.0",
     "glob": "^7.0.5",
     "gulp-babel": "^6.1.2",
     "gulp-beautify": "^2.0.0",
     "gulp-eslint": "^3.0.1",
     "gulp-filter": "^4.0.0",
+    "gulp-html2jade": "^1.1.2",
+    "gulp-rename": "^1.2.2",
     "gulp-tap": "^0.1.3",
     "insight": "~0.8.3",
     "jscodeshift": "^0.3.30",

Diff for: src/generators/app/index.js

@@ -11,6 +11,8 @@ import beaufityStream from 'gulp-beautify';
 import tap from 'gulp-tap';
 import filter from 'gulp-filter';
 import eslint from 'gulp-eslint';
+import html2jade from 'gulp-html2jade';
+import rename from 'gulp-rename';
 import semver from 'semver';
 import jscodeshift from 'jscodeshift';
 
@@ -540,6 +542,24 @@ export class Generator extends Base {
           ]);
         }
 
+        // Convert HTML into Pug
+        if(this.filters.pug) {
+          let pugFilter = filter(['**/*.html'], {restore: true});
+          this.registerTransformStream([
+            pugFilter,
+            html2jade({
+              nspaces: 2,
+              noemptypipe: true,
+              bodyless: true,
+            }),
+            rename(path => {
+              path.extname = '.pug';
+            }),
+            pugFilter.restore
+          ]);
+        }
+
+        // ESLint fix server files
         let serverJsFilter = filter(['server/**/*.js'], {restore: true});
         this.registerTransformStream([
           serverJsFilter,