Skip to content

Commit 36fc2a8

Browse files
committed
Merge branch 'fei-v9-main' into fei-v9-main-fixes
2 parents 5e140ab + fe890a1 commit 36fc2a8

File tree

31 files changed

+2371
-1635
lines changed

31 files changed

+2371
-1635
lines changed

.changeset/stale-ducks-live.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": major
3+
---
4+
5+
BREAKING: Implement Rules Unit Testing v2 with new design and APIs.

common/api-review/storage.api.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,23 @@ export interface FirebaseStorage extends _FirebaseService {
5252
}
5353

5454
// @public
55+
export interface FirebaseStorageError extends FirebaseError {
56+
serverResponse: string | null;
57+
}
58+
59+
// @internal
5560
export class _FirebaseStorageImpl implements FirebaseStorage {
5661
constructor(
5762
app: FirebaseApp, _authProvider: Provider<FirebaseAuthInternalName>,
5863
_appCheckProvider: Provider<AppCheckInternalComponentName>,
5964
_pool: ConnectionPool, _url?: string | undefined, _firebaseVersion?: string | undefined);
6065
readonly app: FirebaseApp;
61-
// @internal (undocumented)
66+
// (undocumented)
6267
readonly _appCheckProvider: Provider<AppCheckInternalComponentName>;
6368
// (undocumented)
6469
protected readonly _appId: string | null;
6570
// (undocumented)
6671
readonly _authProvider: Provider<FirebaseAuthInternalName>;
67-
// Warning: (ae-incompatible-release-tags) The symbol "_bucket" is marked as @public, but its signature references "Location" which is marked as @internal
68-
//
6972
// (undocumented)
7073
_bucket: _Location | null;
7174
_delete(): Promise<void>;
@@ -85,8 +88,6 @@ export class _FirebaseStorageImpl implements FirebaseStorage {
8588
_makeRequest<T>(requestInfo: RequestInfo_2<T>, authToken: string | null, appCheckToken: string | null): Request_2<T>;
8689
// (undocumented)
8790
makeRequestWithTokens<T>(requestInfo: RequestInfo_2<T>): Promise<Request_2<T>>;
88-
// Warning: (ae-incompatible-release-tags) The symbol "_makeStorageReference" is marked as @public, but its signature references "Location" which is marked as @internal
89-
// Warning: (ae-incompatible-release-tags) The symbol "_makeStorageReference" is marked as @public, but its signature references "Reference" which is marked as @internal
9091
_makeStorageReference(loc: _Location): _Reference;
9192
get maxOperationRetryTime(): number;
9293
set maxOperationRetryTime(time: number);
@@ -96,7 +97,7 @@ export class _FirebaseStorageImpl implements FirebaseStorage {
9697
_overrideAuthToken?: string;
9798
// Warning: (ae-forgotten-export) The symbol "ConnectionPool" needs to be exported by the entry point index.d.ts
9899
//
99-
// @internal (undocumented)
100+
// (undocumented)
100101
readonly _pool: ConnectionPool;
101102
// (undocumented)
102103
readonly _url?: string | undefined;
@@ -250,21 +251,21 @@ export const StringFormat: {
250251
// @public
251252
export type TaskEvent = 'state_changed';
252253

253-
// @public
254+
// @internal
254255
export type _TaskEvent = string;
255256

256-
// @public
257+
// @internal
257258
export const _TaskEvent: {
258259
STATE_CHANGED: string;
259260
};
260261

261262
// @public
262263
export type TaskState = 'running' | 'paused' | 'success' | 'canceled' | 'error';
263264

264-
// @public
265+
// @internal
265266
export type _TaskState = typeof _TaskState[keyof typeof _TaskState];
266267

267-
// @public
268+
// @internal
268269
export const _TaskState: {
269270
readonly RUNNING: "running";
270271
readonly PAUSED: "paused";

packages/database-compat/src/index.node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ try {
124124
// Types to export for the admin SDK
125125
export { Database, Query, Reference, enableLogging, ServerValue };
126126

127-
export { OnDisconnect } from '@firebase/database/src/api/OnDisconnect';
127+
export { OnDisconnect } from '@firebase/database';
128128

129129
declare module '@firebase/app-compat' {
130130
interface FirebaseNamespace {

packages/database/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"test:emulator": "ts-node --compiler-options='{\"module\":\"commonjs\"}' ../../scripts/emulator-testing/database-test-runner.ts",
2626
"api-report": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' ts-node ../../repo-scripts/prune-dts/extract-public-api.ts --package database --packageRoot . --typescriptDts ./dist/src/index.d.ts --rollupDts ./dist/private.d.ts --untrimmedRollupDts ./dist/internal.d.ts --publicDts ./dist/public.d.ts && yarn api-report:api-json",
2727
"api-report:api-json": "rm -rf temp && api-extractor run --local --verbose",
28-
"doc": "api-documenter markdown --input temp --output docs"
28+
"doc": "api-documenter markdown --input temp --output docs",
29+
"typings:public": "node ../../scripts/exp/use_typings.js ./dist/public.d.ts"
2930
},
3031
"license": "Apache-2.0",
3132
"peerDependencies": {},

0 commit comments

Comments
 (0)