Merge pull request #1303 from kingcody/feature/shared-config

feat(app): dynamically generate angular constant `appConfig`

Author: Awk34

app/generator.js

@@ -371,6 +371,7 @@ export default class Generator extends Base {
 
       ngModules: function() {
         var angModules = [
+          `'${this.scriptAppName}.constants'`,
           "'ngCookies'",
           "'ngResource'",
           "'ngSanitize'"

app/templates/Gruntfile.js

@@ -17,7 +17,8 @@ module.exports = function (grunt) {
     cdnify: 'grunt-google-cdn',
     protractor: 'grunt-protractor-runner',
     buildcontrol: 'grunt-build-control',
-    istanbul_check_coverage: 'grunt-mocha-istanbul'
+    istanbul_check_coverage: 'grunt-mocha-istanbul',
+    ngconstant: 'grunt-ng-constant'
   });
 
   // Time how long tasks take. Can help when optimizing build times
@@ -60,6 +61,10 @@ module.exports = function (grunt) {
         files: ['<%%= yeoman.client %>/{app,components}/**/!(*.spec|*.mock).js'],
         tasks: ['newer:babel:client']
       },<% } %>
+      ngconstant: {
+        files: ['<%%= yeoman.server %>/config/environment/shared.js'],
+        tasks: ['ngconstant']
+      },
       injectJS: {
         files: [
           '<%%= yeoman.client %>/{app,components}/**/!(*.spec|*.mock).js',
@@ -241,7 +246,7 @@ module.exports = function (grunt) {
     // Automatically inject Bower components into the app and karma.conf.js
     wiredep: {
       options: {
-        exclude: [ <% if(filters.uibootstrap) { %>
+        exclude: [<% if(filters.uibootstrap) { %>
           /bootstrap.js/,<% } %>
           '/json3/',
           '/es5-shim/'<% if(!filters.css) { %>,
@@ -326,6 +331,25 @@ module.exports = function (grunt) {
       }
     },
 
+    // Dynamically generate angular constant `appConfig` from
+    // `server/config/environment/shared.js`
+    ngconstant: {
+      options: {
+        name: '<%= scriptAppName %>.constants',
+        dest: '<%%= yeoman.client %>/app/app.constant.js',
+        deps: [],
+        wrap: true,
+        configPath: '<%%= yeoman.server %>/config/environment/shared'
+      },
+      app: {
+        constants: function() {
+          return {
+            appConfig: require('./' + grunt.config.get('ngconstant.options.configPath'))
+          };
+        }
+      }
+    },
+
     // Package all the html partials into a single javascript payload
     ngtemplates: {
       options: {
@@ -423,6 +447,12 @@ module.exports = function (grunt) {
 
     // Run some tasks in parallel to speed up the build process
     concurrent: {
+      pre: [<% if (filters.stylus) { %>
+        'injector:stylus',<% } if (filters.less) { %>
+        'injector:less',<% } if (filters.sass) { %>
+        'injector:sass',<% } %>
+        'ngconstant'
+      ],
       server: [<% if(filters.babel) { %>
         'newer:babel:client',<% } if(filters.jade) { %>
         'jade',<% } if(filters.stylus) { %>
@@ -747,10 +777,8 @@ module.exports = function (grunt) {
     if (target === 'debug') {
       return grunt.task.run([
         'clean:server',
-        'env:all',<% if (filters.stylus) { %>
-        'injector:stylus',<% } if (filters.less) { %>
-        'injector:less',<% } if (filters.sass) { %>
-        'injector:sass',<% } %>
+        'env:all',
+        'concurrent:pre',
         'concurrent:server',
         'injector',
         'wiredep:client',
@@ -761,10 +789,8 @@ module.exports = function (grunt) {
 
     grunt.task.run([
       'clean:server',
-      'env:all',<% if (filters.stylus) { %>
-      'injector:stylus',<% } if (filters.less) { %>
-      'injector:less',<% } if (filters.sass) { %>
-      'injector:sass',<% } %>
+      'env:all',
+      'concurrent:pre',
       'concurrent:server',
       'injector',
       'wiredep:client',
@@ -794,10 +820,8 @@ module.exports = function (grunt) {
     else if (target === 'client') {
       return grunt.task.run([
         'clean:server',
-        'env:all',<% if (filters.stylus) { %>
-        'injector:stylus',<% } if (filters.less) { %>
-        'injector:less',<% } if (filters.sass) { %>
-        'injector:sass',<% } %>
+        'env:all',
+        'concurrent:pre',
         'concurrent:test',
         'injector',
         'postcss',
@@ -822,10 +846,8 @@ module.exports = function (grunt) {
         return grunt.task.run([
           'clean:server',
           'env:all',
-          'env:test',<% if (filters.stylus) { %>
-          'injector:stylus',<% } if (filters.less) { %>
-          'injector:less',<% } if (filters.sass) { %>
-          'injector:sass',<% } %>
+          'env:test',
+          'concurrent:pre',
           'concurrent:test',
           'injector',
           'wiredep:client',
@@ -878,10 +900,8 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('build', [
-    'clean:dist',<% if (filters.stylus) { %>
-    'injector:stylus',<% } if (filters.less) { %>
-    'injector:less',<% } if (filters.sass) { %>
-    'injector:sass',<% } %>
+    'clean:dist',
+    'concurrent:pre',
     'concurrent:dist',
     'injector',
     'wiredep:client',

app/templates/_package.json

@@ -57,6 +57,7 @@
     "grunt-jscs": "^2.0.0",
     "grunt-newer": "^1.1.1",
     "grunt-ng-annotate": "^1.0.1",
+    "grunt-ng-constant": "^1.1.0",
     "grunt-filerev": "^2.3.1",
     "grunt-usemin": "^3.0.0",
     "grunt-env": "~0.4.1",

app/templates/server/config/environment/index.js

@@ -32,9 +32,6 @@ var all = {
     session: '<%= lodash.slugify(lodash.humanize(appname)) + '-secret' %>'
   },
 
-  // List of user roles
-  userRoles: ['guest', 'user', 'admin'],
-
   // MongoDB connection options
   mongo: {
     options: {
@@ -67,4 +64,5 @@ var all = {
 // ==============================================
 module.exports = _.merge(
   all,
+  require('./shared'),
   require('./' + process.env.NODE_ENV + '.js') || {});

app/templates/server/config/environment/shared.js

@@ -0,0 +1,6 @@
+'use strict';
+
+exports = module.exports = {
+  // List of user roles
+  userRoles: ['guest', 'user', 'admin']
+};

test/test-file-creation.js

@@ -199,6 +199,7 @@ describe('angular-fullstack generator', function () {
       'server/config/environment/development.js',
       'server/config/environment/production.js',
       'server/config/environment/test.js',
+      'server/config/environment/shared.js',
       'server/views/404.' + markup,
       'e2e/main/main.po.js',
       'e2e/main/main.spec.js',