Skip to content

Commit 38aec87

Browse files
committed
Merge branch 'main' into dl/abort-signal
2 parents b79c64a + f5fc6bf commit 38aec87

File tree

55 files changed

+171
-167
lines changed

Some content is hidden

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

55 files changed

+171
-167
lines changed

.changeset/metal-ties-cry.md

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

.changeset/spotty-shirts-design.md

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

.changeset/thin-sheep-smoke.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/firestore': patch
3+
---
4+
5+
Fix: Corrected misleading error message when doc() is called with undefined.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ Before you file this pull request, please read these guidelines:
1414

1515
### API Changes
1616

17-
* At this time we cannot accept changes that affect the public API. If you'd like to help
18-
us make Firebase APIs better, please propose your change in an issue so that we
19-
can discuss it together.
17+
* Changes that affect the public API will require internal review. Before making a
18+
PR that changes the public API, we would suggest first proposing your change in an
19+
issue so that we can discuss it together.

.github/workflows/e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
pushd functions
6969
npm install
7070
popd
71-
npx firebase-tools@13.0.2 deploy --only functions:callTest --project jscore-sandbox-141b5 --token $FIREBASE_CLI_TOKEN
71+
npx firebase-tools@14.24.2 deploy --only functions:callTest --project jscore-sandbox-141b5 --token $FIREBASE_CLI_TOKEN
7272
working-directory: ./config
7373
env:
7474
FIREBASE_CLI_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}

.vscode/launch.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
"src/index.node.ts",
3838
"--timeout",
3939
"5000",
40-
"integration/**/*.test.ts"
40+
"integration/**/*.test.ts",
41+
"--grep", "${input:grepString}",
4142
],
4243
"env": {
4344
"TS_NODE_COMPILER_OPTIONS": "{\"module\":\"commonjs\"}"
@@ -184,5 +185,13 @@
184185
"cwd": "${workspaceRoot}/packages/firestore",
185186
"args": ["start", "--auto-watch", "--integration", "--browsers", "Chrome"]
186187
}
188+
],
189+
"inputs": [
190+
{
191+
"id": "grepString",
192+
"type": "promptString",
193+
"description": "Enter grep pattern (e.g., 'Google AI gemini-2.0-flash generateContent')",
194+
"default": ""
195+
}
187196
]
188197
}

config/firebase.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
"indexes": "firestore.indexes.json"
88
},
99
"functions": {
10-
"runtime": "nodejs18"
10+
"runtime": "nodejs20"
1111
}
1212
}

config/functions/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
const assert = require('assert');
1919
const cors = require('cors')({ origin: true });
20-
const functions = require('firebase-functions');
20+
const functions = require('firebase-functions/v1');
2121

2222
/*
2323
* These backend test helpers are copied from the iOS and Android SDKs, but are

config/functions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dependencies": {
55
"cors": "2.8.5",
66
"firebase-admin": "11.11.1",
7-
"firebase-functions": "3.24.1"
7+
"firebase-functions": "^7.0.0"
88
},
99
"private": true,
1010
"engines": {

integration/compat-interop/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"test:debug": "karma start --browsers Chrome --auto-watch"
99
},
1010
"dependencies": {
11-
"@firebase/app": "0.14.5",
12-
"@firebase/app-compat": "0.5.5",
11+
"@firebase/app": "0.14.6",
12+
"@firebase/app-compat": "0.5.6",
1313
"@firebase/analytics": "0.10.19",
1414
"@firebase/analytics-compat": "0.2.25",
1515
"@firebase/auth": "1.11.1",

0 commit comments

Comments
 (0)