Skip to content

Commit 63698a7

Browse files
committed
Merge branch 'master' into mila/Multiple-Inequality-support
2 parents a69e458 + e037eee commit 63698a7

File tree

4 files changed

+605
-597
lines changed

4 files changed

+605
-597
lines changed

.github/workflows/test-changed-auth.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,20 @@ jobs:
4545
# Whatever version of Firefox comes with 22.04 is causing Firefox
4646
# startup to hang when launched by karma. Need to look further into
4747
# why.
48+
4849
runs-on: ubuntu-20.04
4950

51+
# Chrome webdriver version is pinned to avoid install failures like "No such object: chromedriver/LATEST_RELEASE_115.0.5790"
52+
# These are installed even in the Firefox test due to `yarn` command which pulls the devDependency listed in package.json.
5053
steps:
5154
- name: install Firefox stable
5255
run: |
5356
sudo apt-get update
5457
sudo apt-get install firefox
58+
sudo apt-get install wget
59+
sudo wget http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_110.0.5481.177-1_amd64.deb
60+
sudo apt-get install -f ./google-chrome-stable_110.0.5481.177-1_amd64.deb --allow-downgrades
61+
5562
- name: Checkout Repo
5663
uses: actions/checkout@master
5764
with:

packages/firestore/src/api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ export {
8282
} from './api/bundle';
8383

8484
export { FirestoreSettings, PersistenceSettings } from './api/settings';
85+
export type { PrivateSettings } from './lite-api/settings';
8586
export { ExperimentalLongPollingOptions } from './api/long_polling_options';
8687

8788
export {

packages/firestore/src/lite-api/settings.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ export interface FirestoreSettings {
6868
ignoreUndefinedProperties?: boolean;
6969
}
7070

71-
/** Undocumented, private additional settings not exposed in our public API. */
71+
/**
72+
* @internal
73+
* Undocumented, private additional settings not exposed in our public API.
74+
*/
7275
export interface PrivateSettings extends FirestoreSettings {
7376
// Can be a google-auth-library or gapi client.
7477
credentials?: CredentialsSettings;

0 commit comments

Comments
 (0)