Skip to content

Commit 53a4d12

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge
2 parents 6a6ec47 + ff7be4b commit 53a4d12

File tree

131 files changed

+14830
-2303
lines changed

Some content is hidden

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

131 files changed

+14830
-2303
lines changed

‎.github/workflows/test-all.yml

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,41 @@ jobs:
5555
uses: actions/setup-node@v1
5656
with:
5757
node-version: 10.x
58-
registry-url: 'https://registry.npmjs.org'
5958
- name: Yarn install
6059
run: yarn
61-
- name: yarn build
62-
run: yarn build
6360
- name: Deploy canary
64-
run: |
65-
npm config set //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN
66-
yarn release --canary
61+
run: yarn release --canary
6762
env:
68-
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
63+
NPM_TOKEN_ANALYTICS: ${{secrets.NPM_TOKEN_ANALYTICS}}
64+
NPM_TOKEN_ANALYTICS_INTEROP_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_INTEROP_TYPES}}
65+
NPM_TOKEN_ANALYTICS_TYPES: ${{secrets.NPM_TOKEN_ANALYTICS_TYPES}}
66+
NPM_TOKEN_APP: ${{secrets.NPM_TOKEN_APP}}
67+
NPM_TOKEN_APP_TYPES: ${{secrets.NPM_TOKEN_APP_TYPES}}
68+
NPM_TOKEN_AUTH: ${{secrets.NPM_TOKEN_AUTH}}
69+
NPM_TOKEN_AUTH_INTEROP_TYPES: ${{secrets.NPM_TOKEN_AUTH_INTEROP_TYPES}}
70+
NPM_TOKEN_AUTH_TYPES: ${{secrets.NPM_TOKEN_AUTH_TYPES}}
71+
NPM_TOKEN_COMPONENT: ${{secrets.NPM_TOKEN_COMPONENT}}
72+
NPM_TOKEN_DATABASE: ${{secrets.NPM_TOKEN_DATABASE}}
73+
NPM_TOKEN_DATABASE_TYPES: ${{secrets.NPM_TOKEN_DATABASE_TYPES}}
74+
NPM_TOKEN_FIRESTORE: ${{secrets.NPM_TOKEN_FIRESTORE}}
75+
NPM_TOKEN_FIRESTORE_TYPES: ${{secrets.NPM_TOKEN_FIRESTORE_TYPES}}
76+
NPM_TOKEN_FUNCTIONS: ${{secrets.NPM_TOKEN_FUNCTIONS}}
77+
NPM_TOKEN_FUNCTIONS_TYPES: ${{secrets.NPM_TOKEN_FUNCTIONS_TYPES}}
78+
NPM_TOKEN_INSTALLATIONS: ${{secrets.NPM_TOKEN_INSTALLATIONS}}
79+
NPM_TOKEN_INSTALLATIONS_TYPES: ${{secrets.NPM_TOKEN_INSTALLATIONS_TYPES}}
80+
NPM_TOKEN_LOGGER: ${{secrets.NPM_TOKEN_LOGGER}}
81+
NPM_TOKEN_MESSAGING: ${{secrets.NPM_TOKEN_MESSAGING}}
82+
NPM_TOKEN_MESSAGING_TYPES: ${{secrets.NPM_TOKEN_MESSAGING_TYPES}}
83+
NPM_TOKEN_PERFORMANCE: ${{secrets.NPM_TOKEN_PERFORMANCE}}
84+
NPM_TOKEN_PERFORMANCE_TYPES: ${{secrets.NPM_TOKEN_PERFORMANCE_TYPES}}
85+
NPM_TOKEN_POLYFILL: ${{secrets.NPM_TOKEN_POLYFILL}}
86+
NPM_TOKEN_REMOTE_CONFIG: ${{secrets.NPM_TOKEN_REMOTE_CONFIG}}
87+
NPM_TOKEN_REMOTE_CONFIG_TYPES: ${{secrets.NPM_TOKEN_REMOTE_CONFIG_TYPES}}
88+
NPM_TOKEN_STORAGE: ${{secrets.NPM_TOKEN_STORAGE}}
89+
NPM_TOKEN_STORAGE_TYPES: ${{secrets.NPM_TOKEN_STORAGE_TYPES}}
90+
NPM_TOKEN_TESTING: ${{secrets.NPM_TOKEN_TESTING}}
91+
NPM_TOKEN_UTIL: ${{secrets.NPM_TOKEN_UTIL}}
92+
NPM_TOKEN_WEBCHANNEL_WRAPPER: ${{secrets.NPM_TOKEN_WEBCHANNEL_WRAPPER}}
93+
NPM_TOKEN_FIREBASE: ${{secrets.NPM_TOKEN_FIREBASE}}
94+
NPM_TOKEN_RXFIRE: ${{secrets.NPM_TOKEN_RXFIRE}}
95+
CI: true

‎config/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Cloud Functions for Firebase",
44
"dependencies": {
55
"cors": "2.8.5",
6-
"firebase-admin": "8.9.0",
6+
"firebase-admin": "8.10.0",
77
"firebase-functions": "3.3.0"
88
},
99
"private": true,

‎integration/browserify/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "7.9.3"
10+
"firebase": "7.11.0"
1111
},
1212
"devDependencies": {
13-
"@babel/core": "7.7.7",
14-
"@babel/preset-env": "7.7.7",
13+
"@babel/core": "7.8.7",
14+
"@babel/preset-env": "7.8.7",
1515
"browserify": "16.5.0",
1616
"chai": "4.2.0",
1717
"karma": "4.4.1",
1818
"karma-babel-preprocessor": "8.0.1",
1919
"karma-chrome-launcher": "3.1.0",
20-
"karma-firefox-launcher": "1.2.0",
20+
"karma-firefox-launcher": "1.3.0",
2121
"karma-mocha": "1.3.0",
2222
"karma-sauce-launcher": "1.2.0",
2323
"karma-spec-reporter": "0.0.32",
24-
"mkdirp": "0.5.1",
25-
"mocha": "7.0.1"
24+
"mkdirp": "0.5.3",
25+
"mocha": "7.1.0"
2626
}
2727
}

‎integration/firebase-typings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"test": "tsc"
77
},
88
"dependencies": {
9-
"firebase": "7.9.3"
9+
"firebase": "7.11.0"
1010
},
1111
"devDependencies": {
1212
"typescript": "3.8.3"

‎integration/firestore/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
"test:debug:memory": "yarn build:deps; yarn build:memory; karma start --single-run"
1414
},
1515
"devDependencies": {
16-
"@types/mocha": "7.0.1",
16+
"@types/mocha": "7.0.2",
1717
"gulp": "4.0.2",
1818
"gulp-filter": "5.1.0",
1919
"gulp-replace": "1.0.0",
2020
"karma": "4.4.1",
2121
"karma-chrome-launcher": "3.1.0",
22-
"karma-firefox-launcher": "1.2.0",
22+
"karma-firefox-launcher": "1.3.0",
2323
"karma-mocha": "1.3.0",
2424
"karma-spec-reporter": "0.0.32",
25-
"mocha": "7.0.1",
25+
"mocha": "7.1.0",
2626
"ts-loader": "6.2.1",
2727
"typescript": "3.8.3",
28-
"webpack": "4.41.5",
28+
"webpack": "4.42.0",
2929
"webpack-stream": "5.2.1"
3030
}
3131
}

‎integration/messaging/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11-
"firebase": "7.9.3"
11+
"firebase": "7.11.0"
1212
},
1313
"devDependencies": {
1414
"chai": "4.2.0",
1515
"chromedriver": "80.0.1",
1616
"express": "4.17.1",
1717
"geckodriver": "1.19.1",
18-
"mocha": "7.0.1",
18+
"mocha": "7.1.0",
1919
"node-fetch": "2.6.0",
2020
"selenium-assistant": "6.0.0"
2121
}

‎integration/typescript/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
"test": "karma start --single-run"
77
},
88
"dependencies": {
9-
"firebase": "7.9.3"
9+
"firebase": "7.11.0"
1010
},
1111
"devDependencies": {
12-
"@babel/core": "7.7.7",
13-
"@babel/preset-env": "7.7.7",
14-
"@types/chai": "4.2.7",
15-
"@types/mocha": "7.0.1",
12+
"@babel/core": "7.8.7",
13+
"@babel/preset-env": "7.8.7",
14+
"@types/chai": "4.2.11",
15+
"@types/mocha": "7.0.2",
1616
"chai": "4.2.0",
1717
"karma": "4.4.1",
1818
"karma-babel-preprocessor": "8.0.1",
1919
"karma-chrome-launcher": "3.1.0",
20-
"karma-firefox-launcher": "1.2.0",
20+
"karma-firefox-launcher": "1.3.0",
2121
"karma-mocha": "1.3.0",
2222
"karma-sauce-launcher": "1.2.0",
2323
"karma-spec-reporter": "0.0.32",
24-
"karma-typescript": "4.1.1",
25-
"mocha": "7.0.1",
24+
"karma-typescript": "5.0.0",
25+
"mocha": "7.1.0",
2626
"npm-run-all": "4.1.5",
2727
"typescript": "3.8.3"
2828
}

‎integration/webpack/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
"test": "karma start --single-run"
88
},
99
"dependencies": {
10-
"firebase": "7.9.3"
10+
"firebase": "7.11.0"
1111
},
1212
"devDependencies": {
13-
"@babel/core": "7.7.7",
14-
"@babel/preset-env": "7.7.7",
13+
"@babel/core": "7.8.7",
14+
"@babel/preset-env": "7.8.7",
1515
"chai": "4.2.0",
1616
"karma": "4.4.1",
1717
"karma-babel-preprocessor": "8.0.1",
1818
"karma-chrome-launcher": "3.1.0",
19-
"karma-firefox-launcher": "1.2.0",
19+
"karma-firefox-launcher": "1.3.0",
2020
"karma-mocha": "1.3.0",
2121
"karma-sauce-launcher": "1.2.0",
2222
"karma-spec-reporter": "0.0.32",
23-
"mocha": "7.0.1",
24-
"webpack": "4.41.5",
25-
"webpack-cli": "3.3.10"
23+
"mocha": "7.1.0",
24+
"webpack": "4.42.0",
25+
"webpack-cli": "3.3.11"
2626
}
2727
}

‎package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@
4848
"integration/*"
4949
],
5050
"devDependencies": {
51-
"@types/chai": "4.2.7",
51+
"@types/chai": "4.2.11",
5252
"@types/chai-as-promised": "7.1.2",
53-
"@types/long": "4.0.0",
54-
"@types/mocha": "7.0.1",
53+
"@types/long": "4.0.1",
54+
"@types/mocha": "7.0.2",
5555
"@types/node": "8.10.59",
56-
"@types/sinon": "7.5.1",
56+
"@types/sinon": "7.5.2",
5757
"@types/sinon-chai": "3.2.3",
58-
"@typescript-eslint/eslint-plugin": "2.15.0",
59-
"@typescript-eslint/eslint-plugin-tslint": "2.15.0",
60-
"@typescript-eslint/parser": "2.15.0",
58+
"@typescript-eslint/eslint-plugin": "2.24.0",
59+
"@typescript-eslint/eslint-plugin-tslint": "2.24.0",
60+
"@typescript-eslint/parser": "2.24.0",
6161
"babel-loader": "8.0.6",
6262
"chai": "4.2.0",
6363
"chai-as-promised": "7.1.1",
@@ -66,40 +66,40 @@
6666
"clone": "2.1.2",
6767
"coveralls": "3.0.9",
6868
"del": "5.1.0",
69-
"dependency-graph": "0.8.1",
69+
"dependency-graph": "0.9.0",
7070
"eslint": "6.8.0",
71-
"eslint-plugin-import": "2.19.1",
71+
"eslint-plugin-import": "2.20.1",
7272
"express": "4.17.1",
7373
"find-free-port": "2.0.0",
7474
"firebase-functions": "3.3.0",
75-
"firebase-tools": "7.11.0",
75+
"firebase-tools": "7.15.1",
7676
"git-rev-sync": "2.0.0",
7777
"glob": "7.1.6",
78-
"http-server": "0.12.0",
79-
"husky": "4.2.1",
78+
"http-server": "0.12.1",
79+
"husky": "4.2.3",
8080
"indexeddbshim": "5.0.0",
81-
"inquirer": "7.0.2",
81+
"inquirer": "7.1.0",
8282
"istanbul-instrumenter-loader": "3.0.1",
8383
"js-yaml": "3.13.1",
8484
"karma": "4.4.1",
8585
"karma-chrome-launcher": "3.1.0",
8686
"karma-cli": "2.0.0",
8787
"karma-coverage-istanbul-reporter": "2.1.1",
88-
"karma-firefox-launcher": "1.2.0",
88+
"karma-firefox-launcher": "1.3.0",
8989
"karma-mocha": "1.3.0",
9090
"karma-safari-launcher": "1.0.0",
9191
"karma-sauce-launcher": "1.2.0",
9292
"karma-sourcemap-loader": "0.3.7",
9393
"karma-spec-reporter": "0.0.32",
94-
"karma-summary-reporter": "1.7.1",
94+
"karma-summary-reporter": "1.7.2",
9595
"karma-webpack": "4.0.2",
9696
"lcov-result-merger": "3.1.0",
9797
"lerna": "3.20.2",
9898
"listr": "0.14.3",
9999
"long": "3.2.0",
100100
"merge2": "1.3.0",
101-
"mkdirp": "0.5.1",
102-
"mocha": "7.0.1",
101+
"mkdirp": "0.5.3",
102+
"mocha": "7.1.0",
103103
"mz": "2.7.0",
104104
"npm-run-all": "4.1.5",
105105
"npm-run-path": "4.0.1",
@@ -108,19 +108,19 @@
108108
"prettier": "1.19.1",
109109
"protractor": "5.4.2",
110110
"rxjs": "6.5.4",
111-
"semver": "7.1.1",
112-
"simple-git": "1.129.0",
113-
"sinon": "9.0.0",
114-
"sinon-chai": "3.4.0",
111+
"semver": "7.1.3",
112+
"simple-git": "1.132.0",
113+
"sinon": "9.0.1",
114+
"sinon-chai": "3.5.0",
115115
"source-map-loader": "0.2.4",
116116
"ts-loader": "6.2.1",
117-
"ts-node": "8.5.4",
118-
"tslint": "5.20.1",
119-
"typedoc": "0.15.6",
117+
"ts-node": "8.6.2",
118+
"tslint": "6.1.0",
119+
"typedoc": "0.17.0",
120120
"typescript": "3.8.3",
121121
"watch": "1.0.2",
122-
"webpack": "4.41.5",
123-
"yargs": "15.1.0",
122+
"webpack": "4.42.0",
123+
"yargs": "15.3.1",
124124
"lodash": "4.17.15"
125125
}
126126
}

‎packages/analytics-interop-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics-interop-types",
3-
"version": "0.1.3",
3+
"version": "0.1.4",
44
"description": "@firebase/analytics Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

‎packages/analytics-types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics-types",
3-
"version": "0.2.7",
3+
"version": "0.2.8",
44
"description": "@firebase/analytics Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",

‎packages/analytics/package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics",
3-
"version": "0.2.15",
3+
"version": "0.2.17",
44
"description": "A analytics package for new firebase packages",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -24,19 +24,20 @@
2424
"@firebase/app-types": "0.x"
2525
},
2626
"dependencies": {
27-
"@firebase/analytics-types": "0.2.7",
28-
"@firebase/installations": "0.4.4",
29-
"@firebase/util": "0.2.41",
30-
"@firebase/component": "0.1.6",
31-
"tslib": "1.10.0"
27+
"@firebase/analytics-types": "0.2.8",
28+
"@firebase/installations": "0.4.5",
29+
"@firebase/logger": "0.1.37",
30+
"@firebase/util": "0.2.42",
31+
"@firebase/component": "0.1.7",
32+
"tslib": "1.11.1"
3233
},
3334
"license": "Apache-2.0",
3435
"devDependencies": {
35-
"rollup": "1.28.0",
36+
"rollup": "2.0.6",
3637
"rollup-plugin-commonjs": "10.1.0",
3738
"rollup-plugin-json": "4.0.0",
3839
"rollup-plugin-node-resolve": "5.2.0",
39-
"rollup-plugin-typescript2": "0.25.3",
40+
"rollup-plugin-typescript2": "0.26.0",
4041
"rollup-plugin-uglify": "6.0.4",
4142
"typescript": "3.8.3"
4243
},

‎packages/analytics/src/helpers.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
GTAG_URL
3232
} from './constants';
3333
import { FirebaseInstallations } from '@firebase/installations-types';
34+
import { logger } from './logger';
3435

3536
/**
3637
* Initialize the analytics instance in gtag.js by calling config command with fid.
@@ -146,7 +147,7 @@ function wrapGtag(
146147
gtagParams || {}
147148
)
148149
)
149-
.catch(e => console.error(e));
150+
.catch(e => logger.error(e));
150151
} else if (command === GtagCommand.CONFIG) {
151152
const initializationPromiseToWait =
152153
initializedIdPromisesMap[idOrNameOrParams as string] ||
@@ -155,7 +156,7 @@ function wrapGtag(
155156
.then(() => {
156157
gtagCore(GtagCommand.CONFIG, idOrNameOrParams as string, gtagParams);
157158
})
158-
.catch(e => console.error(e));
159+
.catch(e => logger.error(e));
159160
} else {
160161
// SET command.
161162
// Splitting calls for CONFIG and SET to make it clear which signature

‎packages/analytics/src/logger.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* @license
3+
* Copyright 2019 Google Inc.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
import { Logger } from '@firebase/logger';
19+
20+
export const logger = new Logger('@firebase/analytics');

0 commit comments

Comments
 (0)