Merge a329628 into 73a7767

.travis.yml

@@ -11,7 +11,9 @@ install:
 - git clone git://github.com/n1k0/casperjs.git ~/casperjs
 - export PATH=$PATH:~/casperjs/bin
 - npm install -g grunt-cli
+- npm install -g bower
 - npm install
+- bower install
 before_script:
 - grunt install
 - phantomjs --version

Gruntfile.js

@@ -139,7 +139,7 @@ module.exports = function(grunt) {
 
   // Installation
   grunt.registerTask('install', ['shell:protractor_install']);
-  grunt.registerTask('update', ['shell:npm_install']);
+  grunt.registerTask('update', ['shell:npm_install', 'shell:bower_install']);
 
   // Single run tests
   grunt.registerTask('test', ['test:unit', 'test:e2e']);

README.md

@@ -81,7 +81,9 @@ environment set up:
 $ git clone https://github.com/firebase/angularfire.git
 $ cd angularfire            # go to the angularfire directory
 $ npm install -g grunt-cli  # globally install grunt task runner
+$ npm install -g bower      # globally install Bower package manager
 $ npm install               # install local npm build / test dependencies
+$ bower install             # install local JavaScript dependencies
 $ grunt install             # install Selenium server for end-to-end tests
 $ grunt watch               # watch for source file changes
 ```

bower.json

@@ -19,11 +19,22 @@
   ],
   "main": "dist/angularfire.js",
   "ignore": [
-    "**/*",
-    "!dist/angularfire.js"
+    "**/.*",
+    "src",
+    "tests",
+    "node_modules",
+    "bower_components",
+    "firebase.json",
+    "package.json",
+    "Gruntfile.js",
+    "changelog.txt"
   ],
   "dependencies": {
     "angular": "1.3.x || 1.4.x",
     "firebase": "2.x.x"
+  },
+  "devDependencies": {
+    "angular-mocks": "~1.4.6",
+    "mockfirebase": "~0.10.1"
   }
 }

package.json

@@ -31,7 +31,6 @@
     "firebase": "2.x.x"
   },
   "devDependencies": {
-    "angular-mocks": "~1.4.6",
     "coveralls": "^2.11.2",
     "grunt": "~0.4.5",
     "grunt-cli": "^0.1.13",
@@ -57,7 +56,6 @@
     "karma-sauce-launcher": "~0.2.10",
     "karma-spec-reporter": "0.0.16",
     "load-grunt-tasks": "^3.1.0",
-    "mockfirebase": "jamestalmage/mockfirebase#deploy-npmignore-fix",
     "protractor": "^1.6.1"
   }
 }

tests/automatic_karma.conf.js

@@ -29,9 +29,9 @@ module.exports = function(config) {
     },
 
     files: [
-      '../node_modules/angular/angular.js',
-      '../node_modules/angular-mocks/angular-mocks.js',
-      '../node_modules/mockfirebase/browser/mockfirebase.js',
+      '../bower_components/angular/angular.js',
+      '../bower_components/angular-mocks/angular-mocks.js',
+      '../bower_components/mockfirebase/browser/mockfirebase.js',
       'lib/**/*.js',
       '../src/module.js',
       '../src/**/*.js',

tests/manual_karma.conf.js

@@ -10,9 +10,9 @@ module.exports = function(config) {
     singleRun: false,
 
     files: [
-      '../node_modules/angular/angular.js',
-      '../node_modules/angular-mocks/angular-mocks.js',
-      '../node_modules/firebase/lib/firebase-web.js',
+      '../bower_components/angular/angular.js',
+      '../bower_components/angular-mocks/angular-mocks.js',
+      '../bower_components/firebase/firebase.js',
       '../src/module.js',
       '../src/**/*.js',
       'manual/**/*.spec.js'

tests/protractor/chat/chat.html

@@ -4,10 +4,10 @@
     <title>AngularFire Chat e2e Test</title>
 
     <!-- Angular -->
-    <script src="../../../node_modules/angular/angular.min.js"></script>
+    <script src="../../../bower_components/angular/angular.min.js"></script>
 
     <!-- Firebase -->
-    <script src="../../../node_modules/firebase/lib/firebase-web.js"></script>
+    <script src="../../../bower_components/firebase/firebase.js"></script>
 
     <!-- AngularFire -->
     <script src="../../../dist/angularfire.js"></script>

tests/protractor/priority/priority.html

@@ -4,10 +4,10 @@
     <title>AngularFire Priority e2e Test</title>
 
     <!-- Angular -->
-    <script src="../../../node_modules/angular/angular.min.js"></script>
+    <script src="../../../bower_components/angular/angular.min.js"></script>
 
     <!-- Firebase -->
-    <script src="../../../node_modules/firebase/lib/firebase-web.js"></script>
+    <script src="../../../bower_components/firebase/firebase.js"></script>
 
     <!-- AngularFire -->
     <script src="../../../dist/angularfire.js"></script>

tests/protractor/tictactoe/tictactoe.html

@@ -4,10 +4,10 @@
     <title>AngularFire TicTacToe e2e Test</title>
 
     <!-- Angular -->
-    <script src="../../../node_modules/angular/angular.min.js"></script>
+    <script src="../../../bower_components/angular/angular.min.js"></script>
 
     <!-- Firebase -->
-    <script src="../../../node_modules/firebase/lib/firebase-web.js"></script>
+    <script src="../../../bower_components/firebase/firebase.js"></script>
 
     <!-- AngularFire -->
     <script src="../../../dist/angularfire.js"></script>

tests/protractor/todo/todo.html

@@ -4,10 +4,10 @@
     <title>AngularFire Todo e2e Test</title>
 
     <!-- Angular -->
-    <script src="../../../node_modules/angular/angular.min.js"></script>
+    <script src="../../../bower_components/angular/angular.min.js"></script>
 
     <!-- Firebase -->
-    <script src="../../../node_modules/firebase/lib/firebase-web.js"></script>
+    <script src="../../../bower_components/firebase/firebase.js"></script>
 
     <!-- AngularFire -->
     <script src="../../../dist/angularfire.js"></script>

tests/sauce_karma.conf.js

@@ -18,9 +18,9 @@ module.exports = function(config) {
     basePath: '',
     frameworks: ['jasmine'],
     files: [
-      '../node_modules/angular/angular.js',
-      '../node_modules/angular-mocks/angular-mocks.js',
-      '../node_modules/mockfirebase/browser/mockfirebase.js',
+      '../bower_components/angular/angular.js',
+      '../bower_components/angular-mocks/angular-mocks.js',
+      '../bower_components/mockfirebase/browser/mockfirebase.js',
       'lib/**/*.js',
       '../dist/angularfire.js',
       'mocks/**/*.js',