Skip to content

Commit fca4117

Browse files
dlarocquedlarocque
authored
Merge branch 'main' into dl/fst-contrib-docs
2 parents 83a5142 + e24b336 commit fca4117

11 files changed

Lines changed: 36 additions & 157 deletions

File tree

‎.changeset/silent-trains-bake.md‎

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

‎.changeset/silly-hounds-lay.md‎

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

‎.github/workflows/test-changed-firestore.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
name: Test Firestore
108108
strategy:
109109
matrix:
110-
test-name: ["test:browser", "test:travis", "test:lite:browser", "test:browser:prod:nameddb", "test:lite:browser:nameddb"]
110+
test-name: ["test:browser", "test:travis", "test:lite:browser", "test:browser:prod:enterprise", "test:lite:browser:enterprise"]
111111
runs-on: ubuntu-latest
112112
needs: build
113113
if: ${{ needs.build.outputs.changed == 'true'}}
@@ -196,7 +196,7 @@ jobs:
196196
name: Test Firestore on Firefox
197197
strategy:
198198
matrix:
199-
test-name: ["test:browser", "test:travis", "test:lite:browser", "test:browser:prod:nameddb", "test:lite:browser:nameddb"]
199+
test-name: ["test:browser", "test:travis", "test:lite:browser", "test:browser:prod:enterprise", "test:lite:browser:enterprise"]
200200
runs-on: ubuntu-latest
201201
needs: build
202202
if: ${{ needs.build.outputs.changed == 'true'}}
@@ -253,7 +253,7 @@ jobs:
253253
# TODO (dlarocque): Add test:travis once the browser tests are isolated
254254
# Exclude test:travis for now, since it includes node tests, which are failing for
255255
# some reason.
256-
test-name: ["test:browser", "test:lite:browser", "test:browser:prod:nameddb", "test:lite:browser:nameddb"]
256+
test-name: ["test:browser", "test:lite:browser", "test:browser:prod:enterprise", "test:lite:browser:enterprise"]
257257
runs-on: macos-latest
258258
needs: build
259259
if: ${{ needs.build.outputs.changed == 'true'}}

‎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": "12.12.0",
12+
"firebase": "12.12.1",
1313
"chai": "4.5.0",
1414
"chromedriver": "119.0.1",
1515
"express": "4.21.2",

‎packages/ai/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# @firebase/ai
22

3+
## 2.11.1
4+
5+
### Patch Changes
6+
7+
- [`23ab5b9`](https://github.com/firebase/firebase-js-sdk/commit/23ab5b9dadb0451e855740a48f4cb12d29091a70) [#9817](https://github.com/firebase/firebase-js-sdk/pull/9817) - Update code execution and URL context features to reflect that they are generally available and no longer public preview.
8+
9+
- [`6db5af4`](https://github.com/firebase/firebase-js-sdk/commit/6db5af46649382ee3ed73ab4e8f69abc5f9a33aa) [#9840](https://github.com/firebase/firebase-js-sdk/pull/9840) (fixes [#9832](https://github.com/firebase/firebase-js-sdk/issues/9832)) - Fix `TemplateChatSession` type so it does not error on TypeScript build. See Github issue #9832.
10+
311
## 2.11.0
412

513
### Minor Changes

‎packages/ai/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@firebase/ai",
3-
"version": "2.11.0",
3+
"version": "2.11.1",
44
"description": "The Firebase AI SDK",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"engines": {

‎packages/firebase/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# firebase
22

3+
## 12.12.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`23ab5b9`](https://github.com/firebase/firebase-js-sdk/commit/23ab5b9dadb0451e855740a48f4cb12d29091a70), [`6db5af4`](https://github.com/firebase/firebase-js-sdk/commit/6db5af46649382ee3ed73ab4e8f69abc5f9a33aa)]:
8+
- @firebase/ai@2.11.1
9+
310
## 12.12.0
411

512
### Minor Changes

‎packages/firebase/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firebase",
3-
"version": "12.12.0",
3+
"version": "12.12.1",
44
"description": "Firebase JavaScript library for web and Node.js",
55
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
66
"license": "Apache-2.0",
@@ -423,7 +423,7 @@
423423
"trusted-type-check": "tsec -p tsconfig.json --noEmit"
424424
},
425425
"dependencies": {
426-
"@firebase/ai": "2.11.0",
426+
"@firebase/ai": "2.11.1",
427427
"@firebase/app": "0.14.11",
428428
"@firebase/app-compat": "0.5.11",
429429
"@firebase/app-types": "0.9.4",

‎packages/firestore/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@
2424
"prettier": "prettier --write '*.js' '@(lite|src|test|scripts)/**/*.ts' 'test/unit/remote/bloom_filter_golden_test_data/*.json'",
2525
"test:lite": "ts-node ./scripts/run-tests.ts --emulator --platform node_lite --main=lite/index.ts 'test/lite/**/*.test.ts'",
2626
"test:lite:prod": "ts-node ./scripts/run-tests.ts --platform node_lite --main=lite/index.ts 'test/lite/**/*.test.ts'",
27-
"test:lite:prod:nameddb": "ts-node ./scripts/run-tests.ts --platform node_lite --databaseId=enterprise --main=lite/index.ts --firestoreEdition=enterprise 'test/lite/**/*.test.ts'",
27+
"test:lite:prod:enterprise": "ts-node ./scripts/run-tests.ts --platform node_lite --databaseId=enterprise --main=lite/index.ts --firestoreEdition=enterprise 'test/lite/**/*.test.ts'",
2828
"test:lite:browser": "karma start --lite",
29-
"test:lite:browser:nameddb": "karma start --lite --databaseId=enterprise --firestoreEdition=enterprise",
29+
"test:lite:browser:enterprise": "karma start --lite --databaseId=enterprise --firestoreEdition=enterprise",
3030
"test:lite:browser:debug": "karma start --browsers=Chrome --lite --auto-watch",
3131
"test": "run-s --npm-path npm lint assertion-id:check test:all",
3232
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test:all:ci",
33-
"test:all:ci": "run-s --npm-path npm test:browser test:travis test:lite:browser test:browser:prod:nameddb test:lite:browser:nameddb",
34-
"test:all": "run-p --npm-path npm test:browser test:lite:browser test:travis test:minified test:browser:prod:nameddb test:lite:browser:nameddb",
33+
"test:all:ci": "run-s --npm-path npm test:browser test:travis test:lite:browser test:browser:prod:enterprise test:lite:browser:enterprise",
34+
"test:all": "run-p --npm-path npm test:browser test:lite:browser test:travis test:minified test:browser:prod:enterprise test:lite:browser:enterprise",
3535
"test:browser": "karma start",
3636
"test:browser:emulator:debug": "karma start --browsers=Chrome --targetBackend=emulator",
3737
"test:browser:emulator": "karma start --targetBackend=emulator",
3838
"test:browser:nightly": "karma start --targetBackend=nightly",
3939
"test:browser:prod": "karma start --targetBackend=prod",
4040
"test:webkit:prod": "BROWSERS=WebkitHeadless karma start --targetBackend=prod",
4141
"test:webkit:unit": "BROWSERS=WebkitHeadless karma start --unit --targetBackend=prod",
42-
"test:browser:prod:nameddb": "karma start --targetBackend=prod --databaseId=enterprise --firestoreEdition=enterprise",
42+
"test:browser:prod:enterprise": "karma start --targetBackend=prod --databaseId=enterprise --firestoreEdition=enterprise",
4343
"test:browser:unit": "karma start --unit",
4444
"test:browser:debug": "karma start --browsers=Chrome --auto-watch",
4545
"test:node": "ts-node ./scripts/run-tests.ts --main=test/register.ts --emulator 'test/{,!(browser|lite)/**/}*.test.ts'",
4646
"test:node:prod": "ts-node ./scripts/run-tests.ts --main=test/register.ts 'test/{,!(browser|lite)/**/}*.test.ts'",
47-
"test:node:prod:nameddb": "ts-node ./scripts/run-tests.ts --main=test/register.ts --databaseId=enterprise --firestoreEdition=enterprise 'test/{,!(browser|lite)/**/}*.test.ts'",
47+
"test:node:prod:enterprise": "ts-node ./scripts/run-tests.ts --main=test/register.ts --databaseId=enterprise --firestoreEdition=enterprise 'test/{,!(browser|lite)/**/}*.test.ts'",
4848
"test:node:nightly": "ts-node ./scripts/run-tests.ts --main=test/register.ts 'test/{,!(browser|lite)/**/}*.test.ts' --targetBackend=nightly",
4949
"test:node:debug": "ts-node ./scripts/run-tests.ts --main=test/register.ts --emulator --debug 'test/{,!(browser|lite)/**/}*.test.ts'",
5050
"test:node:persistence": "ts-node ./scripts/run-tests.ts --main=test/register.ts --persistence --emulator 'test/{,!(browser|lite)/**/}*.test.ts'",

‎packages/firestore/test/integration/api/pipeline.test.ts‎

Lines changed: 4 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import { FirebaseError } from '@firebase/util';
2424
import { expect, use } from 'chai';
2525
import chaiAsPromised from 'chai-as-promised';
2626

27-
import { logWarn } from '../../../src/util/log';
2827
import { addEqualityMatcher } from '../../util/equality_matcher';
2928
import { Deferred } from '../../util/promise';
3029
import {
@@ -6573,39 +6572,8 @@ apiDescribe.skipClassic('Pipelines', persistence => {
65736572
.addFields(reviewsSub.toArrayExpression().as('reviews'))
65746573
.select('title', 'reviews');
65756574

6576-
// TODO(dlarocque): Remove these target backend conditionals once the 'get_field' rename has rolled out to prod.
6577-
const host = firestore._getSettings().host;
6578-
const isProd = host === 'firestore.googleapis.com';
6579-
const isNightly = host === 'test-firestore.sandbox.googleapis.com';
6580-
6581-
if (isProd) {
6582-
// The execution of this pipeline is expected to result in a network error
6583-
// from the backend until the breaking change to rename the 'field' expression to
6584-
// 'get_field' has rolled out to prod.
6585-
try {
6586-
const results = await execute(ppl);
6587-
6588-
// If this is reached, the execution of the pipeline didn't throw an error, so the
6589-
// breaking change must have rolled out to prod. We can assert the newly expected behaviour.
6590-
logWarn(
6591-
"The 'get_field' expression rename has rolled out to the prod backend. Remove the target backend conditionals in this test."
6592-
);
6593-
expectResults(results, { title: '1984', reviews: ['Alice'] });
6594-
} catch (err: unknown) {
6595-
const error: Error = err as Error;
6596-
expect(error.message).to.equals(
6597-
"The function 'get_field' does not exist, did you mean 'field'?"
6598-
);
6599-
}
6600-
} else if (isNightly) {
6601-
const results = await execute(ppl);
6602-
expectResults(results, { title: '1984', reviews: ['Alice'] });
6603-
} else {
6604-
expect(false).to.equal(
6605-
true,
6606-
`This test is only expected to run against firestore.googleapis.com or test-firestore.sandbox.googleapis.com, but it instead ran against ${host}`
6607-
);
6608-
}
6575+
const results = await execute(ppl);
6576+
expectResults(results, { title: '1984', reviews: ['Alice'] });
66096577
});
66106578
});
66116579

@@ -6687,39 +6655,8 @@ apiDescribe.skipClassic('Pipelines', persistence => {
66876655
.addFields(reviewsSub.toArrayExpression().as('reviews'))
66886656
.select('title', 'reviews');
66896657

6690-
// TODO(dlarocque): Remove these target backend conditionals once the 'get_field' rename has rolled out to prod.
6691-
const host = firestore._getSettings().host;
6692-
const isProd = host === 'firestore.googleapis.com';
6693-
const isNightly = host === 'test-firestore.sandbox.googleapis.com';
6694-
6695-
if (isProd) {
6696-
// The execution of this pipeline is expected to result in a network error
6697-
// from the backend until the breaking change to rename the 'field' expression to
6698-
// 'get_field' has rolled out to prod.
6699-
try {
6700-
const results = await execute(ppl);
6701-
6702-
// If this is reached, the execution of the pipeline didn't throw an error, so the
6703-
// breaking change must have rolled out to prod. We can assert the newly expected behaviour.
6704-
logWarn(
6705-
"The 'get_field' expression rename has rolled out to the prod backend. Remove the target backend conditionals in this test."
6706-
);
6707-
expectResults(results, { title: '1984', reviews: [] });
6708-
} catch (err: unknown) {
6709-
const error: Error = err as Error;
6710-
expect(error.message).to.equals(
6711-
"The function 'get_field' does not exist, did you mean 'field'?"
6712-
);
6713-
}
6714-
} else if (isNightly) {
6715-
const results = await execute(ppl);
6716-
expectResults(results, { title: '1984', reviews: [] });
6717-
} else {
6718-
expect(false).to.equal(
6719-
true,
6720-
`This test is only expected to run against firestore.googleapis.com or test-firestore.sandbox.googleapis.com, but it instead ran against ${host}`
6721-
);
6722-
}
6658+
const results = await execute(ppl);
6659+
expectResults(results, { title: '1984', reviews: [] });
67236660
});
67246661
});
67256662

0 commit comments

Comments
 (0)