Skip to content

Commit 871d955

Browse files
schmidt-sebastianschmidt-sebastian
committed
Merge
2 parents b7516be + 7de1a7c commit 871d955

File tree

598 files changed

+3537
-1598
lines changed

Some content is hidden

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

598 files changed

+3537
-1598
lines changed

‎integration/browserify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
1010
"dependencies": {
11-
"firebase": "7.14.3"
11+
"firebase": "7.14.5"
1212
},
1313
"devDependencies": {
1414
"@babel/core": "7.9.6",

‎integration/firebase-typings/index.submodules.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎integration/firebase-typings/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎integration/firebase-typings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js"
88
},
99
"dependencies": {
10-
"firebase": "7.14.3"
10+
"firebase": "7.14.5"
1111
},
1212
"devDependencies": {
1313
"typescript": "3.8.3"

‎integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:manual": "mocha --exit"
99
},
1010
"dependencies": {
11-
"firebase": "7.14.3"
11+
"firebase": "7.14.5"
1212
},
1313
"devDependencies": {
1414
"chai": "4.2.0",

‎integration/typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js"
88
},
99
"dependencies": {
10-
"firebase": "7.14.3"
10+
"firebase": "7.14.5"
1111
},
1212
"devDependencies": {
1313
"@babel/core": "7.9.6",

‎integration/typescript/test/namespace.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎integration/typescript/test/typings.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎integration/webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:ci": "node ../../scripts/run_tests_in_ci.js"
99
},
1010
"dependencies": {
11-
"firebase": "7.14.3"
11+
"firebase": "7.14.5"
1212
},
1313
"devDependencies": {
1414
"@babel/core": "7.9.6",

‎package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@
2222
],
2323
"scripts": {
2424
"dev": "lerna run --parallel --scope @firebase/* --scope firebase --scope rxfire dev",
25-
"build": "lerna run --scope @firebase/* --scope firebase --scope rxfire prepare",
25+
"build": "lerna run --scope @firebase/* --scope firebase --scope rxfire build",
2626
"build:exp": "lerna run --scope @firebase/*-exp --scope firebase-exp build",
27+
"build:release": "lerna run --scope @firebase/* --scope firebase --ignore @firebase/*-exp --ignore firebase-exp prepare",
28+
"build:exp:release": "lerna run --scope @firebase/*-exp --scope firebase-exp prepare && yarn --cwd packages-exp/app-exp typings:public",
2729
"link:packages": "lerna exec --scope @firebase/* --scope firebase --scope rxfire -- yarn link",
2830
"stage:packages": "./scripts/prepublish.sh",
2931
"repl": "node tools/repl.js",
@@ -58,13 +60,17 @@
5860
"integration/*"
5961
],
6062
"devDependencies": {
63+
"@microsoft/api-documenter": "7.7.20",
64+
"@microsoft/api-extractor": "7.7.13",
6165
"@types/chai": "4.2.11",
6266
"@types/chai-as-promised": "7.1.2",
6367
"@types/long": "4.0.1",
6468
"@types/mocha": "7.0.2",
6569
"@types/node": "12.12.37",
6670
"@types/sinon": "9.0.0",
6771
"@types/sinon-chai": "3.2.4",
72+
"@types/tmp": "0.2.0",
73+
"@types/yargs": "15.0.4",
6874
"@typescript-eslint/eslint-plugin": "2.30.0",
6975
"@typescript-eslint/eslint-plugin-tslint": "2.30.0",
7076
"@typescript-eslint/parser": "2.30.0",
@@ -132,9 +138,7 @@
132138
"typescript": "3.8.3",
133139
"watch": "1.0.2",
134140
"webpack": "4.43.0",
135-
"yargs": "15.3.1",
136-
"@microsoft/api-extractor": "7.7.13",
137-
"@microsoft/api-documenter": "7.7.20"
141+
"yargs": "15.3.1"
138142
},
139143
"husky": {
140144
"hooks": {

‎packages-exp/app-exp/package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,27 @@
1515
"lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
1616
"lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
1717
"build": "rollup -c && yarn api-report",
18-
"build:release": "rollup -c rollup.config.release.js && node ./use_public_typings.js",
18+
"build:release": "rollup -c rollup.config.release.js && yarn api-report && yarn typings:public",
1919
"build:deps": "lerna run --scope @firebase/app-exp --include-dependencies build",
2020
"dev": "rollup -c -w",
2121
"test": "yarn type-check && run-p lint test:browser test:node",
2222
"test:ci": "node ../../scripts/run_tests_in_ci.js",
2323
"test:browser": "karma start --single-run",
2424
"test:node": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha src/**/*.test.ts --config ../../config/mocharc.node.js",
2525
"type-check": "tsc -p . --noEmit",
26-
"prepare": "yarn build:release",
26+
"prepare": "rollup -c rollup.config.release.js",
2727
"api-report": "api-extractor run --local --verbose",
2828
"predoc": "node ../../scripts/exp/remove-exp.js temp",
2929
"doc": "api-documenter markdown --input temp --output docs",
30-
"build:doc": "yarn build && yarn doc"
30+
"build:doc": "yarn build && yarn doc",
31+
"typings:public": "node ./use_public_typings.js --public",
32+
"typings:internal": "node ./use_public_typings.js"
3133
},
3234
"dependencies": {
3335
"@firebase/app-types-exp": "0.0.800",
34-
"@firebase/util": "0.2.46",
35-
"@firebase/logger": "0.2.3",
36-
"@firebase/component": "0.1.11",
36+
"@firebase/util": "0.2.47",
37+
"@firebase/logger": "0.2.4",
38+
"@firebase/component": "0.1.12",
3739
"tslib": "1.11.1"
3840
},
3941
"license": "Apache-2.0",
@@ -52,7 +54,7 @@
5254
"bugs": {
5355
"url": "https://github.com/firebase/firebase-js-sdk/issues"
5456
},
55-
"typings": "./dist/app-exp-public.d.ts",
57+
"typings": "./dist/app-exp.d.ts",
5658
"nyc": {
5759
"extension": [
5860
".ts"

‎packages-exp/app-exp/use_typings.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/* eslint-disable @typescript-eslint/no-require-imports */
2+
/**
3+
* @license
4+
* Copyright 2020 Google LLC
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
const { writeFileSync } = require('fs');
20+
const { argv } = require('yargs');
21+
22+
const path = require('path');
23+
const packageJsonPath = path.resolve(__dirname, './package.json');
24+
25+
// point typings field to the public d.ts file in package.json
26+
const TYPINGS_PATH = argv.public
27+
? './dist/app-exp-public.d.ts'
28+
: './dist/app-exp.d.ts';
29+
console.log(
30+
`Updating the packages-exp/app-exp typings field to the ${
31+
argv.public ? 'public' : 'internal'
32+
} d.ts file ${TYPINGS_PATH}`
33+
);
34+
const packageJson = require(packageJsonPath);
35+
packageJson.typings = TYPINGS_PATH;
36+
37+
writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`, {
38+
encoding: 'utf-8'
39+
});

‎packages-exp/app-types-exp/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"license": "Apache-2.0",
88
"scripts": {
99
"test": "tsc",
10+
"test:ci": "node ../../scripts/run_tests_in_ci.js",
1011
"api-report": "api-extractor run --local --verbose",
1112
"predoc": "node ../../scripts/exp/remove-exp.js temp",
1213
"doc": "api-documenter markdown --input temp --output docs",

‎packages-exp/firebase-exp/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
"build": "rollup -c && gulp firebase-js",
3131
"build:release": "rollup -c rollup.config.release.js && gulp firebase-js",
3232
"dev": "rollup -c -w",
33-
"prepare": "yarn build:release"
33+
"prepare": "yarn build:release",
34+
"test": "echo 'No test suite for firebase wrapper'",
35+
"test:ci": "echo 'No test suite for firebase wrapper'"
3436
},
3537
"dependencies": {
3638
"@firebase/app-exp": "0.0.800"

‎packages/analytics-interop-types/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "@firebase/analytics-interop-types",
3-
"version": "0.1.4",
3+
"version": "0.1.5",
44
"description": "@firebase/analytics Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
77
"scripts": {
8-
"test": "tsc"
8+
"test": "tsc",
9+
"test:ci": "node ../../scripts/run_tests_in_ci.js"
910
},
1011
"files": [
1112
"index.d.ts"

‎packages/analytics-types/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "@firebase/analytics-types",
3-
"version": "0.3.0",
3+
"version": "0.3.1",
44
"description": "@firebase/analytics Types",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
77
"scripts": {
8-
"test": "tsc"
8+
"test": "tsc",
9+
"test:ci": "node ../../scripts/run_tests_in_ci.js"
910
},
1011
"files": [
1112
"index.d.ts"

‎packages/analytics/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics",
3-
"version": "0.3.4",
3+
"version": "0.3.5",
44
"description": "A analytics package for new firebase packages",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -26,11 +26,11 @@
2626
"@firebase/app-types": "0.x"
2727
},
2828
"dependencies": {
29-
"@firebase/analytics-types": "0.3.0",
30-
"@firebase/installations": "0.4.9",
31-
"@firebase/logger": "0.2.3",
32-
"@firebase/util": "0.2.46",
33-
"@firebase/component": "0.1.11",
29+
"@firebase/analytics-types": "0.3.1",
30+
"@firebase/installations": "0.4.10",
31+
"@firebase/logger": "0.2.4",
32+
"@firebase/util": "0.2.47",
33+
"@firebase/component": "0.1.12",
3434
"tslib": "1.11.1"
3535
},
3636
"license": "Apache-2.0",

‎packages/analytics/src/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/src/errors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/src/factory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/src/functions.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/src/functions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/src/helpers.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/src/helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/src/logger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/testing/get-fake-firebase-services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/testing/gtag-script-util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/analytics/testing/setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2019 Google Inc.
3+
* Copyright 2019 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎packages/app-types/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @license
3-
* Copyright 2017 Google Inc.
3+
* Copyright 2017 Google LLC
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)