Merge branch 'upstream/master' into babel6

# Conflicts:
#	test/npm-shrinkwrap.json

Author: scttcper

.travis.yml

@@ -18,8 +18,6 @@ cache:
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - node_js: stable
 
 install:
   # Check the size of caches

docs/README.md

@@ -23,6 +23,7 @@ The community has written [recipes](recipes#recipes) for common use-cases that w
 - [Where to place third-party files?](recipes/managing-third-party-files.md)
 - [How shall I properly upgrade my current project with the last version of the generator?](recipes/upgrade-my-current-project.md)
 - [Use spritesheets](recipes/use-spritesheet.md)
+- [Multiple modules](recipes/multiple-modules.md)
 
 
 ## Still got questions?

docs/recipes/add-fontawesome.md

@@ -1,15 +1,22 @@
 # How to add fontawesome?
 
 ## [#337](https://github.com/Swiip/generator-gulp-angular/issues/337)
-Awesome. It's all working now. The scss import looks like
+
+First, you need install fontawesome through bower
+```bash
+bower install fontawesome
+```
+
+Next, you need add to your scss file this lines (please, check the paths if you
+change location of generator main.scss file):
 
 ```scss
-$fa-font-path: "../../bower_components/fontawesome/fonts";
-@import "../../bower_components/fontawesome/scss/font-awesome.scss";
+$fa-font-path: "../../bower_components/font-awesome/fonts";
+@import "../../bower_components/font-awesome/scss/font-awesome.scss";
 ```
 
-Add a step to the `html` pipeline in `gulp/build.js`:
+Finally, you need add this pipeline in `gulp/build.js`, in `html` task:
 
 ```js
-.pipe($.replace('../../bower_components/fontawesome/fonts', '../fonts'))
+.pipe($.replace('../../bower_components/font-awesome/fonts', '../fonts'))
 ```

docs/recipes/multiple-modules.md

@@ -0,0 +1,52 @@
+# Use spritesheets
+
+## [#737](https://github.com/Swiip/generator-gulp-angular/issues/737)
+
+As your app becomes bigger, you might like to extract some parts of it into separate sub-modules.
+In order to accomplish that you need to:
+
+Define a module (i.e. `app/splash/`):
+
+```js
+import SplashController from './splash.controller';
+import router from './splash.routes';
+
+export default angular.module('client.splash', [
+    'ngAnimate',
+    'ngTouch',
+    'ngSanitize',
+    'ui.router',
+])
+    .config(router)
+    .controller('SplashController', SplashController)
+;
+```
+
+Then import it for use in your primary module (`index.module.js`):
+
+```js
+import constants from './components/constants/env.constant';
+import indexConfig from './index.config';
+import routerConfig from './index.route';
+import runBlock from './index.run';
+
+// Modules
+import './splash';
+// ... etc
+
+angular.module('client', [
+    'ngAnimate',
+    'ngTouch',
+    'ngSanitize',
+    'ui.router',
+    'angularMoment',
+    'client.splash',
+    // .... etc
+])
+    .config(indexConfig)
+    .constant('ENV', constants.ENV)
+    .config(routerConfig)
+    .run(runBlock)
+;
+```
+

generators/app/files.json

@@ -22,7 +22,7 @@
 
     "package.json",
     "bower.json",
-    "tsd.json",
+    "typings.json",
 
     "karma.conf.js",
 

generators/app/prompts.json

@@ -5,12 +5,12 @@
     "message": "Which version of Angular do you want?",
     "choices": [
       {
-        "value": "~1.4.8",
-        "name": "1.4.x (stable)"
+        "value": "~1.5.3",
+        "name": "1.5.x (stable)"
       },
       {
-        "value": "~1.3.20",
-        "name": "1.3.x (legacy)"
+        "value": "~1.2.29",
+        "name": "1.2.x (legacy)"
       }
     ]
   },

generators/app/src/mock-prompts.js

@@ -84,7 +84,7 @@ model.htmlPreprocessor.choices.forEach(function (choice) {
 module.exports = {
   prompts: model,
   defaults: {
-    angularVersion: model.angularVersion.values['1.4'],
+    angularVersion: model.angularVersion.values['1.5'],
     angularModules: _.pluck(model.angularModules.choices, 'value'),
     jQuery: model.jQuery.values.jquery2,
     resource: model.resource.values['angular-resource'],

generators/app/src/preprocessors.js

@@ -60,7 +60,7 @@ module.exports = function (GulpAngularGenerator) {
     }
 
     if (this.props.jsPreprocessor.key !== 'typescript') {
-      rejectWithRegexp.call(this, /tsd\.json/);
+      rejectWithRegexp.call(this, /typings\.json/);
       rejectWithRegexp.call(this, /tsconfig\.json/);
     }
 
@@ -98,22 +98,4 @@ module.exports = function (GulpAngularGenerator) {
     }
   };
 
-  /**
-   * Copy additional files for Travis
-   */
-  GulpAngularGenerator.prototype.travisCopies = function travisCopies() {
-    if (process.env.TRAVIS === 'true') {
-
-      // Avoid rate limit by GithubAPI
-      if (this.props.jsPreprocessor.key === 'typescript') {
-
-        this.files.push({
-          src: '.tsdrc',
-          dest: '.tsdrc',
-          template: false
-        });
-      }
-    }
-  };
-
 };

generators/app/src/write.js

@@ -43,7 +43,7 @@ module.exports = function (GulpAngularGenerator) {
     });
 
     if (this.props.jsPreprocessor.key === 'typescript') {
-      this.spawnCommandSync('tsd', ['install', '-so']);
+      this.spawnCommandSync('typings', ['install', '-so']);
     }
   };
 

generators/app/templates/.tsdrc

@@ -41,9 +41,9 @@
     "bootstrap": "~3.3.5",
 <%   } -%>
 <% } if(props.ui.key === 'foundation') { -%>
-    "foundation": "~5.5.2",
+    "foundation-sites": "^6.1.2",
 <% } if(props.ui.key === 'angular-material') { -%>
-    "angular-material": "~0.11.2",
+    "angular-material": "~1.0.0",
     "material-design-iconfont": "~0.0.2",
 <% } if(props.ui.key === 'material-design-lite') { -%>
     "material-design-lite": "~1.0.4",

generators/app/templates/_bower.json

@@ -74,7 +74,7 @@ module.exports = function(config) {
     logLevel: 'WARN',
 
 <% if (props.jsPreprocessor.key === 'noJsPrepro' || props.jsPreprocessor.key === 'coffee') { -%>
-    frameworks: ['jasmine', 'angular-filesort'],
+    frameworks: ['phantomjs-shim', 'jasmine', 'angular-filesort'],
 
     angularFilesort: {
 <%   if (props.jsPreprocessor.key === 'noJsPrepro') { -%>
@@ -84,7 +84,7 @@ module.exports = function(config) {
 <%   } -%>
     },
 <% } else { -%>
-    frameworks: ['jasmine'],
+    frameworks: ['phantomjs-shim', 'jasmine'],
 <% } -%>
 
 <% if(props.jsPreprocessor.key === 'traceur') { -%>
@@ -100,6 +100,7 @@ module.exports = function(config) {
 <% } if (props.jsPreprocessor.key === 'noJsPrepro' || props.jsPreprocessor.key === 'coffee') { -%>
       'karma-angular-filesort',
 <% } -%>
+      'karma-phantomjs-shim',
       'karma-coverage',
       'karma-jasmine',
       'karma-ng-html2js-preprocessor'

generators/app/templates/_karma.conf.js

@@ -12,7 +12,7 @@
     "gulp-angular-templatecache": "~1.8.0",
     "del": "~2.0.2",
     "lodash": "~3.10.1",
-    "gulp-minify-css": "~1.2.1",
+    "gulp-cssnano": "~2.1.1",
     "gulp-filter": "~3.0.1",
     "gulp-flatten": "~0.2.0",
 <% if (imageMin) { -%>
@@ -32,9 +32,9 @@
     "gulp-rename": "~1.2.2",
     "gulp-rev": "~6.0.1",
     "gulp-rev-replace": "~0.4.2",
-    "gulp-minify-html": "~1.0.4",
+    "gulp-htmlmin": "~1.3.0",
     "gulp-inject": "~3.0.0",
-    "gulp-protractor": "~1.0.0",
+    "gulp-protractor": "~2.1.0",
     "gulp-sourcemaps": "~1.6.0",
 <% if (props.cssPreprocessor.key === 'node-sass') { -%>
     "gulp-sass": "~2.0.4",
@@ -60,9 +60,9 @@
     "traceur-loader": "~0.6.3",
 <% } if (props.jsPreprocessor.key === 'typescript') { -%>
     "typescript": "~1.6.2",
-    "awesome-typescript-loader": "~0.14.0",
+    "ts-loader": "~0.8.0",
     "tslint-loader": "~1.0.2",
-    "tsd": "~0.6.5",
+    "typings": "~0.7.9",
 <% } else if (props.jsPreprocessor.srcExtension !== 'es6') { -%>
     "gulp-angular-filesort": "~1.1.1",
 <% } if (props.htmlPreprocessor.key !== 'noHtmlPrepro') { -%>
@@ -86,6 +86,7 @@
 <% } if (props.jsPreprocessor.srcExtension === 'js' || props.jsPreprocessor.srcExtension === 'coffee') { -%>
     "karma-angular-filesort": "~1.0.0",
 <% } -%>
+    "karma-phantomjs-shim": "~1.2.0",
     "karma-coverage": "~0.5.2",
     "karma-ng-html2js-preprocessor": "~0.2.0",
     "browser-sync": "~2.9.11",

generators/app/templates/_package.json

@@ -0,0 +1,39 @@
+{
+  "name": "<%- appName %>",
+  "version": false,
+  "ambientDependencies": {
+<% if (angularModulesObject.animate) { -%>
+    "angular-animate": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-animate.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if (angularModulesObject.cookies) { -%>
+    "angular-cookies": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-cookies.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if (angularModulesObject.sanitize) { -%>
+    "angular-sanitize": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-sanitize.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } -%>
+    "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% if (props.jQuery.key === 'zepto') { -%>
+    "zepto": "github:DefinitelyTyped/DefinitelyTyped/zepto/zepto.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if (props.resource.key === 'angular-resource') { -%>
+    "angular-resource": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-resource.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if (props.resource.key === 'restangular') { -%>
+    "restangular": "github:DefinitelyTyped/DefinitelyTyped/restangular/restangular.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if (props.router.key === 'ui-router') { -%>
+    "angular-ui-router": "github:DefinitelyTyped/DefinitelyTyped/angular-ui-router/angular-ui-router.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if (props.router.key === 'angular-route') { -%>
+    "angular-route": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-route.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if(props.ui.key === 'bootstrap' && props.bootstrapComponents === 'official') { -%>
+    "bootstrap": "github:DefinitelyTyped/DefinitelyTyped/bootstrap/bootstrap.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if(props.ui.key === 'foundation' && props.foundationComponents === 'official') { -%>
+    "foundation": "github:DefinitelyTyped/DefinitelyTyped/foundation/foundation.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if(props.ui.key === 'angular-material') { -%>
+    "angular-material": "github:DefinitelyTyped/DefinitelyTyped/angular-material/angular-material.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } if(props.bootstrapComponents.key === 'ui-bootstrap') { -%>
+    "ui-bootstrap": "github:DefinitelyTyped/DefinitelyTyped/angular-ui-bootstrap/angular-ui-bootstrap.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+<% } -%>
+    "angular-mocks": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-mocks.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+    "angular": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+    "karma-jasmine": "github:DefinitelyTyped/DefinitelyTyped/karma-jasmine/karma-jasmine.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+    "moment-node": "github:DefinitelyTyped/DefinitelyTyped/moment/moment-node.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2",
+    "moment": "github:DefinitelyTyped/DefinitelyTyped/moment/moment.d.ts#bb051830df88f5a55dcf06b7fe85bf6b62cc97f2"
+  }
+}

generators/app/templates/_tsd.json

@@ -35,7 +35,7 @@ Compile your markups files (when you use a HTML preprocessor).
 
 ## scripts.js
 
-Compile your scripts with your JS preprocessor if you have one. Run the linter. If you use ES6, will also use Browserify to bundle the files.
+Compile your scripts with your JS preprocessor if you have one. Run the linter. If you use ES6 or Typescript, will also use Webpack to bundle the files.
 
 ## server.js