v2.7 major elixir improvements

jadjoubran · Aug 13, 2015 · 5c9d212 · 5c9d212
1 parent d9a5e0b
commit 5c9d212
Show file tree

Hide file tree

Showing 15 changed files with 184 additions and 79 deletions.
diff --git a/_jshintrc → .jshintrc b/_jshintrc → .jshintrc
@@ -6,7 +6,7 @@
   "noarg": true,
   "noempty": true,
   "nonew": true,
-  "maxlen": 140,
+  "maxlen": 180,
   "boss": true,
   "eqnull": true,
   "eqeqeq": true,
@@ -25,4 +25,4 @@
     "module": false,
     "inject": false
   }
-}
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,23 @@
-artisan ## Changelog
+## Changelog
+
+### v2.7.0
++ custom elixir ingredients setup & sample
++ custom elixir task: make jshint optional
++ custom elixir task: bower - much faster than the one previously used
++ bower task now automatically uses mainFile from bower.json
++ gulp & gulp watch are now much much faster than before
 
 ### v2.6.2
 + fixed elixir watcher for less
-+ artisan generator for creating a new service **artisan ng:service name**
-+ artisan generator for creating a new filter **artisan ng:filter name**
-+ artisan generator for creating a new config **artisan ng:config name**
++ artisan generator for creating a new angular service **artisan ng:service name**
++ artisan generator for creating a new angular filter **artisan ng:filter name**
++ artisan generator for creating a new angular config **artisan ng:config name**
 
 ### v2.6.1
 + updated bower dependencies (angular material released 0.10.1)
-+ added artisan generator for creating a new feature: **artisan ng:feature name**
++ added artisan generator for creating a new angular feature: **artisan ng:feature name**
 + improve generator to call controller with StudlyCase (StudlyCaseCtrl)
-+ artisan generator for creating a custom dialogs: **artisan ng:dialog name**
++ artisan generator for creating a angular material custom dialogs: **artisan ng:dialog name**
 
 ### v2.6.0
 + Update to [elixir 3.0](https://github.com/jadjoubran/laravel5-angular-material-starter/issues/20)
@@ -98,7 +105,7 @@ artisan ## Changelog
 
 
 ### v1.5.1
-+ jshint is now optional. Rename _jshintrc to .jshintrc. Check [issue #11](https://github.com/jadjoubran/laravel5-angular-material-starter/issues/11)
++ invalid now - jshint is now optional. Rename _jshintrc to .jshintrc. Check [issue #11](https://github.com/jadjoubran/laravel5-angular-material-starter/issues/11)
 
 
 ### v1.5.0

diff --git a/angular/app/login/login.js b/angular/app/login/login.js
@@ -3,6 +3,8 @@
 
     angular.module('app.controllers').controller('LoginCtrl', function ($scope, Restangular, $auth, $state){
 
+	    var credentials = {};
+
         // Use Satellizer's $auth service to login because it'll automatically save the JWT in localStorage
         $auth.login(credentials).then(function (data){
             // If login is successful, redirect to the users state
@@ -20,4 +22,4 @@
 
     });
 
-})();
+})();
diff --git a/angular/app/routes.run.js b/angular/app/routes.run.js
@@ -11,7 +11,7 @@
 
 		});
 		$rootScope.$on("$viewContentLoaded", function(event, toState){
-			Prism.highlightAll();
+			window.Prism.highlightAll();
 		});
 	});
 

diff --git a/elixir.json b/elixir.json
@@ -1,5 +1,9 @@
 {
+    "js": {
+        "outputFolder": "public/js"
+    },
     "css": {
+        "outputFolder": "public/css",
         "less": {
             "folder": "../../angular/"
         }

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,5 +1,6 @@
 var elixir = require('laravel-elixir');
-require('laravel-elixir-angular');
+require('./tasks/angular.task.js');
+require('./tasks/bower.task.js');
 
 process.env.DISABLE_NOTIFIER = true;
 
@@ -14,30 +15,11 @@ process.env.DISABLE_NOTIFIER = true;
  |
  */
 
-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
-		.scripts(bower_js, 'public/js/vendor.js')
-		.styles(bower_css, 'public/css/vendor.css')
-		.angular('./angular/', 'public/js')
-		.less('./angular/**/*.less')
+		.bower()
+		.angular('./angular/')
+		.less('./angular/**/*.less', 'public/css')
 		.copy('./angular/app/**/*.html', 'public/views/app/')
 		.copy('./angular/directives/**/*.html', 'public/views/directives/')
 		.copy('./angular/dialogs/**/*.html', 'public/views/dialogs/');

diff --git a/package.json b/package.json
@@ -1,7 +1,18 @@
 {
   "dependencies": {
     "laravel-elixir": "^3.0.0",
-    "laravel-elixir-angular": "^1.0.1"
+    "gulp-concat": "^2.6.0",
+    "gulp-concat-sourcemap": "^1.3.1",
+    "gulp-if": "^1.2.5",
+    "gulp-jshint": "^1.9.0",
+    "gulp-ng-annotate": "^1",
+    "gulp-notify": "^2.0.0",
+    "gulp-sourcemaps": "^1",
+    "gulp-uglify": "^1",
+    "jshint-stylish": "^2",
+    "gulp-filter": "^1.0.2",
+    "gulp-minify-css": "^0.3.11",
+    "main-bower-files": "^2.1.0"
   },
   "devDependencies": {
     "gulp": "^3.9.0"

diff --git a/public/css/vendor.css b/public/css/vendor.css
diff --git a/public/css/vendor.css.map b/public/css/vendor.css.map
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/vendor.js b/public/js/vendor.js
diff --git a/public/js/vendor.js.map b/public/js/vendor.js.map