Skip to content

Commit d12c7d5

Browse files
authored
2.2.0 rc (firebase#398)
* updating changelog * updating tsc version * Remove uneeded firestore.settings calls * switching to firebase-admin 7.0.0
1 parent 9d93de3 commit d12c7d5

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

integration_test/functions/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ const numTests = Object.keys(exports).length; // Assumption: every exported func
1919
import 'firebase-functions'; // temporary shim until process.env.FIREBASE_CONFIG available natively in GCF(BUG 63586213)
2020
const firebaseConfig = JSON.parse(process.env.FIREBASE_CONFIG);
2121
admin.initializeApp();
22-
admin.firestore().settings({ timestampsInSnapshots: true });
2322

2423
// TODO(klimt): Get rid of this once the JS client SDK supports callable triggers.
2524
function callHttpsTrigger(name: string, data: any) {

integration_test/package.node6.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"@google-cloud/pubsub": "~0.19.0",
99
"@types/google-cloud__pubsub": "^0.18.0",
1010
"@types/lodash": "~4.14.41",
11-
"firebase-admin": "~6.0.0",
11+
"firebase-admin": "~7.0.0",
1212
"firebase-functions": "./firebase-functions.tgz",
1313
"lodash": "~4.17.2"
1414
},
1515
"main": "lib/index.js",
1616
"devDependencies": {
17-
"typescript": "~2.8.3"
17+
"typescript": "~3.1.0"
1818
},
1919
"engines": {
2020
"node": "6"

integration_test/package.node8.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"@google-cloud/pubsub": "~0.19.0",
99
"@types/google-cloud__pubsub": "^0.18.0",
1010
"@types/lodash": "~4.14.41",
11-
"firebase-admin": "~6.0.0",
11+
"firebase-admin": "~7.0.0",
1212
"firebase-functions": "./firebase-functions.tgz",
1313
"lodash": "~4.17.2"
1414
},
1515
"main": "lib/index.js",
1616
"devDependencies": {
17-
"typescript": "~2.8.3"
17+
"typescript": "~3.1.0"
1818
},
1919
"engines": {
2020
"node": "8"

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@
4040
"@types/sinon": "^1.16.29",
4141
"chai": "^3.5.0",
4242
"chai-as-promised": "^5.2.0",
43-
"firebase-admin": "~6.0.0",
43+
"firebase-admin": "~7.0.0",
4444
"istanbul": "^0.4.2",
4545
"mocha": "^5.2.0",
4646
"mock-require": "^2.0.1",
4747
"nock": "^9.0.0",
4848
"prettier": "^1.13.7",
4949
"sinon": "^1.17.4",
5050
"ts-node": "^7.0.1",
51-
"typescript": "~2.8.3"
51+
"typescript": "~3.1.0"
5252
},
5353
"peerDependencies": {
54-
"firebase-admin": "~6.0.0"
54+
"firebase-admin": "~7.0.0"
5555
},
5656
"dependencies": {
5757
"@types/cors": "^2.8.1",

src/providers/firestore.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ function _getValueProto(data: any, resource: string, valueFieldName: string) {
145145
export function snapshotConstructor(event: Event): DocumentSnapshot {
146146
if (!firestoreInstance) {
147147
firestoreInstance = firebase.firestore(apps().admin);
148-
firestoreInstance.settings({ timestampsInSnapshots: true });
149148
}
150149
let valueProto = _getValueProto(
151150
event.data,
@@ -161,7 +160,6 @@ export function snapshotConstructor(event: Event): DocumentSnapshot {
161160
export function beforeSnapshotConstructor(event: Event): DocumentSnapshot {
162161
if (!firestoreInstance) {
163162
firestoreInstance = firebase.firestore(apps().admin);
164-
firestoreInstance.settings({ timestampsInSnapshots: true });
165163
}
166164
let oldValueProto = _getValueProto(
167165
event.data,

0 commit comments

Comments
 (0)