Skip to content

Commit e5370b5

Browse files
authored
Merge pull request #72 from addyosmani/firebase
Update to Firebase 3.x and modular Firebase builds
2 parents e56060a + f091824 commit e5370b5

File tree

4 files changed

+92
-16
lines changed

4 files changed

+92
-16
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"compression": "^1.6.2",
1919
"es6-promise": "^3.2.1",
2020
"express": "^4.14.0",
21-
"firebase": "^2.4.2",
21+
"firebase": "^3.4.1",
2222
"lru-cache": "^4.0.1",
2323
"serialize-javascript": "^1.3.0",
2424
"serve-favicon": "^2.3.0",

src/store/create-api-client.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1-
import Firebase from 'firebase'
1+
import Firebase from 'firebase/app'
2+
import 'firebase/database'
23

3-
export default new Firebase('https://hacker-news.firebaseio.com/v0')
4+
const config = {
5+
databaseURL: 'https://hacker-news.firebaseio.com'
6+
}
7+
const version = '/v0'
8+
9+
Firebase.initializeApp(config)
10+
const api = Firebase.database().ref(version)
11+
export default api

src/store/create-api-server.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ import Firebase from 'firebase'
22
import LRU from 'lru-cache'
33

44
let api
5+
const config = {
6+
databaseURL: 'https://hacker-news.firebaseio.com'
7+
}
8+
const version = '/v0'
59

610
if (process.__API__) {
711
api = process.__API__
812
} else {
9-
api = process.__API__ = new Firebase('https://hacker-news.firebaseio.com/v0')
13+
Firebase.initializeApp(config)
14+
api = process.__API__ = Firebase.database().ref(version)
1015

1116
// fetched item cache
1217
api.cachedItems = LRU({

yarn.lock

Lines changed: 75 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -742,10 +742,18 @@ base64-js@^1.0.2:
742742
version "1.2.0"
743743
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
744744

745+
base64-url@^1.2.1:
746+
version "1.3.3"
747+
resolved "https://registry.yarnpkg.com/base64-url/-/base64-url-1.3.3.tgz#f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"
748+
745749
Base64@~0.2.0:
746750
version "0.2.1"
747751
resolved "https://registry.yarnpkg.com/Base64/-/Base64-0.2.1.tgz#ba3a4230708e186705065e66babdd4c35cf60028"
748752

753+
base64url@^2.0.0, [email protected]:
754+
version "2.0.0"
755+
resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
756+
749757
bcrypt-pbkdf@^1.0.0:
750758
version "1.0.0"
751759
resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz#3ca76b85241c7170bf7d9703e7b9aa74630040d4"
@@ -856,6 +864,10 @@ browserslist@~1.4.0:
856864
dependencies:
857865
caniuse-db "^1.0.30000539"
858866

867+
868+
version "1.0.1"
869+
resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
870+
859871
buffer-shims@^1.0.0:
860872
version "1.0.0"
861873
resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
@@ -1345,6 +1357,10 @@ diffie-hellman@^5.0.0:
13451357
miller-rabin "^4.0.0"
13461358
randombytes "^2.0.0"
13471359

1360+
1361+
version "2.0.2"
1362+
resolved "https://registry.yarnpkg.com/dom-storage/-/dom-storage-2.0.2.tgz#ed17cbf68abd10e0aef8182713e297c5e4b500b0"
1363+
13481364
dom-urls@^1.1.0:
13491365
version "1.1.0"
13501366
resolved "https://registry.yarnpkg.com/dom-urls/-/dom-urls-1.1.0.tgz#001ddf81628cd1e706125c7176f53ccec55d918e"
@@ -1361,6 +1377,12 @@ ecc-jsbn@~0.1.1:
13611377
dependencies:
13621378
jsbn "~0.1.0"
13631379

1380+
1381+
version "1.0.7"
1382+
resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.7.tgz#3137e976a1d6232517e2513e04e32f79bcbdf126"
1383+
dependencies:
1384+
base64-url "^1.2.1"
1385+
13641386
editorconfig@^0.13.2:
13651387
version "0.13.2"
13661388
resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35"
@@ -1519,9 +1541,9 @@ fastparse@^1.1.1:
15191541
version "1.1.1"
15201542
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
15211543

1522-
faye-websocket@>=0.6.0:
1523-
version "0.11.0"
1524-
resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.0.tgz#d9ccf0e789e7db725d74bc4877d23aa42972ac50"
1544+
faye-websocket@0.9.3:
1545+
version "0.9.3"
1546+
resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.9.3.tgz#482a505b0df0ae626b969866d3bd740cdb962e83"
15251547
dependencies:
15261548
websocket-driver ">=0.5.1"
15271549

@@ -1570,11 +1592,15 @@ find-up@^1.0.0:
15701592
path-exists "^2.0.0"
15711593
pinkie-promise "^2.0.0"
15721594

1573-
firebase@^2.4.2:
1574-
version "2.4.2"
1575-
resolved "https://registry.yarnpkg.com/firebase/-/firebase-2.4.2.tgz#4e1119ec0396ca561d8a7acbff1630feac6c0a31"
1595+
firebase@^3.4.1:
1596+
version "3.6.0"
1597+
resolved "https://registry.yarnpkg.com/firebase/-/firebase-3.6.0.tgz#d87c260e178c2b5d6c0bcdd133f85167646f9623"
15761598
dependencies:
1577-
faye-websocket ">=0.6.0"
1599+
dom-storage "2.0.2"
1600+
faye-websocket "0.9.3"
1601+
jsonwebtoken "5.7.0"
1602+
rsvp "3.2.1"
1603+
xmlhttprequest "1.8.0"
15781604

15791605
flatten@^1.0.2:
15801606
version "1.0.2"
@@ -2114,6 +2140,14 @@ jsonpointer@^4.0.0:
21142140
version "4.0.0"
21152141
resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.0.tgz#6661e161d2fc445f19f98430231343722e1fcbd5"
21162142

2143+
2144+
version "5.7.0"
2145+
resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-5.7.0.tgz#1c90f9a86ce5b748f5f979c12b70402b4afcddb4"
2146+
dependencies:
2147+
jws "^3.0.0"
2148+
ms "^0.7.1"
2149+
xtend "^4.0.1"
2150+
21172151
jsprim@^1.2.2:
21182152
version "1.3.1"
21192153
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252"
@@ -2122,6 +2156,23 @@ jsprim@^1.2.2:
21222156
json-schema "0.2.3"
21232157
verror "1.3.6"
21242158

2159+
jwa@^1.1.4:
2160+
version "1.1.4"
2161+
resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.4.tgz#dbb01bd38cd409899fa715107e90d90f9bcb161e"
2162+
dependencies:
2163+
base64url "2.0.0"
2164+
buffer-equal-constant-time "1.0.1"
2165+
ecdsa-sig-formatter "1.0.7"
2166+
safe-buffer "^5.0.1"
2167+
2168+
jws@^3.0.0:
2169+
version "3.1.4"
2170+
resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.4.tgz#f9e8b9338e8a847277d6444b1464f61880e050a2"
2171+
dependencies:
2172+
base64url "^2.0.0"
2173+
jwa "^1.1.4"
2174+
safe-buffer "^5.0.1"
2175+
21252176
kind-of@^3.0.2:
21262177
version "3.0.4"
21272178
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.0.4.tgz#7b8ecf18a4e17f8269d73b501c9f232c96887a74"
@@ -2431,14 +2482,14 @@ mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1, [email protected]:
24312482
dependencies:
24322483
minimist "0.0.8"
24332484

2485+
ms@^0.7.1, [email protected]:
2486+
version "0.7.2"
2487+
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
2488+
24342489
24352490
version "0.7.1"
24362491
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
24372492

2438-
2439-
version "0.7.2"
2440-
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
2441-
24422493
nan@^2.3.0:
24432494
version "2.4.0"
24442495
resolved "https://registry.yarnpkg.com/nan/-/nan-2.4.0.tgz#fb3c59d45fe4effe215f0b890f8adf6eb32d2232"
@@ -3213,6 +3264,14 @@ ripemd160@^1.0.0:
32133264
version "1.0.1"
32143265
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
32153266

3267+
3268+
version "3.2.1"
3269+
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a"
3270+
3271+
safe-buffer@^5.0.1:
3272+
version "5.0.1"
3273+
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
3274+
32163275
sax@~1.2.1:
32173276
version "1.2.1"
32183277
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
@@ -3818,7 +3877,11 @@ wrappy@1:
38183877
version "1.0.2"
38193878
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
38203879

3821-
xtend@^4.0.0:
3880+
3881+
version "1.8.0"
3882+
resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
3883+
3884+
xtend@^4.0.0, xtend@^4.0.1:
38223885
version "4.0.1"
38233886
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
38243887

0 commit comments

Comments
 (0)