More spa fixes for compiling correctly

Author: bgrawi

gulpfile.js

@@ -1,7 +1,7 @@
 // Set up core routes
 var modulesRoot = {
-	src: 'assets/src/modules',
-	dest: 'assets/prod/modules'
+	src: 'assets/src/modules/',
+	dest: 'assets/prod/modules/'
 };
 
 var assetModuleList = {
@@ -72,8 +72,11 @@ var dump = function(tvar) {
 // Import required plugins
 var gulp = require('gulp');
 var htmlmin = require('gulp-htmlmin');
+var ngmin = require('gulp-ngmin');
 var uglify = require('gulp-uglify');
-
+var clean = require('gulp-clean');
+var concat = require('gulp-concat');
+var rename = require('gulp-rename');
 
 // Define Tasks
 gulp.task('templates', function() {
@@ -85,26 +88,43 @@ gulp.task('templates', function() {
 			caseSensitive: true,
 			keepClosingSlash: true
 		}))
+		.pipe(rename({suffix: '.min'}))
 		.pipe(gulp.dest(templatePaths.dest));
 	});
 });
 
 // Define Tasks
 gulp.task('js', function() {
 	doFor('js', function(jsPaths) {
-		gulp.src(templatePaths.src)
-		.pipe(htmlmin({
-			collapseWhitespace: true,
-			caseSensitive: true,
-			keepClosingSlash: true
-		}))
+		gulp.src(jsPaths.src)
+		.pipe(ngmin())
+		.pipe(uglify({outSourceMap: true}))
+		//.pipe(rename({suffix: '.min'}))
+		//.pipe(gulp.dest(jsPaths.dest))
+		//.pipe(concat('dist.min.js'))
 		.pipe(gulp.dest(jsPaths.dest));
 	});
 });
 
 gulp.task('watch', function() {
-	gulp.watch(paths.templates.src, ['templates']);
+	
+	doFor('templates', function(templatePaths) {
+		gulp.watch(templatePaths, ['templates']);
+	});
+	
+	doFor('js', function(jsPaths) {
+		gulp.watch(jsPaths, ['js']);
+	});
+	
+});
+
+gulp.task('clean', function() {
+  return gulp.src(modulesRoot.dest, {read: false})
+    .pipe(clean());
+});
+
+gulp.task('build', /*['clean'],*/ function() {
+	gulp.start('templates', 'js');
 });
 
-gulp.task('build', ['templates']);
 gulp.task('default', ['build']);

index.php

@@ -48,9 +48,9 @@
 
 		<!-- STYLE SHEETS -->
 		<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Roboto:300,700">
-		<link rel="stylesheet" href="<?=$HTTPROOTADDRESS?>inc/bootstrap.css?v=<?=$APP_VERSION?>">
+		<link rel="stylesheet" href="<?=$HTTPROOTADDRESS?>assets/prod/modules/sm/App/styles/bootstrap.css?v=<?=$APP_VERSION?>">
 		<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.1/css/font-awesome.css">
-		<link rel="stylesheet" href="<?=$HTTPROOTADDRESS?>inc/global.css?v=<?=$APP_VERSION?>">
+		<link rel="stylesheet" href="<?=$HTTPROOTADDRESS?>assets/prod/modules/sm/App/styles/global.css?v=<?=$APP_VERSION?>">
 
 		<!-- OPEN GRAPH TAGS -->
 		<meta name="twitter:card" content="photo"> 
@@ -112,7 +112,7 @@
 		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.15/angular-animate.min.js"></script>
 		<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.15/angular-sanitize.min.js"></script>
 		<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.8/angular-ui-router.min.js"></script>
-		<script src="<?=$HTTPROOTADDRESS?>js/app.js?v=<?=$APP_VERSION?>"></script>
+		<script src="<?=$HTTPROOTADDRESS?>assets/prod/modules/sm/dist.min.js?v=<?=$APP_VERSION?>"></script>
 		<script>
 		  // GOOGLE ANALYTICS CODE
 		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

package.json

@@ -45,6 +45,8 @@
     "gulp-concat": "^2.2.0",
     "gulp-uglify": "^0.2.1",
     "gulp-jshint": "^1.5.3",
-    "gulp-less": "^1.2.3"
+    "gulp-less": "^1.2.3",
+    "gulp-clean": "^0.2.4",
+    "gulp-ngmin": "^0.2.0"
   }
 }