Merge pull request #79 from seegno/enhancement/dependencies

Update dependencies
oauthjs · Feb 11, 2016 · 219e035 · 219e035
2 parents 46ebcf5 + e9a71dc
commit 219e035
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ git:
   depth: 10
 
 node_js:
-  - iojs
+  - 4.3
 
 cache:
   directories:

diff --git a/gulpfile.js b/gulpfile.js
@@ -3,15 +3,14 @@
  * Module dependencies.
  */
 
+var babel = require('gulp-babel');
 var concat = require('gulp-concat');
 var gulp = require('gulp');
 var header = require('gulp-header');
 var jshint = require('gulp-jshint');
-var karma = require('karma').server;
-var ngAnnotate = require('gulp-ng-annotate');
+var karma = require('karma').Server;
 var pkg = require('./package.json');
 var rename = require('gulp-rename');
-var to5 = require('gulp-6to5');
 var uglify = require('gulp-uglify');
 var wrapUmd = require('gulp-wrap-umd');
 
@@ -61,8 +60,7 @@ var config = {
 
 gulp.task('scripts', ['scripts-lint'], function() {
   return gulp.src(config.src)
-    .pipe(to5({ modules: 'ignore', blacklist: ['useStrict'] }))
-    .pipe(ngAnnotate({ single_quotes: true, add: true }))
+    .pipe(babel({ modules: 'ignore', blacklist: ['useStrict'] }))
     .pipe(concat(config.name))
     .pipe(wrapUmd(config.umd))
     .pipe(uglify({
@@ -95,12 +93,14 @@ gulp.task('scripts-lint', function() {
  */
 
 gulp.task('test', ['scripts'], function() {
-  return karma.start({
+  var server = new karma({
     configFile: __dirname + '/karma.conf.js',
     singleRun: true
   }, function(code) {
     console.log('Karma has exited with code', code);
   });
+
+  return server.start();
 });
 
 /**

diff --git a/karma.conf.js b/karma.conf.js
@@ -17,7 +17,7 @@ module.exports = function(config) {
       'node_modules/angular/angular.js',
       'node_modules/angular-cookies/angular-cookies.js',
       'node_modules/query-string/query-string.js',
-      'node_modules/lodash/dist/lodash.js',
+      'node_modules/lodash/lodash.js',
       'node_modules/angular-mocks/angular-mocks.js',
       'dist/angular-oauth2.js',
       'test/mocks/**/*.mock.js',

diff --git a/package.json b/package.json
@@ -27,29 +27,26 @@
     "query-string": "^1.0.0"
   },
   "devDependencies": {
-    "6to5ify": "^3.1.2",
     "angular-mocks": "^1.3.9",
-    "bower": "^1.3.12",
     "github-changes": "^1.0.0",
     "gulp": "^3.8.10",
-    "gulp-6to5": "^2.0.2",
+    "gulp-babel": "^5.3.0",
     "gulp-concat": "^2.4.3",
     "gulp-header": "^1.2.2",
     "gulp-jshint": "^1.9.0",
-    "gulp-ng-annotate": "^0.4.4",
     "gulp-rename": "^1.2.0",
     "gulp-uglify": "^1.0.2",
     "gulp-wrap-umd": "^0.2.1",
     "jshint-stylish": "^1.0.0",
-    "karma": "^0.12.31",
+    "karma": "^0.13.0",
     "karma-browserify": "^2.0.0",
     "karma-chrome-launcher": "^0.1.7",
     "karma-firefox-launcher": "^0.1.4",
     "karma-mocha": "^0.1.10",
     "karma-mocha-reporter": "^0.3.1",
     "karma-should": "0.0.1",
     "karma-sinon": "^1.0.4",
-    "lodash": "^2.4.1",
+    "lodash": "^4.0.0",
     "mocha": "^2.4.5",
     "should": "^4.6.0",
     "sinon": "^1.17.3",

diff --git a/src/config/oauth-config.js b/src/config/oauth-config.js
@@ -1,14 +1,14 @@
 
 /**
  * OAuth config.
- *
- * @ngInject
  */
 
 function oauthConfig($httpProvider) {
   $httpProvider.interceptors.push('oauthInterceptor');
 }
 
+oauthConfig.$inject = ['$httpProvider'];
+
 /**
  * Export `oauthConfig`.
  */

diff --git a/src/interceptors/oauth-interceptor.js b/src/interceptors/oauth-interceptor.js
@@ -1,8 +1,6 @@
 
 /**
  * OAuth interceptor.
- *
- * @ngInject
  */
 
 function oauthInterceptor($q, $rootScope, OAuthToken) {
@@ -41,6 +39,8 @@ function oauthInterceptor($q, $rootScope, OAuthToken) {
   };
 }
 
+oauthInterceptor.$inject = ['$q', '$rootScope', 'OAuthToken'];
+
 /**
  * Export `oauthInterceptor`.
  */

diff --git a/src/providers/oauth-provider.js b/src/providers/oauth-provider.js
@@ -75,8 +75,6 @@ function OAuthProvider() {
 
   /**
    * OAuth service.
-   *
-   * @ngInject
    */
 
   this.$get = function($http, OAuthToken) {
@@ -214,6 +212,8 @@ function OAuthProvider() {
 
     return new OAuth();
   };
+
+  this.$get.$inject = ['$http', 'OAuthToken'];
 }
 
 /**

diff --git a/src/providers/oauth-token-provider.js b/src/providers/oauth-token-provider.js
@@ -37,8 +37,6 @@ function OAuthTokenProvider() {
 
   /**
    * OAuthToken service.
-   *
-   * @ngInject
    */
 
   this.$get = function($cookies) {
@@ -107,6 +105,8 @@ function OAuthTokenProvider() {
 
     return new OAuthToken();
   };
+
+  this.$get.$inject = ['$cookies'];
 }
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ git: @@
       depth: 10
     node_js:
-      - iojs
+      - 4.3
     cache:
       directories:
@@ Expand Down @@