Merge branch 'dev' into ts

# Conflicts:
#	gulp/build.js

Author: sinedied

.bowerrc

@@ -1,4 +1,3 @@
 {
-  "directory": "libraries",
-  "cwd": "sources/"
+  "directory": "sources/libraries"
 }

README.md

@@ -4,8 +4,8 @@
 
 Web project starter kit including tooling, best practices and project seed.
 
-It is based on our experience in large web projects, with architecture choices
-aiming for a clean, no-brainer development experience even for beginner teams.
+It is based on experience in large web projects, with architecture choices aiming for a clean, no-brainer development
+experience even for beginner teams.
 
 # Getting started
 
@@ -128,7 +128,32 @@ docs        | Generate jsdoc documentation from sources.
 
 See the [wiki](https://github.com/thales-poles-ra/starter-kit/wiki).
 
-# Credits
+# Licence
 
 This starter kit is based on tooling from the
 [gulp-angular](https://github.com/Swiip/generator-gulp-angular) Yeoman generator.
+Portions of project generator-gulp-angular are Copyright (c) 2014 Matthieu Lux & Mehdy Dara
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Yohan Lasorsa
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+

sources/bower.json bower.jsonsources/bower.json renamed to bower.json

@@ -62,10 +62,9 @@ gulp.task('other', ['fonts'], function() {
       path.join(conf.paths.src, '/**/*'),
       path.join(conf.paths.tmp, '/**/*.{eot,svg,ttf,woff,woff2}'),
       path.join('!' + conf.paths.src, '/**/*.{html,css,js,ts,scss}'),
-      path.join('!' + conf.paths.src, conf.paths.bower, '/**/*'),
+      path.join('!' + conf.paths.bower, '/**/*'),
       path.join('!' + conf.paths.src, '/translations/*'),
-      path.join('!' + conf.paths.src, '/images/*'),
-      path.join('!' + conf.paths.src, '/bower.json')
+      path.join('!' + conf.paths.src, '/images/*')
     ])
     .pipe(fileFilter)
     .pipe(gulp.dest(path.join(conf.paths.dist, '/')));

gulp/build.js

@@ -11,7 +11,7 @@ var tsdJson = 'tsd.json';
 var tsdApi = new tsd.getAPI(tsdJson);
 
 gulp.task('tsd', function() {
-  var bower = require(path.join(process.cwd(), conf.paths.src, 'bower.json'));
+  var bower = require(path.join(process.cwd(), 'bower.json'));
 
   var dependencies = [].concat(
     Object.keys(bower.dependencies),

gulp/tsd.js

@@ -15,7 +15,7 @@ gulp.task('watch', ['inject'], function() {
     debounceDelay: 500
   };
 
-  gulp.watch(path.join(conf.paths.src, 'bower.json'), options, ['inject']);
+  gulp.watch('bower.json', options, ['inject']);
 
   gulp.watch([
     path.join(conf.paths.src, '/**/*.css'),

gulp/watch.js

@@ -58,8 +58,8 @@ exports.backendProxy = [
  */
 exports.wiredep = {
   exclude: [],
-  directory: path.join(exports.paths.src, bower.directory),
-  bowerJson: require('./' + path.join(exports.paths.src, 'bower.json'))
+  directory: bower.directory,
+  bowerJson: require('./bower.json')
 };
 
 /**

gulpfile.config.js

@@ -1,6 +1,10 @@
 {
   "name": "starter-kit",
   "version": "1.0.0",
+  "description": "Web project starter kit including tooling, best practices and project seed",
+  "keywords": "angular, bootstrap, gulp, ui-router, ui-bootstrap, sass, typescript, jade",
+  "license": "MIT",
+  "author": "Yohan Lasorsa",
   "repository": {
     "type": "git",
     "url": "[email protected]/thales-poles-ra/starter-kit.git"
@@ -46,7 +50,7 @@
     "gulp-size": "~2.0.0",
     "gulp-sourcemaps": "~1.6.0",
     "gulp-tsd": "0.0.4",
-    "gulp-tslint": "~4.1.2",
+    "gulp-tslint": "^4.2.1",
     "gulp-typescript": "~2.10.0",
     "gulp-uglify": "~1.5.1",
     "gulp-useref": "^2.1.0",
@@ -67,7 +71,7 @@
     "karma-ng-html2js-preprocessor": "~0.2.0",
     "karma-phantomjs-launcher": "~0.2.0",
     "lodash": "^3.10.1",
-    "main-bower-files": "~2.9.0",
+    "main-bower-files": "~2.11.0",
     "merge-stream": "~1.0.0",
     "phantomjs": "~1.9.18",
     "protractor-html-screenshot-reporter": "0.0.21",

package.json

@@ -1,19 +1,19 @@
 {
   "name": "angular-animate",
-  "version": "1.4.3",
+  "version": "1.4.8",
   "main": "./angular-animate.js",
   "ignore": [],
   "dependencies": {
-    "angular": "1.4.3"
+    "angular": "1.4.8"
   },
   "homepage": "https://github.com/angular/bower-angular-animate",
-  "_release": "1.4.3",
+  "_release": "1.4.8",
   "_resolution": {
     "type": "version",
-    "tag": "v1.4.3",
-    "commit": "4ce2a76359401102d2e0146ccf69e6c060799ff8"
+    "tag": "v1.4.8",
+    "commit": "cc1d9740059f5e8fd43abf0e2e80695d43b3b6b1"
   },
-  "_source": "git://github.com/angular/bower-angular-animate.git",
+  "_source": "https://github.com/angular/bower-angular-animate.git",
   "_target": "~1.4.0",
   "_originalSource": "angular-animate"
 }