Merge pull request #662 from jamestalmage/drop-bower

Jacob Wenger · Jacob Wenger · commit 1b9ede49883f · 2015-10-07T23:11:16.000-07:00
Fixes to drop-bower PR
diff --git a/bower.json b/bower.json
@@ -20,7 +20,9 @@
   "main": "dist/angularfire.js",
   "ignore": [
     "**/*",
-    "!dist/angularfire.js"
+    "!dist/*.js",
+    "!README.md",
+    "!LICENSE"
   ],
   "dependencies": {
     "angular": "1.3.x || 1.4.x",
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "karma-sauce-launcher": "~0.2.10",
     "karma-spec-reporter": "0.0.16",
     "load-grunt-tasks": "^3.1.0",
-    "mockfirebase": "jamestalmage/mockfirebase#deploy-npmignore-fix",
+    "mockfirebase": "^0.12.0",
     "protractor": "^1.6.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`"karma-sauce-launcher": "~0.2.10",`
`58`	`58`	`"karma-spec-reporter": "0.0.16",`
`59`	`59`	`"load-grunt-tasks": "^3.1.0",`
`60`		`- "mockfirebase": "jamestalmage/mockfirebase#deploy-npmignore-fix",`
	`60`	`+ "mockfirebase": "^0.12.0",`
`61`	`61`	`"protractor": "^1.6.1"`
`62`	`62`	`}`
`63`	`63`	`}`