Skip to content

Commit cf7959e

Browse files
committed
Merge branch 'main' into ddb-database-emulator-reconnect
2 parents d80841d + 5250e80 commit cf7959e

File tree

127 files changed

+4524
-6260
lines changed

Some content is hidden

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

127 files changed

+4524
-6260
lines changed

.changeset/little-news-sniff.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/data-connect': minor
3+
'firebase': minor
4+
---
5+
6+
Add custom request headers based on the type of SDK (JS/TS, React, Angular, etc) that's invoking Data Connect requests. This will help us understand how users interact with Data Connect when using the Web SDK.

.changeset/polite-lies-vanish.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'firebase': minor
3+
'@firebase/auth-types': minor
4+
'@firebase/auth': minor
5+
---
6+
7+
Added `ActionCodeSettings.linkDomain` to customize the Firebase Hosting link domain that is used in mobile out-of-band email action flows. Also, deprecated `ActionCodeSettings.dynamicLinkDomain`.

.changeset/spotty-trainers-lay.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/firestore': patch
3+
'firebase': patch
4+
---
5+
6+
Fixed a server and sdk mismatch in unicode string sorting.

common/api-review/auth.api.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ export interface ActionCodeSettings {
4040
minimumVersion?: string;
4141
packageName: string;
4242
};
43+
// @deprecated
4344
dynamicLinkDomain?: string;
4445
handleCodeInApp?: boolean;
4546
iOS?: {
4647
bundleId: string;
4748
};
49+
linkDomain?: string;
4850
url: string;
4951
}
5052

@@ -236,6 +238,7 @@ export const AuthErrorCodes: {
236238
readonly MISSING_RECAPTCHA_VERSION: "auth/missing-recaptcha-version";
237239
readonly INVALID_RECAPTCHA_VERSION: "auth/invalid-recaptcha-version";
238240
readonly INVALID_REQ_TYPE: "auth/invalid-req-type";
241+
readonly INVALID_HOSTING_LINK_DOMAIN: "auth/invalid-hosting-link-domain";
239242
};
240243

241244
// @public

common/api-review/data-connect.api.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ import { FirebaseError } from '@firebase/util';
1111
import { LogLevelString } from '@firebase/logger';
1212
import { Provider } from '@firebase/component';
1313

14+
// @public
15+
export type CallerSdkType = 'Base' | 'Generated' | 'TanstackReactCore' | 'GeneratedReact' | 'TanstackAngularCore' | 'GeneratedAngular';
16+
17+
// @public (undocumented)
18+
export const CallerSdkTypeEnum: {
19+
readonly Base: "Base";
20+
readonly Generated: "Generated";
21+
readonly TanstackReactCore: "TanstackReactCore";
22+
readonly GeneratedReact: "GeneratedReact";
23+
readonly TanstackAngularCore: "TanstackAngularCore";
24+
readonly GeneratedAngular: "GeneratedAngular";
25+
};
26+
1427
// @public
1528
export function connectDataConnectEmulator(dc: DataConnect, host: string, port?: number, sslEnabled?: boolean): void;
1629

config/api-extractor.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
*
101101
* DEFAULT VALUE: false
102102
*/
103-
// "skipLibCheck": true,
103+
"skipLibCheck": true,
104104
},
105105

106106
/**

docs-devsite/auth.actioncodesettings.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ export interface ActionCodeSettings
2626
| [dynamicLinkDomain](./auth.actioncodesettings.md#actioncodesettingsdynamiclinkdomain) | string | When multiple custom dynamic link domains are defined for a project, specify which one to use when the link is to be opened via a specified mobile app (for example, <code>example.page.link</code>). |
2727
| [handleCodeInApp](./auth.actioncodesettings.md#actioncodesettingshandlecodeinapp) | boolean | When set to true, the action code link will be be sent as a Universal Link or Android App Link and will be opened by the app if installed. |
2828
| [iOS](./auth.actioncodesettings.md#actioncodesettingsios) | { bundleId: string; } | Sets the iOS bundle ID. |
29+
| [linkDomain](./auth.actioncodesettings.md#actioncodesettingslinkdomain) | string | The optional custom Firebase Hosting domain to use when the link is to be opened via a specified mobile app. The domain must be configured in Firebase Hosting and owned by the project. This cannot be a default Hosting domain (<code>web.app</code> or <code>firebaseapp.com</code>). |
2930
| [url](./auth.actioncodesettings.md#actioncodesettingsurl) | string | Sets the link continue/state URL. |
3031

3132
## ActionCodeSettings.android
3233

3334
Sets the Android package name.
3435

35-
This will try to open the link in an android app if it is installed. If `installApp` is passed, it specifies whether to install the Android app if the device supports it and the app is not already installed. If this field is provided without a `packageName`<!-- -->, an error is thrown explaining that the `packageName` must be provided in conjunction with this field. If `minimumVersion` is specified, and an older version of the app is installed, the user is taken to the Play Store to upgrade the app.
36+
This will try to open the link in an Android app if it is installed.
3637

3738
<b>Signature:</b>
3839

@@ -46,6 +47,11 @@ android?: {
4647

4748
## ActionCodeSettings.dynamicLinkDomain
4849

50+
> Warning: This API is now obsolete.
51+
>
52+
> Firebase Dynamic Links is deprecated and will be shut down as early as August 2025. Instead, use [ActionCodeSettings.linkDomain](./auth.actioncodesettings.md#actioncodesettingslinkdomain) to set a custom domain for mobile links. Learn more in the [Dynamic Links deprecation FAQ](https://firebase.google.com/support/dynamic-links-faq)<!-- -->.
53+
>
54+
4955
When multiple custom dynamic link domains are defined for a project, specify which one to use when the link is to be opened via a specified mobile app (for example, `example.page.link`<!-- -->).
5056

5157
<b>Signature:</b>
@@ -72,8 +78,6 @@ Sets the iOS bundle ID.
7278

7379
This will try to open the link in an iOS app if it is installed.
7480

75-
App installation is not supported for iOS.
76-
7781
<b>Signature:</b>
7882

7983
```typescript
@@ -82,11 +86,21 @@ iOS?: {
8286
};
8387
```
8488

89+
## ActionCodeSettings.linkDomain
90+
91+
The optional custom Firebase Hosting domain to use when the link is to be opened via a specified mobile app. The domain must be configured in Firebase Hosting and owned by the project. This cannot be a default Hosting domain (`web.app` or `firebaseapp.com`<!-- -->).
92+
93+
<b>Signature:</b>
94+
95+
```typescript
96+
linkDomain?: string;
97+
```
98+
8599
## ActionCodeSettings.url
86100

87101
Sets the link continue/state URL.
88102

89-
This has different meanings in different contexts: - When the link is handled in the web action widgets, this is the deep link in the `continueUrl` query parameter. - When the link is handled in the app directly, this is the `continueUrl` query parameter in the deep link of the Dynamic Link.
103+
This has different meanings in different contexts: - When the link is handled in the web action widgets, this is the deep link in the `continueUrl` query parameter. - When the link is handled in the app directly, this is the `continueUrl` query parameter in the deep link of the Dynamic Link or Hosting link.
90104

91105
<b>Signature:</b>
92106

docs-devsite/auth.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1956,6 +1956,7 @@ AUTH_ERROR_CODES_MAP_DO_NOT_USE_INTERNALLY: {
19561956
readonly MISSING_RECAPTCHA_VERSION: "auth/missing-recaptcha-version";
19571957
readonly INVALID_RECAPTCHA_VERSION: "auth/invalid-recaptcha-version";
19581958
readonly INVALID_REQ_TYPE: "auth/invalid-req-type";
1959+
readonly INVALID_HOSTING_LINK_DOMAIN: "auth/invalid-hosting-link-domain";
19591960
}
19601961
```
19611962

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@
6262
"repo-scripts/*"
6363
],
6464
"devDependencies": {
65-
"@babel/core": "7.26.0",
65+
"@babel/core": "7.26.7",
6666
"@babel/plugin-transform-modules-commonjs": "7.26.3",
67-
"@babel/preset-env": "7.26.0",
67+
"@babel/preset-env": "7.26.7",
6868
"@babel/preset-typescript": "7.26.0",
6969
"@babel/register": "7.25.9",
7070
"@changesets/changelog-github": "0.5.0",
71-
"@changesets/cli": "2.27.11",
71+
"@changesets/cli": "2.27.12",
7272
"@types/chai": "4.3.20",
7373
"@types/chai-as-promised": "7.1.8",
7474
"@types/child-process-promise": "2.2.6",
@@ -80,7 +80,7 @@
8080
"@types/long": "4.0.2",
8181
"@types/mocha": "9.1.1",
8282
"@types/mz": "2.7.8",
83-
"@types/node": "18.19.71",
83+
"@types/node": "18.19.74",
8484
"@types/request": "2.48.12",
8585
"@types/sinon": "9.0.11",
8686
"@types/sinon-chai": "3.2.12",
@@ -139,7 +139,7 @@
139139
"nyc": "15.1.0",
140140
"ora": "5.4.1",
141141
"patch-package": "7.0.2",
142-
"playwright": "1.49.1",
142+
"playwright": "1.50.0",
143143
"postinstall-postinstall": "2.1.0",
144144
"prettier": "2.8.8",
145145
"protractor": "5.4.2",

packages/analytics-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
},
2424
"devDependencies": {
2525
"@firebase/app-compat": "0.2.48",
26-
"rollup": "2.79.1",
26+
"rollup": "2.79.2",
2727
"@rollup/plugin-json": "6.1.0",
28-
"rollup-plugin-typescript2": "0.31.2",
28+
"rollup-plugin-typescript2": "0.36.0",
2929
"typescript": "5.5.4"
3030
},
3131
"repository": {

0 commit comments

Comments
 (0)