Skip to content

Commit 4f97aab

Browse files
triniwiztriniwiz
committed
fix(messaging): fcm token callback not fired
1 parent 7ca3c04 commit 4f97aab

File tree

53 files changed

+169
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+169
-115
lines changed

‎apps/demo-angular/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@nativescript/firebase-messaging-core": "file:../../dist/packages/firebase-messaging-core"
2323
},
2424
"devDependencies": {
25-
"@nativescript/android": "~8.3.0",
26-
"@nativescript/ios": "~8.3.0"
25+
"@nativescript/android": "~8.4.0",
26+
"@nativescript/ios": "~8.4.0"
2727
}
2828
}

‎apps/demo-angular/project.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "demo-angular",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"sourceRoot": "apps/demo-angular/src",
45
"projectType": "application",

‎apps/demo-vue/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@nativescript/firebase-messaging-core": "file:../../packages/firebase-messaging-core"
2424
},
2525
"devDependencies": {
26-
"@nativescript/android": "~8.3.0",
27-
"@nativescript/ios": "~8.3.0"
26+
"@nativescript/android": "~8.4.0",
27+
"@nativescript/ios": "~8.4.0"
2828
}
2929
}

‎apps/demo-vue/project.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "demo-vue",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "application",
45
"sourceRoot": "apps/demo-vue/app",

‎apps/demo/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@nativescript/firebase-messaging-core": "file:../../packages/firebase-messaging-core"
2727
},
2828
"devDependencies": {
29-
"@nativescript/android": "~8.3.0",
30-
"@nativescript/ios": "~8.3.0"
29+
"@nativescript/android": "~8.4.0",
30+
"@nativescript/ios": "~8.4.0"
3131
}
3232
}

‎apps/demo/project.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "demo",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"sourceRoot": "apps/demo/src",
45
"projectType": "application",

‎apps/demo/src/app.ts

+12
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@ dynamicLinks.onLink((link) => {
3737

3838
const messaging = firebase().messaging();
3939

40+
messaging.onMessage((message) => {
41+
console.log('Firebase onMessage', message);
42+
});
43+
44+
messaging.onNotificationTap((message) => {
45+
console.log('Firebase onNotificationTap', message);
46+
});
47+
48+
messaging.onToken((token) => {
49+
console.log('Firebase onToken', token);
50+
});
51+
4052
Application.on('launch', (args) => {
4153
messaging.onMessage((message) => {
4254
console.log('Firebase onMessage', message);

‎nx.json

+14-11
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33
"affected": {
44
"defaultBase": "master"
55
},
6-
"implicitDependencies": {
7-
"workspace.json": "*",
8-
"package.json": {
9-
"dependencies": "*",
10-
"devDependencies": "*"
11-
},
12-
"tsconfig.base.json": "*",
13-
"tslint.json": "*",
14-
"nx.json": "*"
15-
},
166
"workspaceLayout": {
177
"appsDir": "apps",
188
"libsDir": "packages"
@@ -28,5 +18,18 @@
2818
}
2919
}
3020
},
31-
"$schema": "./node_modules/nx/schemas/nx-schema.json"
21+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
22+
"namedInputs": {
23+
"default": ["{projectRoot}/**/*", "sharedGlobals"],
24+
"sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"],
25+
"production": ["default", "!{projectRoot}/.eslintrc.json"]
26+
},
27+
"targetDefaults": {
28+
"build": {
29+
"inputs": ["production", "^production"]
30+
},
31+
"lint": {
32+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
33+
}
34+
}
3235
}

‎package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "plugins",
3-
"version": "2.5.1",
3+
"version": "2.5.2",
44
"license": "MIT",
55
"scripts": {
66
"postinstall": "husky install && npx ts-patch install",
@@ -17,31 +17,31 @@
1717
},
1818
"private": true,
1919
"devDependencies": {
20-
"@angular-devkit/build-angular": "^14.2.0",
21-
"@angular/animations": "^14.2.0",
22-
"@angular/common": "^14.2.0",
23-
"@angular/compiler": "^14.2.0",
24-
"@angular/compiler-cli": "^14.2.0",
25-
"@angular/core": "^14.2.0",
26-
"@angular/forms": "^14.2.0",
27-
"@angular/platform-browser": "^14.2.0",
28-
"@angular/platform-browser-dynamic": "^14.2.0",
29-
"@angular/router": "^14.2.0",
30-
"@nativescript/angular": "^14.2.0",
31-
"@nativescript/core": "~8.3.0",
32-
"@nativescript/plugin-tools": "4.1.1",
33-
"@nativescript/types": "~8.3.0",
20+
"@angular-devkit/build-angular": "^15.0.0",
21+
"@angular/animations": "^15.0.0",
22+
"@angular/common": "^15.0.0",
23+
"@angular/compiler": "^15.0.0",
24+
"@angular/compiler-cli": "^15.0.0",
25+
"@angular/core": "^15.0.0",
26+
"@angular/forms": "^15.0.0",
27+
"@angular/platform-browser": "^15.0.0",
28+
"@angular/platform-browser-dynamic": "^15.0.0",
29+
"@angular/router": "^15.0.0",
30+
"@nativescript/angular": "^15.0.0",
31+
"@nativescript/core": "~8.4.0",
32+
"@nativescript/plugin-tools": "5.0.2",
33+
"@nativescript/types": "~8.4.0",
3434
"@nativescript/webpack": "~5.0.5",
35-
"@ngtools/webpack": "^14.2.0",
35+
"@ngtools/webpack": "^15.0.0",
3636
"conventional-changelog-cli": "^2.2.2",
3737
"husky": "^8.0.0",
3838
"nativescript-permissions": "1.3.11",
3939
"nativescript-vue": "~2.9.0",
4040
"nativescript-vue-template-compiler": "~2.9.0",
41-
"ng-packagr": "^14.2.0",
41+
"ng-packagr": "^15.0.0",
4242
"rxjs": "~7.5.0",
4343
"stacktrace-js": "~2.0.2",
44-
"typescript": "~4.7.3",
44+
"typescript": "~4.8.0",
4545
"vue": "~2.6.12",
4646
"zone.js": "~0.11.1"
4747
},

‎packages/firebase-admob/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-admob",
3-
"version": "2.5.1",
3+
"version": "2.5.2",
44
"description": "NativeScript Firebase - Admob",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-admob/project.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "firebase-admob",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "library",
45
"sourceRoot": "packages/firebase-admob",
@@ -40,12 +41,12 @@
4041
]
4142
},
4243
"build.all": {
43-
"executor": "@nrwl/workspace:run-commands",
44+
"executor": "nx:run-commands",
4445
"options": {
4546
"commands": ["node tools/scripts/build-finish.ts firebase-admob"],
4647
"parallel": false
4748
},
48-
"outputs": ["dist/packages/firebase-admob"],
49+
"outputs": ["{workspaceRoot}/dist/packages/firebase-admob"],
4950
"dependsOn": [
5051
{
5152
"target": "build.all",
@@ -58,7 +59,7 @@
5859
]
5960
},
6061
"focus": {
61-
"executor": "@nrwl/workspace:run-commands",
62+
"executor": "nx:run-commands",
6263
"options": {
6364
"commands": ["nx g @nativescript/plugin-tools:focus-packages firebase-admob"],
6465
"parallel": false

‎packages/firebase-analytics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-analytics",
3-
"version": "2.5.1",
3+
"version": "2.5.2",
44
"description": "NativeScript Firebase - Analytics",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-analytics/project.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "firebase-analytics",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "library",
45
"sourceRoot": "packages/firebase-analytics",
@@ -30,12 +31,12 @@
3031
]
3132
},
3233
"build.all": {
33-
"executor": "@nrwl/workspace:run-commands",
34+
"executor": "nx:run-commands",
3435
"options": {
3536
"commands": ["./node_modules/.bin/tsc -p packages/firebase-analytics/hooks/tsconfig.json", "node tools/scripts/build-finish.ts firebase-analytics"],
3637
"parallel": false
3738
},
38-
"outputs": ["dist/packages/firebase-analytics"],
39+
"outputs": ["{workspaceRoot}/dist/packages/firebase-analytics"],
3940
"dependsOn": [
4041
{
4142
"target": "build.all",
@@ -48,7 +49,7 @@
4849
]
4950
},
5051
"focus": {
51-
"executor": "@nrwl/workspace:run-commands",
52+
"executor": "nx:run-commands",
5253
"options": {
5354
"commands": ["nx g @nativescript/plugin-tools:focus-packages firebase-analytics"],
5455
"parallel": false

‎packages/firebase-app-check-debug/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-app-check-debug",
3-
"version": "2.5.1",
3+
"version": "2.5.2",
44
"description": "NativeScript Firebase - App Check",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-app-check-debug/project.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "firebase-app-check-debug",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "library",
45
"sourceRoot": "packages/firebase-app-check-debug",
@@ -30,12 +31,12 @@
3031
]
3132
},
3233
"build.all": {
33-
"executor": "@nrwl/workspace:run-commands",
34+
"executor": "nx:run-commands",
3435
"options": {
3536
"commands": ["node tools/scripts/build-finish.ts firebase-app-check-debug"],
3637
"parallel": false
3738
},
38-
"outputs": ["dist/packages/firebase-app-check-debug"],
39+
"outputs": ["{workspaceRoot}/dist/packages/firebase-app-check-debug"],
3940
"dependsOn": [
4041
{
4142
"target": "build.all",
@@ -48,7 +49,7 @@
4849
]
4950
},
5051
"focus": {
51-
"executor": "@nrwl/workspace:run-commands",
52+
"executor": "nx:run-commands",
5253
"options": {
5354
"commands": ["nx g @nativescript/plugin-tools:focus-packages firebase-app-check-debug"],
5455
"parallel": false

‎packages/firebase-app-check/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-app-check",
3-
"version": "2.5.1",
3+
"version": "2.5.2",
44
"description": "NativeScript Firebase - App Check",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-app-check/project.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "firebase-app-check",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "library",
45
"sourceRoot": "packages/firebase-app-check",
@@ -30,12 +31,12 @@
3031
]
3132
},
3233
"build.all": {
33-
"executor": "@nrwl/workspace:run-commands",
34+
"executor": "nx:run-commands",
3435
"options": {
3536
"commands": ["node tools/scripts/build-finish.ts firebase-app-check"],
3637
"parallel": false
3738
},
38-
"outputs": ["dist/packages/firebase-app-check"],
39+
"outputs": ["{workspaceRoot}/dist/packages/firebase-app-check"],
3940
"dependsOn": [
4041
{
4142
"target": "build.all",
@@ -48,7 +49,7 @@
4849
]
4950
},
5051
"focus": {
51-
"executor": "@nrwl/workspace:run-commands",
52+
"executor": "nx:run-commands",
5253
"options": {
5354
"commands": ["nx g @nativescript/plugin-tools:focus-packages firebase-app-check"],
5455
"parallel": false

‎packages/firebase-auth/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-auth",
3-
"version": "2.5.1",
3+
"version": "2.5.2",
44
"description": "NativeScript Firebase - Auth",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-auth/project.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "firebase-auth",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "library",
45
"sourceRoot": "packages/firebase-auth",
@@ -30,12 +31,12 @@
3031
]
3132
},
3233
"build.all": {
33-
"executor": "@nrwl/workspace:run-commands",
34+
"executor": "nx:run-commands",
3435
"options": {
3536
"commands": ["node tools/scripts/build-finish.ts firebase-auth"],
3637
"parallel": false
3738
},
38-
"outputs": ["dist/packages/firebase-auth"],
39+
"outputs": ["{workspaceRoot}/dist/packages/firebase-auth"],
3940
"dependsOn": [
4041
{
4142
"target": "build.all",
@@ -48,7 +49,7 @@
4849
]
4950
},
5051
"focus": {
51-
"executor": "@nrwl/workspace:run-commands",
52+
"executor": "nx:run-commands",
5253
"options": {
5354
"commands": ["nx g @nativescript/plugin-tools:focus-packages firebase-auth"],
5455
"parallel": false

‎packages/firebase-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-core",
3-
"version": "2.5.1",
3+
"version": "2.5.2",
44
"description": "NativeScript Firebase - Core",
55
"main": "index",
66
"typings": "index.d.ts",

‎packages/firebase-core/project.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "firebase-core",
23
"$schema": "../../node_modules/nx/schemas/project-schema.json",
34
"projectType": "library",
45
"sourceRoot": "packages/firebase-core",
@@ -30,12 +31,12 @@
3031
]
3132
},
3233
"build.all": {
33-
"executor": "@nrwl/workspace:run-commands",
34+
"executor": "nx:run-commands",
3435
"options": {
3536
"commands": ["node tools/scripts/build-finish.ts firebase-core"],
3637
"parallel": false
3738
},
38-
"outputs": ["dist/packages/firebase-core"],
39+
"outputs": ["{workspaceRoot}/dist/packages/firebase-core"],
3940
"dependsOn": [
4041
{
4142
"target": "build.all",
@@ -48,7 +49,7 @@
4849
]
4950
},
5051
"focus": {
51-
"executor": "@nrwl/workspace:run-commands",
52+
"executor": "nx:run-commands",
5253
"options": {
5354
"commands": ["nx g @nativescript/plugin-tools:focus-packages firebase-core"],
5455
"parallel": false

‎packages/firebase-crashlytics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/firebase-crashlytics",
3-
"version": "2.5.1",
3+
"version": "2.5.2",
44
"description": "NativeScript Firebase - Crashlytics",
55
"main": "index",
66
"typings": "index.d.ts",

0 commit comments

Comments
 (0)