Merge pull request #76 from seegno/support/package-browser

Update `package.json`

Author: pgom

.travis.yml

@@ -3,7 +3,6 @@ language: node_js
 sudo: false
 
 before_script:
-  - ./node_modules/.bin/bower install
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
@@ -16,5 +15,3 @@ node_js:
 cache:
   directories:
     - node_modules
-    - bower_components
-

README.md

@@ -177,11 +177,10 @@ It will be awesome if you can help us evolve `angular-oauth2`. Want to help?
 
 1. [Fork it](https://github.com/seegno/angular-oauth2).
 2. `npm install`.
-3. `bower install`
-4. Do your magic.
-5. Run the tests: `gulp test`.
-6. Build: `gulp build`
-7. Create a [Pull Request](https://github.com/seegno/angular-oauth2/compare).
+3. Do your magic.
+4. Run the tests: `gulp test`.
+5. Build: `gulp build`
+6. Create a [Pull Request](https://github.com/seegno/angular-oauth2/compare).
 
 *The source files are written in ES6.*
 

gulpfile.js

@@ -27,10 +27,24 @@ var config = {
   umd: {
     namespace: 'angularOAuth2',
     exports: 'ngModule',
-    deps: [
-      'angular',
-      { name: 'query-string', globalName: 'queryString', paramName: 'queryString' }
-    ]
+    template: `
+      (function(root, factory) {
+        if (typeof define === 'function' && define.amd) {
+          define([ "angular", "angular-cookies", "query-string" ], factory);
+        } else if (typeof exports === 'object') {
+          module.exports = factory(require("angular"), require("angular-cookies"), require("query-string"));
+        } else {
+          root.<%= namespace %> = factory(root.angular, 'ngCookies', root.queryString);
+        }
+      }(this, function(angular, ngCookies, queryString) {
+        <% if (exports) { %>
+          <%= contents %>
+          return <%= exports %>;
+        <% } else { %>
+          return <%= contents %>;
+        <% } %>
+      }));
+    `
   },
   banner: ['/**',
     ' * <%= pkg.name %> - <%= pkg.description %>',

karma.conf.js

@@ -14,9 +14,9 @@ module.exports = function(config) {
     basePath: './',
     browsers: [argv.browsers || 'Chrome'],
     files: [
-      'bower_components/angular/angular.js',
-      'bower_components/angular-cookies/angular-cookies.js',
-      'bower_components/query-string/query-string.js',
+      '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/angular-mocks/angular-mocks.js',
       'dist/angular-oauth2.js',

package.json

@@ -21,6 +21,11 @@
     "url": "https://github.com/seegno/angular-oauth2/issues"
   },
   "homepage": "https://github.com/seegno/angular-oauth2",
+  "dependencies": {
+    "angular": "^1.4.0",
+    "angular-cookies": "^1.4.0",
+    "query-string": "^1.0.0"
+  },
   "devDependencies": {
     "6to5ify": "^3.1.2",
     "angular-mocks": "^1.3.9",
@@ -45,21 +50,13 @@
     "karma-should": "0.0.1",
     "karma-sinon": "^1.0.4",
     "lodash": "^2.4.1",
+    "mocha": "^2.4.5",
     "should": "^4.6.0",
+    "sinon": "^1.17.3",
     "yargs": "^3.6.0"
   },
-  "browser": {
-    "angular": "./bower_components/angular/angular.js",
-    "angular-cookies": "./bower_components/angular-cookies/angular-cookies.js",
-    "query-string": "./bower_components/query-string/query-string.js"
-  },
   "scripts": {
     "changelog": "./node_modules/.bin/github-changes -o seegno -r angular-oauth2 -a --only-pulls --use-commit-body --title 'Changelog' --date-format '/ YYYY-MM-DD'",
     "test": "./node_modules/.bin/gulp test --browsers Firefox"
-  },
-  "browserify-shim": {
-    "angular": {
-      "exports": "angular"
-    }
   }
 }

src/angular-oauth2.js

@@ -8,10 +8,10 @@ import OAuthProvider from './providers/oauth-provider';
 import OAuthTokenProvider from './providers/oauth-token-provider';
 import oauthConfig from './config/oauth-config';
 import oauthInterceptor from './interceptors/oauth-interceptor';
-import 'angular-cookies';
+import ngCookies from 'angular-cookies';
 
 var ngModule = angular.module('angular-oauth2', [
-    'ngCookies'
+    ngCookies
   ])
   .config(oauthConfig)
   .factory('oauthInterceptor', oauthInterceptor)