From e0ac7065df8d7c54e7bad0ba150b14e13ee30578 Mon Sep 17 00:00:00 2001
From: Brian Ford <btford@umich.edu>
Date: Tue, 9 Dec 2014 21:02:52 -0800
Subject: [PATCH] chore(deps): use angular 1.3.6 from npm

Closes #164
---
 bower.json         | 15 ---------------
 example/index.html |  2 +-
 gulpfile.js        |  2 +-
 karma.conf.js      |  4 ++--
 package.json       |  2 ++
 panel/app.html     |  2 +-
 6 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 bower.json

diff --git a/bower.json b/bower.json
deleted file mode 100644
index 13387c4..0000000
--- a/bower.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "angularjs-batarang",
-  "version": "0.5.0",
-  "dependencies": {
-    "angular": "1.3.0",
-    "d3": "~3.2.6",
-    "angular-loader": "1.3.0"
-  },
-  "devDependencies": {
-    "angular-mocks": "1.3.0"
-  },
-  "resolutions": {
-    "angular": "1.3.0"
-  }
-}
diff --git a/example/index.html b/example/index.html
index f059b05..1d68565 100644
--- a/example/index.html
+++ b/example/index.html
@@ -15,7 +15,7 @@
       <li ng-repeat="num in items">{{num}}</li>
     </ul>
   </div>
-  <script src="../bower_components/angular/angular.js"></script>
+  <script src="../node_modules/angular/angular.js"></script>
   <script>
   angular.module('myApp', []).
     controller('myKontroller', function ($scope) {
diff --git a/gulpfile.js b/gulpfile.js
index 8b24d5b..a454038 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -28,7 +28,7 @@ gulp.task('package', ['browserify'], function () {
       'devtoolsBackground.*',
       'inject.js',
       'manifest.json',
-      './bower_components/angular/angular.js'
+      './node_modules/angular/angular.js'
     ], {base: '.'})
     .pipe(gulp.dest('./package'));
 });
diff --git a/karma.conf.js b/karma.conf.js
index 2fbbf68..764f781 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -6,8 +6,8 @@ module.exports = function(config) {
   config.set({
     frameworks: ['browserify', 'jasmine'],
     files: [
-      'bower_components/angular/angular.js',
-      'bower_components/angular-mocks/angular-mocks.js',
+      'node_modules/angular/angular.js',
+      'node_modules/angular-mocks/angular-mocks.js',
       'panel/app.js',
       'panel/**/*.js',
       'panel/**/*.spec.js'
diff --git a/package.json b/package.json
index 9e79fd7..9226727 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,13 @@
   "description": "chrome extension for inspecting angular apps",
   "main": "hint.js",
   "devDependencies": {
+    "angular-mocks": "^1.3.6",
     "gulp-zip": "^2.0.2",
     "karma-chrome-launcher": "^0.1.4",
     "karma-jasmine": "^0.1.5"
   },
   "dependencies": {
+    "angular": "^1.3.6",
     "angular-hint": "~0.0.0",
     "browserify": "^5.9.1",
     "gulp": "^3.8.7",
diff --git a/panel/app.html b/panel/app.html
index 69f9faf..1fb54fe 100644
--- a/panel/app.html
+++ b/panel/app.html
@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="components/json-tree/json-tree.css">
   <link rel="stylesheet" href="components/scope-tree/scope-tree.css">
 
-  <script src="../bower_components/angular/angular.js"></script>
+  <script src="../node_modules/angular/angular.js"></script>
 
   <!-- components -->
   <script src="components/inspected-app/inspected-app.js"></script>