Merge branch 'fix-default-server' into canary

Author: DaftMonk

Diff for: app/templates/Gruntfile.js

@@ -287,10 +287,10 @@ module.exports = function (grunt) {
       dist: {
         files: {
           src: [
-            '<%%= yeoman.dist %>/public/{,*/}*.js',
-            '<%%= yeoman.dist %>/public/{,*/}*.css',
-            '<%%= yeoman.dist %>/public/assets/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
-            '<%%= yeoman.dist %>/public/assets/fonts/*'
+            '<%%= yeoman.dist %>/client/{,*/}*.js',
+            '<%%= yeoman.dist %>/client/{,*/}*.css',
+            '<%%= yeoman.dist %>/client/assets/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
+            '<%%= yeoman.dist %>/client/assets/fonts/*'
           ]
         }
       }
@@ -302,19 +302,19 @@ module.exports = function (grunt) {
     useminPrepare: {
       html: ['<%%= yeoman.client %>/index.html'],
       options: {
-        dest: '<%%= yeoman.dist %>/public'
+        dest: '<%%= yeoman.dist %>/client'
       }
     },
 
     // Performs rewrites based on rev and the useminPrepare configuration
     usemin: {
-      html: ['<%%= yeoman.dist %>/public/{,*/}*.html'],
-      css: ['<%%= yeoman.dist %>/public/{,*/}*.css'],
-      js: ['<%%= yeoman.dist %>/public/{,*/}*.js'],
+      html: ['<%%= yeoman.dist %>/client/{,*/}*.html'],
+      css: ['<%%= yeoman.dist %>/client/{,*/}*.css'],
+      js: ['<%%= yeoman.dist %>/client/{,*/}*.js'],
       options: {
         assetsDirs: [
-          '<%%= yeoman.dist %>/public',
-          '<%%= yeoman.dist %>/public/assets/images'
+          '<%%= yeoman.dist %>/client',
+          '<%%= yeoman.dist %>/client/assets/images'
         ],
         // This is so we update image references in our ng-templates
         patterns: {
@@ -332,7 +332,7 @@ module.exports = function (grunt) {
           expand: true,
           cwd: '<%%= yeoman.client %>/assets/images',
           src: '{,*/}*.{png,jpg,jpeg,gif}',
-          dest: '<%%= yeoman.dist %>/public/assets/images'
+          dest: '<%%= yeoman.dist %>/client/assets/images'
         }]
       }
     },
@@ -343,7 +343,7 @@ module.exports = function (grunt) {
           expand: true,
           cwd: '<%%= yeoman.client %>/assets/images',
           src: '{,*/}*.svg',
-          dest: '<%%= yeoman.dist %>/public/assets/images'
+          dest: '<%%= yeoman.dist %>/client/assets/images'
         }]
       }
     },
@@ -392,7 +392,7 @@ module.exports = function (grunt) {
     // Replace Google CDN references
     cdnify: {
       dist: {
-        html: ['<%%= yeoman.dist %>/public/*.html']
+        html: ['<%%= yeoman.dist %>/client/*.html']
       }
     },
 
@@ -403,7 +403,7 @@ module.exports = function (grunt) {
           expand: true,
           dot: true,
           cwd: '<%%= yeoman.client %>',
-          dest: '<%%= yeoman.dist %>/public',
+          dest: '<%%= yeoman.dist %>/client',
           src: [
             '*.{ico,png,txt}',
             '.htaccess',
@@ -415,7 +415,7 @@ module.exports = function (grunt) {
         }, {
           expand: true,
           cwd: '.tmp/images',
-          dest: '<%%= yeoman.dist %>/public/assets/images',
+          dest: '<%%= yeoman.dist %>/client/assets/images',
           src: ['generated/*']
         }, {
           expand: true,

Diff for: app/templates/server/config/express.js

@@ -43,9 +43,9 @@ module.exports = function(app) {
   }));
 <% } %>
   if ('production' === env) {
-    app.use(favicon(path.join(config.root, 'public', 'favicon.ico')));
-    app.use(express.static(path.join(config.root, 'public')));
-    app.set('appPath', config.root + '/public');
+    app.use(favicon(path.join(config.root, 'client', 'favicon.ico')));
+    app.use(express.static(path.join(config.root, 'client')));
+    app.set('appPath', config.root + '/client');
     app.use(morgan('dev'));
   }