Merge remote-tracking branch 'remotes/angular.io/master'

gulpfile.js

@@ -7,8 +7,6 @@ var _ = require('lodash');
 var argv = require('yargs').argv;
 var env = require('gulp-env');
 var Q = require("q");
-// delPromise is a 'promise' version of del
-var delPromise =  Q.denodeify(del);
 var Minimatch = require("minimatch").Minimatch;
 var Dgeni = require('dgeni');
 var Package = require('dgeni').Package;
@@ -609,14 +607,14 @@ gulp.task('_shred-clean-devguide-shared-jade', function(cb) {
   // jade fragments now all go into _fragments subdirs under their source.
   var newCleanPath = path.join(DOCS_PATH, '**/_fragments/*.jade');
   // Much slower 8-9x then using globby first ... ???
-  // return delPromise([ newCleanPath, oldCleanPath]);
+  // return del([ newCleanPath, oldCleanPath]);
   var files = globby.sync( [newCleanPath, oldCleanPath]);
-  return delPromise(files);
+  return del(files);
 });
 
 gulp.task('_shred-clean-devguide', function(cb) {
   var cleanPath = path.join(_devguideShredOptions.fragmentsDir, '**/*.*')
-  return delPromise([ cleanPath, '!**/*.ovr.*', '!**/_api/**']);
+  return del([ cleanPath, '!**/*.ovr.*', '!**/_api/**']);
 });
 
 gulp.task('_shred-api-examples', ['_shred-clean-api'], function() {
@@ -626,7 +624,7 @@ gulp.task('_shred-api-examples', ['_shred-clean-api'], function() {
 
 gulp.task('_shred-clean-api', function(cb) {
   var cleanPath = path.join(_apiShredOptions.fragmentsDir, '**/*.*')
-  return delPromise([ cleanPath, '!**/*.ovr.*' ]);
+  return del([ cleanPath, '!**/*.ovr.*' ]);
 });
 
 gulp.task('_zip-examples', function() {
@@ -935,7 +933,7 @@ function apiExamplesWatch(postShredAction) {
     gutil.log('Event type: ' + event.type); // added, changed, or deleted
     gutil.log('Event path: ' + event.path); // The path of the modified file
 
-    return delPromise(cleanPath).then(function() {
+    return del(cleanPath).then(function() {
       return docShredder.shred(_apiShredOptions);
     }).then(postShredAction);
   });

package.json

@@ -25,24 +25,23 @@
     "url": ""
   },
   "devDependencies": {
-    "archiver": "^0.16.0",
-    "assert-plus": "^0.1.5",
+    "archiver": "^1.0.0",
+    "assert-plus": "^1.0.0",
     "broken-link-checker": "0.7.1",
     "browser-sync": "^2.9.3",
     "canonical-path": "0.0.2",
-    "cross-spawn": "^2.1.0",
-    "codelyzer": "0.0.18",
-    "del": "^1.2.0",
+    "cross-spawn": "^4.0.0",
+    "codelyzer": "0.0.20",
+    "del": "^2.2.0",
     "dgeni": "^0.4.0",
     "dgeni-packages": "^0.13.0",
     "diff": "^2.1.3",
-    "fs-extra": "^0.24.0",
-    "glob": "^5.0.14",
+    "fs-extra": "^0.30.0",
     "globby": "^4.0.0",
     "gulp": "^3.5.6",
     "gulp-env": "0.4.0",
     "gulp-task-listing": "^1.0.1",
-    "gulp-tslint": "^4.3.5",
+    "gulp-tslint": "^5.0.0",
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.3.4",
     "harp": "^0.20.3",
@@ -50,26 +49,25 @@
     "indent-string": "^2.1.0",
     "jasmine-core": "^2.3.4",
     "jasmine-node": "^1.14.5",
-    "jsdom": "^7.0.2",
+    "jsdom": "^9.2.1",
     "jsonfile": "^2.2.2",
     "karma": "^0.13.10",
-    "karma-chrome-launcher": "^0.2.0",
-    "karma-jasmine": "^0.3.6",
-    "live-server": "^0.8.1",
-    "lodash": "^3.10.1",
+    "karma-chrome-launcher": "^1.0.1",
+    "karma-jasmine": "^1.0.2",
+    "live-server": "^1.0.0",
+    "lodash": "^4.13.1",
     "marked": "^0.3.5",
-    "minimatch": "^2.0.10",
+    "minimatch": "^3.0.0",
     "mkdirp": "^0.5.1",
     "node-html-encoder": "0.0.2",
     "nodegit": "0.13.0",
-    "path": "^0.11.14",
-    "prompt": "^0.2.14",
+    "path": "^0.12.7",
+    "prompt": "^1.0.0",
     "protractor": "^3.0.0",
     "q": "^1.4.1",
     "tree-kill": "^1.0.0",
     "tslint": "^3.2.2",
-    "typescript": "1.7.3",
-    "yargs": "^3.23.0"
+    "yargs": "^4.7.1"
   },
   "dependencies": {
     "jstransformer-marked": "^1.0.1"

public/docs/_examples/package.json

@@ -53,10 +53,10 @@
     "http-server": "^0.9.0",
     "jasmine-core": "^2.4.1",
     "karma": "^0.13.22",
-    "karma-chrome-launcher": "^0.2.3",
-    "karma-cli": "^0.1.2",
-    "karma-htmlfile-reporter": "^0.2.2",
-    "karma-jasmine": "^0.3.8",
+    "karma-chrome-launcher": "^1.0.1",
+    "karma-cli": "^1.0.0",
+    "karma-htmlfile-reporter": "^0.3.1",
+    "karma-jasmine": "^1.0.2",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
@@ -74,7 +74,7 @@
     "typings": "^1.0.4",
     "webpack": "^1.13.0",
     "webpack-dev-server": "^1.14.1",
-    "webpack-merge": "^0.12.0"
+    "webpack-merge": "^0.14.0"
   },
   "repository": {}
 }

public/docs/_examples/upgrade-adapter/ts/app/hero-detail.directive.ts

@@ -1,6 +1,7 @@
 // #docregion
 export function heroDetailDirective() {
   return {
+    restrict: 'E',
     scope: {},
     bindToController: {
       hero: '=',

tools/_example-zipper/exampleZipper.js

@@ -1,7 +1,5 @@
 // Canonical path provides a consistent path (i.e. always forward slashes) across different OSes
 var path = require('canonical-path');
-var Q = require('q');
-var _ = require('lodash');
 var jsonfile = require('jsonfile');
 var assert = require('assert-plus');
 // adm-zip does not work properly on Windows

tools/_example-zipper/test/gulpfile.js

@@ -13,11 +13,10 @@ gulp.task('zipExamples', ['clean'], function() {
   return exampleZipper.zipExamples("../../../public/docs/_examples", _outputFolder);
 });
 
-gulp.task('clean', function (cb) {
+gulp.task('clean', function () {
   var cleanPath = path.join(_outputFolder, '**/*.*');
-  del([ cleanPath, '!**/*.ovr.*'], function (err, paths) {
+  del([ cleanPath, '!**/*.ovr.*']).then(function (err, paths) {
     console.log('Deleted files/folders:\n', paths.join('\n'));
-    cb();
   });
 });
 

tools/api-builder/content-package/readers/content.spec.js

@@ -1,7 +1,6 @@
 var mockPackage = require('../mocks/mockPackage');
 var Dgeni = require('dgeni');
 var path = require('canonical-path');
-var _ = require('lodash');
 
 describe('contentFileReader', function() {
   var dgeni, injector, fileReader;

tools/api-builder/docs-package/processors/checkUnbalancedBackTicks.spec.js

@@ -1,7 +1,6 @@
 var mockPackage = require('../mocks/mockPackage');
 var Dgeni = require('dgeni');
 var path = require('canonical-path');
-var _ = require('lodash');
 
 describe('checkUnbalancedBackTicks', function() {
   var dgeni, injector, processor, log;

tools/api-builder/docs-package/processors/convertBackticksToCodeBlocks.spec.js

@@ -1,7 +1,6 @@
 var mockPackage = require('../mocks/mockPackage');
 var Dgeni = require('dgeni');
 var path = require('canonical-path');
-var _ = require('lodash');
 
 describe('convertBackticksToCodeBlocks', function() {
   var dgeni, injector, processor;

tools/api-builder/links-package/services/getLinkInfo.js

@@ -1,4 +1,3 @@
-var _ = require('lodash');
 var path = require('canonical-path');
 
 /**

tools/api-builder/target-package/inline-tag-defs/target.js

@@ -1,5 +1,3 @@
-var _ = require('lodash');
-
 /**
  * @dgService
  * @description

tools/doc-shredder/_test/doc-shredder.spec.js

@@ -1,8 +1,5 @@
 var docShredder = require('../doc-shredder');
-var Q = require("q");
-var del = require('del')
-// delPromise is a 'promise' version of del
-var delPromise =  Q.denodeify(del);
+var del = require('del');
 var globby = require('globby');
 var path = require('canonical-path');
 var fs = require('fs');
@@ -59,7 +56,7 @@ describe('doc-shredder', function() {
 
   function clean(shredOptions) {
     var cleanPath = path.join(shredOptions.fragmentsDir, '**/*.*')
-    return delPromise([ cleanPath, '!**/*.ovr.*']);
+    return del([ cleanPath, '!**/*.ovr.*']);
   }
 
 });

tools/doc-shredder/_test/gulpfile.js

@@ -17,11 +17,10 @@ gulp.task('shred', ['clean'], function() {
   return docShredder.shred(shredOptions);
 });
 
-gulp.task('clean', function (cb) {
+gulp.task('clean', function () {
   var cleanPath = path.join(shredOptions.fragmentsDir, '**/*.*')
-  del([ cleanPath, '!**/*.ovr.*'], function (err, paths) {
+  del([ cleanPath, '!**/*.ovr.*']).then(function (err, paths) {
     // console.log('Deleted files/folders:\n', paths.join('\n'));
-    cb();
   });
 });
 

tools/doc-shredder/doc-shredder.js

@@ -1,9 +1,6 @@
 // Canonical path provides a consistent path (i.e. always forward slashes) across different OSes
 var path = require('canonical-path');
-var Q = require('q');
 var del = require('del');
-// delPromise is a 'promise' version of del
-var delPromise =  Q.denodeify(del);
 var Dgeni = require('dgeni');
 var _ = require('lodash');
 var globby = require('globby');
@@ -37,7 +34,7 @@ var shredSingleDir = function(shredOptions, filePath) {
     fragmentsDir: fragmentsDir
   }
   var cleanPath = path.join(fragmentsDir, '*.*')
-  return delPromise([ cleanPath, '!**/*.ovr.*']).then(function(paths) {
+  return del([ cleanPath, '!**/*.ovr.*']).then(function(paths) {
     // console.log('Deleted files/folders:\n', paths.join('\n'));
     return shred(options);
   });