Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit 9a815e9

Browse files
TypeError: Cannot set property '_launchNotification' of undefined #749
1 parent 4b6bae9 commit 9a815e9

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

src/app/firestore/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import * as firebase from "../../firebase";
2-
import { FIRESTORE_SERVER_TS } from "../../firebase";
32

43
export module firestore {
54
export class Firestore {
@@ -8,7 +7,7 @@ export module firestore {
87
}
98
FieldValue(): firebase.firestore.FieldValue {
109
return {
11-
serverTimestamp: () => FIRESTORE_SERVER_TS
10+
serverTimestamp: () => "SERVER_TIMESTAMP"
1211
}
1312
}
1413
}

src/firebase-common.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { prompt } from "tns-core-modules/ui/dialogs";
22
import { getString, setString } from "tns-core-modules/application-settings";
3-
import { firestore, FIRESTORE_SERVER_TS } from "./firebase";
3+
import { firestore } from "./firebase";
44
import * as analytics from "./analytics/analytics";
55
import * as mlkit from "./mlkit";
66

77
// note that this implementation is overridden for iOS
88
export class FieldValue {
9-
serverTimestamp = () => FIRESTORE_SERVER_TS;
9+
serverTimestamp = () => "SERVER_TIMESTAMP";
1010
}
1111

1212
export const firebase: any = {

src/firebase.android.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ad as AndroidUtils, layout } from "tns-core-modules/utils/utils";
55
import lazy from "tns-core-modules/utils/lazy";
66
import { topmost } from "tns-core-modules/ui/frame";
77
import { File } from "tns-core-modules/file-system";
8-
import { firestore, FIRESTORE_SERVER_TS } from "./firebase";
8+
import { firestore } from "./firebase";
99

1010
declare const android, com, org: any;
1111

@@ -127,7 +127,7 @@ firebase.toHashMap = obj => {
127127
node.put(property, null);
128128
} else {
129129
// note that the Android Firestore SDK only supports this for 'update' (not for 'set')
130-
if (obj[property] === FIRESTORE_SERVER_TS) {
130+
if (obj[property] === "SERVER_TIMESTAMP") {
131131
node.put(property, com.google.firebase.firestore.FieldValue.serverTimestamp());
132132
} else if (obj[property] instanceof Date) {
133133
node.put(property, new java.util.Date(obj[property].getTime()));

src/firebase.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
export declare const FIRESTORE_SERVER_TS = "SERVER_TIMESTAMP";
2-
31
/**
42
* The allowed values for LoginOptions.type.
53
*/

src/firebase.ios.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ios as iOSUtils } from "tns-core-modules/utils/utils";
44
import { getClass } from "tns-core-modules/utils/types";
55
import { device } from "tns-core-modules/platform";
66
import { DeviceType } from "tns-core-modules/ui/enums";
7-
import { firestore, FIRESTORE_SERVER_TS } from "./firebase";
7+
import { firestore } from "./firebase";
88

99
firebase._messagingConnected = null;
1010
firebase._pendingNotifications = [];
@@ -2447,7 +2447,7 @@ firebase.firestore.set = (collectionPath: string, documentPath: string, document
24472447

24482448
function fixServerTimestamp(item) {
24492449
for (let k in item) {
2450-
if (item.hasOwnProperty(k) && item[k] === FIRESTORE_SERVER_TS) {
2450+
if (item.hasOwnProperty(k) && item[k] === "SERVER_TIMESTAMP") {
24512451
item[k] = FIRFieldValue.fieldValueForServerTimestamp();
24522452
}
24532453
}

src/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-plugin-firebase",
3-
"version": "6.1.0",
3+
"version": "6.1.1",
44
"description": "Fire. Base. Firebase!",
55
"main": "firebase",
66
"typings": "index.d.ts",
@@ -41,6 +41,7 @@
4141
"package": "cd ../publish && rimraf ./package && ./pack.sh",
4242
"demo.ios": "npm run preparedemo && cd ../demo && tns run ios",
4343
"demo-ng.ios": "npm run preparedemo-ng && cd ../demo-ng && tns run ios",
44+
"demo-ng.ios.bundled": "npm run preparedemo-ng && cd ../demo-ng && tns run ios --bundle",
4445
"demo.android": "npm run preparedemo && cd ../demo && rimraf platforms/android && tns run android",
4546
"demo.android.linked": "npm run tsc && cd ../demo && tns run android --syncAllFiles",
4647
"demo-ng.android": "npm run preparedemo-ng && cd ../demo-ng && tns run android",

0 commit comments

Comments
 (0)