Skip to content

Commit 21f8990

Browse files
authored
v2.1.2
* fix(profile): `userData.uid` undefined error no longer thrown when creating profile in Firestore - prescottprue#468 * feat(deps): update `lodash` to `4.7.10` (fixes npm dependency security warning) * feat(deps): `firebase` dev dependency locked to `4.12.0` (gets updates without warnings) * feat(deps): `codecov` dev dependency updated (fixes npm dependency security warning) * feat(examples): examples updated to `firebase` `^5.*.*`
2 parents 6eb1258 + 98effa3 commit 21f8990

File tree

11 files changed

+741
-1601
lines changed

11 files changed

+741
-1601
lines changed

examples/complete/firestore/package-lock.json

Lines changed: 202 additions & 475 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/complete/firestore/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"react-scripts": "0.4.1"
77
},
88
"dependencies": {
9-
"firebase": "^4.12.1",
9+
"firebase": "^5.0.2",
1010
"prop-types": "^15.6.1",
1111
"react": "^16.3.0",
1212
"react-dom": "^16.3.0",

examples/complete/firestore/src/config.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@ export const firebase = {
77
messagingSenderId: "502471151289"
88
}
99

10-
export default { firebase }
10+
export const rrfConfig = {
11+
userProfile: 'users',
12+
useFirestoreForProfile: true, // Store in Firestore instead of Real Time DB
13+
enableLogging: false
14+
}
15+
16+
export default { firebase, rrfConfig }

examples/complete/firestore/src/store.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import { createStore, compose } from 'redux'
22
import rootReducer from './reducer'
33
import { firebase as fbConfig } from './config'
4-
import firebase from 'firebase'
4+
import firebase from 'firebase/app'
5+
import 'firebase/auth'
6+
import 'firebase/database'
57
import 'firebase/firestore' // make sure you add this for firestore
68
import { reactReduxFirebase } from 'react-redux-firebase'
79
import { reduxFirestore } from 'redux-firestore'
810

911
export default function configureStore (initialState, history) {
1012
// Initialize Firebase instance
1113
firebase.initializeApp(fbConfig)
12-
firebase.firestore() // Initialize Firestore
14+
// Initialize Firestore with timeshot settings
15+
firebase.firestore().settings({ timestampsInSnapshots: true })
1316

1417
const createStoreWithMiddleware = compose(
1518
reactReduxFirebase(firebase,
@@ -22,6 +25,7 @@ export default function configureStore (initialState, history) {
2225
reduxFirestore(firebase),
2326
typeof window === 'object' && typeof window.devToolsExtension !== 'undefined' ? window.devToolsExtension() : f => f
2427
)(createStore)
28+
2529
const store = createStoreWithMiddleware(rootReducer)
2630

2731
if (module.hot) {

examples/complete/material/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"author": "testuser (https://github.com/testuser)",
2222
"license": "MIT",
2323
"dependencies": {
24-
"firebase": "^4.12.1",
24+
"firebase": "^5.0.1",
2525
"lodash": "^4.17.4",
2626
"material-ui": "^0.19.1",
2727
"normalize.css": "^7.0.0",

examples/complete/material/src/store/createStore.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ import { applyMiddleware, compose, createStore } from 'redux'
22
import thunk from 'redux-thunk'
33
import { browserHistory } from 'react-router'
44
import { reactReduxFirebase, getFirebase } from 'react-redux-firebase'
5+
// import { reduxFirestore } from 'redux-firestore'
56
import makeRootReducer from './reducers'
6-
import firebase from 'firebase'
7+
import firebase from 'firebase/app'
78
// import 'firebase/firestore' // make sure you add this for firestore
9+
import 'firebase/database' // make sure you add this for firestore
10+
import 'firebase/auth' // make sure you add this for firestore
811
import { firebase as fbConfig, reduxFirebase as reduxConfig } from '../config'
912
import { version } from '../../package.json'
1013
import { updateLocation } from './location'
@@ -47,6 +50,7 @@ export default (initialState = {}) => {
4750
compose(
4851
// pass firebase or app instance and config
4952
reactReduxFirebase(firebase, reduxConfig),
53+
// reduxFirestore(firebase),
5054
applyMiddleware(...middleware),
5155
...enhancers
5256
)

0 commit comments

Comments
 (0)