v2.6.0 - Updated to elixir 3. Closes #20

Author: Jad Joubran

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+### v2.6.0
++ Update to [elixir 3.0](https://github.com/jadjoubran/laravel5-angular-material-starter/issues/20)
++ fixed gulp bower task
++ gulp tasks are now much faster (gulp watch is much faster)
+
 ### v2.5.0
 + Setup styleci.io - fixed php code style to be inline with Laravel (Laravel is using Style CI)
 

angular/app/landing/landing.html

@@ -19,4 +19,4 @@ <h2 class="md-title">Landing page <ng-md-icon icon="{{icon}}" class="Landing-dem
         </md-card>
     </div>
     <br>
-</div>
+</div>

angular/app/landing/landing.js

@@ -44,4 +44,4 @@
 
 	});
 
-})();
+})();

angular/app/sidebar/sidebar.html

@@ -2,7 +2,7 @@
 	<md-sidenav class="Sidebar md-sidenav-left md-whiteframe-z2" md-component-id="left" md-is-locked-open="true">
 		<md-toolbar class="">
 			<h1 class="md-toolbar-tools Sidebar-title">Laravel 5 angular material starter</h1>
-			<h6 class="Sidebar-version">v 2.5.0</h6>
+			<h6 class="Sidebar-version">v 2.6.0</h6>
 		</md-toolbar>
 		<md-content class="Sidebar-pages md-default-theme">
 			<md-list>

angular/config/restangular.js

@@ -6,4 +6,4 @@
 		.setBaseUrl('/api/1/');
 	});
 
-})();
+})();

angular/filters/capitalize.js

@@ -8,4 +8,4 @@
 			}) : '';
 		};
 	});
-})();
+})();

gulpfile.js

@@ -1,9 +1,8 @@
-process.env.DISABLE_NOTIFIER = true;
 var elixir = require('laravel-elixir');
-
-require('laravel-elixir-bower');
 require('laravel-elixir-angular');
 
+process.env.DISABLE_NOTIFIER = true;
+
 /*
  |--------------------------------------------------------------------------
  | Elixir Asset Management
@@ -15,16 +14,31 @@ require('laravel-elixir-angular');
  |
  */
 
-elixir.config.sourcemaps = false;
-elixir.config.registerWatcher("default", "angular/**");
+var bower_js = ['./bower_components/angular/angular.js',
+	'./bower_components/angular-material/angular-material.js',
+	'./bower_components/angular-animate/angular-animate.js',
+	'./bower_components/angular-aria/angular-aria.js',
+	'./bower_components/angular-ui-router/release/angular-ui-router.js',
+	'./bower_components/restangular/dist/restangular.js',
+	'./bower_components/lodash/lodash.js',
+	'./bower_components/ngstorage/ngStorage.js',
+	'./bower_components/svg-morpheus/compile/unminified/svg-morpheus.js',
+	'./bower_components/angular-material-icons/angular-material-icons.js',
+	'./bower_components/satellizer/satellizer.js',
+	'./bower_components/angular-loading-bar/build/loading-bar.js',
+];
+var bower_css = ['./bower_components/angular-material/angular-material.css',
+	'./bower_components/angular-material-icons/angular-material-icons.css',
+	'./bower_components/angular-loading-bar/build/loading-bar.css',
+];
 
 elixir(function(mix){
 	mix
-		//.bower() //uncomment it when you add a new bower component (it's commented out now because it messes up other tasks)
-		.angular('angular/')
-		.less('../../../angular/**/*.less')
-		.copy('angular/app/**/*.html', 'public/views/app/')
-		.copy('angular/directives/**/*.html', 'public/views/directives/')
-		.copy('angular/dialogs/**/*.html', 'public/views/dialogs/');
-
+		.scripts(bower_js, 'public/js/vendor.js')
+		.styles(bower_css, 'public/css/vendor.css')
+		.angular('./angular/', 'public/js')
+		.less('./angular/**/*.less')
+		.copy('./angular/app/**/*.html', 'public/views/app/')
+		.copy('./angular/directives/**/*.html', 'public/views/directives/')
+		.copy('./angular/dialogs/**/*.html', 'public/views/dialogs/');
 });

package.json

@@ -1,8 +1,9 @@
 {
+  "dependencies": {
+    "laravel-elixir": "^3.0.0",
+    "laravel-elixir-angular": "^1.0.1"
+  },
   "devDependencies": {
-    "gulp": "^3.9.0",
-    "laravel-elixir": "^2.0.0",
-    "laravel-elixir-angular": "^0.1.1",
-    "laravel-elixir-bower": "^0.1.0"
+    "gulp": "^3.9.0"
   }
 }