Skip to content

Commit e841136

Browse files
maneeshtmaneesht
committed
Merge remote-tracking branch 'origin/master' into mtewani/fix-offline-get
2 parents 2d55342 + efe2000 commit e841136

File tree

160 files changed

+2458
-596
lines changed

Some content is hidden

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

160 files changed

+2458
-596
lines changed

‎.changeset/eighty-beds-rule.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.changeset/green-turtles-camp.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/nervous-starfishes-crash.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/rules-unit-testing': patch
3+
---
4+
5+
Add Node ESM build to rules-unit-testing.

‎.changeset/old-lamps-nail.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.changeset/rotten-tables-brush.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@firebase/database": patch
3+
---
4+
5+
Fixed issue where `get()` saved results incorrectly for non-default queries.

‎.changeset/sharp-rules-enjoy.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/analytics': patch
3+
---
4+
5+
Fix typo in GtagConfigParams

‎.changeset/sour-hornets-care.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/tame-rice-peel.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@firebase/app-check": patch
3+
"@firebase/database": patch
4+
"@firebase/util": patch
5+
---
6+
7+
Extract uuid function into @firebase/util

‎.github/workflows/e2e-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
env:
6262
WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
6363
RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}
64+
VERSION_OR_TAG: ${{ github.event.client_payload.versionOrTag }}
6465
# run in root
6566
working-directory: '.'
6667
- name: Tests failed
@@ -69,5 +70,6 @@ jobs:
6970
env:
7071
WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
7172
RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}
73+
VERSION_OR_TAG: ${{ github.event.client_payload.versionOrTag }}
7274
# run in root
7375
working-directory: '.'

‎.github/workflows/release-log.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
branches:
66
- release
7-
- v8-releasebranch
7+
- '*-releasebranch'
88

99
jobs:
1010
release:

‎.github/workflows/release-pr.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Create Release PR
2+
3+
on:
4+
push:
5+
branches:
6+
- release
7+
- '*-releasebranch'
8+
9+
jobs:
10+
release:
11+
name: Create Release PR
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout Repo
15+
uses: actions/checkout@master
16+
with:
17+
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
18+
fetch-depth: 0
19+
20+
- name: Setup Node.js 14.x
21+
uses: actions/setup-node@master
22+
with:
23+
node-version: 14.x
24+
25+
- name: Install Dependencies
26+
run: yarn
27+
28+
# Ensures a new @firebase/app is published with every release.
29+
# This keeps the SDK_VERSION variable up to date.
30+
- name: Add a changeset for @firebase/app
31+
# pull master so changeset can diff against it
32+
run: |
33+
git pull -f --no-rebase origin master:master
34+
yarn ts-node-script scripts/ci/add_changeset.ts
35+
36+
- name: Create Release Pull Request
37+
uses: changesets/action@v1
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}

‎.github/workflows/release-staging.yml

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
name: Staging Release
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
release-branch:
7+
description: 'Release branch'
8+
type: string
9+
default: 'release'
10+
required: true
11+
source-branch:
12+
description: 'Branch to release from'
13+
type: choice
14+
default: 'master'
15+
required: true
16+
options:
17+
- master
18+
- v8
419

520
jobs:
6-
warn:
7-
name: Warn If Wrong Branch
8-
runs-on: ubuntu-latest
9-
# Log a warning if run in a non-release branch.
10-
if: github.ref != 'refs/heads/release' && !endsWith(github.ref, '-releasebranch')
11-
steps:
12-
- name: Log warning
13-
run: echo "This workflow must be run in a release branch. It is being run in ${{ github.ref }}."
1421
deploy:
1522
name: Staging Release
1623
runs-on: ubuntu-latest
17-
# Block this workflow if run in a non-release branch.
18-
if: github.ref == 'refs/heads/release' || endsWith(github.ref, '-releasebranch')
19-
# Allow GITHUB_TOKEN to have write permissions
20-
permissions:
21-
contents: write
22-
24+
# Block this workflow if run on a non-release branch.
25+
if: github.event.inputs.release-branch == 'release' || endsWith(github.event.inputs.release-branch, '-releasebranch')
2326
steps:
2427
- name: Set up Node (14)
2528
uses: actions/setup-node@v2
@@ -28,37 +31,23 @@ jobs:
2831
- name: Merge master into release
2932
uses: actions/github-script@v6
3033
with:
31-
github-token: ${{ secrets.GITHUB_TOKEN }}
34+
github-token: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
3235
script: |
33-
await github.rest.repos.merge({
36+
const result = await github.rest.repos.merge({
3437
owner: context.repo.owner,
3538
repo: context.repo.repo,
36-
base: 'release',
37-
head: 'master'
39+
base: '${{ github.event.inputs.release-branch }}',
40+
head: '${{ github.event.inputs.source-branch }}'
3841
})
39-
- name: Checkout release branch (with history)
42+
console.log(result)
43+
- name: Checkout current branch (with history)
4044
uses: actions/checkout@master
4145
with:
4246
# Release script requires git history and tags.
4347
fetch-depth: 0
44-
ref: release
48+
ref: ${{ github.event.inputs.release-branch }}
4549
- name: Yarn install
4650
run: yarn
47-
# Ensures a new @firebase/app is published with every release.
48-
# This keeps the SDK_VERSION variable up to date.
49-
- name: Add a changeset for @firebase/app
50-
# pull master so changeset can diff against it
51-
run: |
52-
git pull -f --no-rebase origin master:master
53-
yarn ts-node-script scripts/ci/add_changeset.ts
54-
- name: Create Release Pull Request
55-
uses: changesets/action@v1
56-
env:
57-
GITHUB_TOKEN: ${{ secrets.OSS_BOT_GITHUB_TOKEN }}
58-
- name: Go back to release branch
59-
# changesets/action created and checked out a new branch
60-
# return to `release` branch.
61-
run: git checkout release
6251
- name: Publish to NPM
6352
# --skipTests No need to run tests
6453
# --skipReinstall Yarn install has already been run

‎.vscode/launch.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
"type": "node",
99
"request": "launch",
1010
"name": "RTDB Unit Tests (Node)",
11-
"program": "${workspaceRoot}/packages/firebase/node_modules/.bin/_mocha",
11+
"program": "${workspaceRoot}/node_modules/.bin/_mocha",
1212
"cwd": "${workspaceRoot}/packages/database",
1313
"args": [
1414
"test/{,!(browser)/**/}*.test.ts",
15-
"--file", "index.node.ts",
16-
"--config", "../../config/mocharc.node.js"
15+
"--file", "src/index.node.ts",
16+
"--config", "../../config/mocharc.node.js",
1717
],
1818
"env": {
19+
"TS_NODE_FILES":true,
1920
"TS_NODE_CACHE": "NO",
2021
"TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}"
2122
},
@@ -30,7 +31,7 @@
3031
"cwd": "${workspaceRoot}/packages/firestore",
3132
"args": [
3233
"--require", "babel-register.js",
33-
"--require", "index.node.ts",
34+
"--require", "src/index.node.ts",
3435
"--timeout", "5000",
3536
"test/{,!(browser|integration)/**/}*.test.ts",
3637
"--exit"

‎common/api-review/analytics.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ export function getAnalytics(app?: FirebaseApp): Analytics;
121121

122122
// @public
123123
export interface GtagConfigParams {
124-
'allow_google_signals?': boolean;
125124
// (undocumented)
126125
[key: string]: unknown;
127126
'allow_ad_personalization_signals'?: boolean;
127+
'allow_google_signals'?: boolean;
128128
'cookie_domain'?: string;
129129
'cookie_expires'?: number;
130130
'cookie_flags'?: string;

‎common/api-review/util.api.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,9 @@ export function timeoutResolve<T>(promise: Promise<T>, timeInMS?: number): Promi
427427
// @public (undocumented)
428428
export type Unsubscribe = () => void;
429429

430+
// @public
431+
export const uuidv4: () => string;
432+
430433
// Warning: (ae-missing-release-tag) "validateArgCount" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
431434
//
432435
// @public

‎integration/compat-interop/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
"test:debug": "karma start --browsers Chrome --auto-watch"
99
},
1010
"dependencies": {
11-
"@firebase/app": "0.7.25",
12-
"@firebase/app-compat": "0.1.26",
13-
"@firebase/analytics": "0.7.9",
14-
"@firebase/analytics-compat": "0.1.10",
15-
"@firebase/auth": "0.20.2",
16-
"@firebase/auth-compat": "0.2.15",
17-
"@firebase/functions": "0.8.1",
18-
"@firebase/functions-compat": "0.2.1",
19-
"@firebase/messaging": "0.9.13",
20-
"@firebase/messaging-compat": "0.1.13",
21-
"@firebase/performance": "0.5.9",
22-
"@firebase/performance-compat": "0.1.9",
23-
"@firebase/remote-config": "0.3.8",
24-
"@firebase/remote-config-compat": "0.1.9"
11+
"@firebase/app": "0.7.26",
12+
"@firebase/app-compat": "0.1.27",
13+
"@firebase/analytics": "0.7.10",
14+
"@firebase/analytics-compat": "0.1.11",
15+
"@firebase/auth": "0.20.3",
16+
"@firebase/auth-compat": "0.2.16",
17+
"@firebase/functions": "0.8.2",
18+
"@firebase/functions-compat": "0.2.2",
19+
"@firebase/messaging": "0.9.14",
20+
"@firebase/messaging-compat": "0.1.14",
21+
"@firebase/performance": "0.5.10",
22+
"@firebase/performance-compat": "0.1.10",
23+
"@firebase/remote-config": "0.3.9",
24+
"@firebase/remote-config-compat": "0.1.10"
2525
},
2626
"devDependencies": {
2727
"typescript": "4.2.2"

‎integration/firebase/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 -s test"
88
},
99
"devDependencies": {
10-
"firebase": "9.8.2",
10+
"firebase": "9.8.3",
1111
"@types/chai": "4.3.1",
1212
"@types/mocha": "9.1.1",
1313
"chai": "4.3.6",

‎integration/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
1616
},
1717
"dependencies": {
18-
"@firebase/app": "0.7.25",
19-
"@firebase/firestore": "3.4.9"
18+
"@firebase/app": "0.7.26",
19+
"@firebase/firestore": "3.4.10"
2020
},
2121
"devDependencies": {
2222
"@types/mocha": "9.1.1",

‎integration/messaging/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test:manual": "mocha --exit"
1010
},
1111
"devDependencies": {
12-
"firebase": "9.8.2",
12+
"firebase": "9.8.3",
1313
"chai": "4.3.6",
1414
"chromedriver": "98.0.1",
1515
"express": "4.18.1",

‎packages/analytics-compat/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# @firebase/analytics-compat
22

3+
## 0.1.11
4+
5+
### Patch Changes
6+
7+
- [`2cd1cc76f`](https://github.com/firebase/firebase-js-sdk/commit/2cd1cc76f2a308135cd60f424fe09084a34b5cb5) [#6307](https://github.com/firebase/firebase-js-sdk/pull/6307) (fixes [#6300](https://github.com/firebase/firebase-js-sdk/issues/6300)) - fix: add type declarations to exports field
8+
9+
- Updated dependencies [[`2cd1cc76f`](https://github.com/firebase/firebase-js-sdk/commit/2cd1cc76f2a308135cd60f424fe09084a34b5cb5)]:
10+
- @firebase/analytics@0.7.10
11+
- @firebase/component@0.5.15
12+
- @firebase/util@1.6.1
13+
314
## 0.1.10
415

516
### Patch Changes

‎packages/analytics-compat/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/analytics-compat",
3-
"version": "0.1.10",
3+
"version": "0.1.11",
44
"description": "",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"main": "dist/index.cjs.js",
@@ -24,7 +24,7 @@
2424
"@firebase/app-compat": "0.x"
2525
},
2626
"devDependencies": {
27-
"@firebase/app-compat": "0.1.26",
27+
"@firebase/app-compat": "0.1.27",
2828
"rollup": "2.72.1",
2929
"@rollup/plugin-json": "4.1.0",
3030
"rollup-plugin-typescript2": "0.31.2",
@@ -53,10 +53,10 @@
5353
},
5454
"typings": "dist/src/index.d.ts",
5555
"dependencies": {
56-
"@firebase/component": "0.5.14",
57-
"@firebase/analytics": "0.7.9",
56+
"@firebase/component": "0.5.15",
57+
"@firebase/analytics": "0.7.10",
5858
"@firebase/analytics-types": "0.7.0",
59-
"@firebase/util": "1.6.0",
59+
"@firebase/util": "1.6.1",
6060
"tslib": "^2.1.0"
6161
},
6262
"nyc": {

0 commit comments

Comments
 (0)