Fixed asset management structure

meanjs · Apr 27, 2014 · 14f5d06 · 14f5d06
1 parent c91a330
commit 14f5d06
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 33 deletions.
diff --git a/config/config.js b/config/config.js
@@ -62,7 +62,7 @@ module.exports.getGlobbedFiles = function(globPatterns, removeRoot) {
  * Get the modules JavaScript files
  */
 module.exports.getJavaScriptAssets = function(includeTests) {
-    var output = this.getGlobbedFiles(this.assets.lib.concat(this.assets.js), 'public/');
+    var output = this.getGlobbedFiles(this.assets.lib.js.concat(this.assets.js), 'public/');
 
     // To include tests
     if (includeTests) {
@@ -76,6 +76,6 @@ module.exports.getJavaScriptAssets = function(includeTests) {
  * Get the modules CSS files
  */
 module.exports.getCSSAssets = function() {
-    var output = this.getGlobbedFiles(this.assets.css, 'public/');
+    var output = this.getGlobbedFiles(this.assets.lib.css.concat(this.assets.css), 'public/');
     return output;
 };
diff --git a/config/env/all.js b/config/env/all.js
@@ -11,19 +11,23 @@ module.exports = {
 	sessionSecret: 'MEAN',
 	sessionCollection: 'sessions',
 	assets: {
+		lib: {
+			css: [
+				'public/lib/bootstrap/dist/css/bootstrap.css',
+				'public/lib/bootstrap/dist/css/bootstrap-theme.css',
+			],
+			js: [
+				'public/lib/angular/angular.js',
+				'public/lib/angular-resource/angular-resource.js',
+				'public/lib/angular-animate/angular-animate.js',
+				'public/lib/angular-ui-router/release/angular-ui-router.js',
+				'public/lib/angular-ui-utils/ui-utils.js',
+				'public/lib/angular-bootstrap/ui-bootstrap-tpls.js'
+			]
+		},
 		css: [
-			'public/lib/bootstrap/dist/css/bootstrap.css',
-			'public/lib/bootstrap/dist/css/bootstrap-theme.css',
 			'public/modules/**/css/*.css'
 		],
-		lib: [
-			'public/lib/angular/angular.js',
-			'public/lib/angular-resource/angular-resource.js',
-			'public/lib/angular-animate/angular-animate.js',
-			'public/lib/angular-ui-router/release/angular-ui-router.js',
-			'public/lib/angular-ui-utils/ui-utils.js',
-			'public/lib/angular-bootstrap/ui-bootstrap-tpls.js'
-		],
 		js: [
 			'public/config.js',
 			'public/application.js',

diff --git a/config/env/production.js b/config/env/production.js
@@ -3,14 +3,20 @@
 module.exports = {
 	db: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://localhost/mean',
 	assets: {
-		lib: [
-			'public/lib/angular/angular.js',
-			'public/lib/angular-resource/angular-resource.js',
-			'public/lib/angular-animate/angular-animate.js',
-			'public/lib/angular-ui-router/release/angular-ui-router.js',
-			'public/lib/angular-ui-utils/ui-utils.js',
-			'public/lib/angular-bootstrap/ui-bootstrap-tpls.js'
-		],
+		lib: {
+			css: [
+				'public/lib/bootstrap/dist/css/bootstrap.min.css',
+				'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
+			],
+			js: [
+				'public/lib/angular/angular.min.js',
+				'public/lib/angular-resource/angular-resource.min.js',
+				'public/lib/angular-animate/angular-animate.min.js',
+				'public/lib/angular-ui-router/release/angular-ui-router.min.js',
+				'public/lib/angular-ui-utils/ui-utils.min.js',
+				'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js'
+			]
+		},
 		css: 'public/dist/application.min.css',
 		js: 'public/dist/application.min.js'
 	},

diff --git a/config/policies.js b/config/policies.js
diff --git a/gruntfile.js b/gruntfile.js
@@ -128,9 +128,6 @@ module.exports = function(grunt) {
     // Build task(s).
     grunt.registerTask('build', ['jshint', 'csslint', 'loadConfig' ,'uglify', 'cssmin']);
 
-    // Build task(s).
-    grunt.registerTask('heroku-deploy', ['jshint', 'csslint', 'uglify', 'cssmin']);
-
     // Test task.
     grunt.registerTask('test', ['env:test', 'mochaTest', 'karma:unit']);
 };
diff --git a/public/dist/application.min.css b/public/dist/application.min.css