Skip to content

Commit a6f47dd

Browse files
Feiyang1Feiyang1
authored
Merge 5abbf4a into 0a91a90 
2 parents 0a91a90 + 5abbf4a commit a6f47dd

File tree

121 files changed

+1227
-1423
lines changed

Some content is hidden

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

121 files changed

+1227
-1423
lines changed

‎.changeset/afraid-poets-hammer.md

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

‎.changeset/big-lobsters-tell.md

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

‎.changeset/blue-suits-wait.md

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

‎.changeset/bright-clouds-pretend.md

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

‎.changeset/fast-buses-scream.md

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

‎.changeset/gold-ghosts-argue.md

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

‎.changeset/wise-toys-care.md

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

‎.changeset/witty-brooms-relate.md

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

‎.changeset/witty-chicken-mate.md

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

‎.changeset/witty-gorillas-punch.md

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

‎common/api-review/storage.api.md

Lines changed: 89 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { EmulatorMockTokenOptions } from '@firebase/util';
1010
import { FirebaseApp } from '@firebase/app';
1111
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
1212
import { FirebaseError } from '@firebase/util';
13-
import { _FirebaseService } from '@firebase/app';
13+
import { _FirebaseService } from '@firebase/app-exp';
1414
import { NextFn } from '@firebase/util';
1515
import { Provider } from '@firebase/component';
1616
import { Subscribe } from '@firebase/util';
@@ -21,6 +21,11 @@ export function connectStorageEmulator(storage: FirebaseStorage, host: string, p
2121
mockUserToken?: EmulatorMockTokenOptions | string;
2222
}): void;
2323

24+
// Warning: (ae-forgotten-export) The symbol "StringData" needs to be exported by the entry point index.d.ts
25+
//
26+
// @internal (undocumented)
27+
export function _dataFromString(format: StringFormat, stringData: string): StringData;
28+
2429
// @public
2530
export function deleteObject(ref: StorageReference): Promise<void>;
2631

@@ -51,6 +56,55 @@ export interface FirebaseStorageError extends FirebaseError {
5156
serverResponse: string | null;
5257
}
5358

59+
// @public
60+
export class _FirebaseStorageImpl implements FirebaseStorage {
61+
constructor(
62+
app: FirebaseApp, _authProvider: Provider<FirebaseAuthInternalName>,
63+
_appCheckProvider: Provider<AppCheckInternalComponentName>,
64+
_pool: ConnectionPool, _url?: string | undefined, _firebaseVersion?: string | undefined);
65+
readonly app: FirebaseApp;
66+
// @internal (undocumented)
67+
readonly _appCheckProvider: Provider<AppCheckInternalComponentName>;
68+
// (undocumented)
69+
protected readonly _appId: string | null;
70+
// (undocumented)
71+
readonly _authProvider: Provider<FirebaseAuthInternalName>;
72+
// Warning: (ae-incompatible-release-tags) The symbol "_bucket" is marked as @public, but its signature references "Location" which is marked as @internal
73+
//
74+
// (undocumented)
75+
_bucket: _Location | null;
76+
_delete(): Promise<void>;
77+
// (undocumented)
78+
readonly _firebaseVersion?: string | undefined;
79+
// (undocumented)
80+
_getAppCheckToken(): Promise<string | null>;
81+
// (undocumented)
82+
_getAuthToken(): Promise<string | null>;
83+
// (undocumented)
84+
get host(): string;
85+
set host(host: string);
86+
// Warning: (ae-forgotten-export) The symbol "RequestInfo" needs to be exported by the entry point index.d.ts
87+
// Warning: (ae-forgotten-export) The symbol "Request" needs to be exported by the entry point index.d.ts
88+
//
89+
// (undocumented)
90+
_makeRequest<T>(requestInfo: RequestInfo_2<T>, authToken: string | null, appCheckToken: string | null): Request_2<T>;
91+
// (undocumented)
92+
makeRequestWithTokens<T>(requestInfo: RequestInfo_2<T>): Promise<Request_2<T>>;
93+
// Warning: (ae-incompatible-release-tags) The symbol "_makeStorageReference" is marked as @public, but its signature references "Location" which is marked as @internal
94+
// Warning: (ae-incompatible-release-tags) The symbol "_makeStorageReference" is marked as @public, but its signature references "Reference" which is marked as @internal
95+
_makeStorageReference(loc: _Location): _Reference;
96+
get maxOperationRetryTime(): number;
97+
set maxOperationRetryTime(time: number);
98+
get maxUploadRetryTime(): number;
99+
set maxUploadRetryTime(time: number);
100+
// Warning: (ae-forgotten-export) The symbol "ConnectionPool" needs to be exported by the entry point index.d.ts
101+
//
102+
// @internal (undocumented)
103+
readonly _pool: ConnectionPool;
104+
// (undocumented)
105+
readonly _url?: string | undefined;
106+
}
107+
54108
// @public
55109
export interface FullMetadata extends UploadMetadata {
56110
bucket: string;
@@ -77,6 +131,14 @@ export function getMetadata(ref: StorageReference): Promise<FullMetadata>;
77131
// @public
78132
export function getStorage(app?: FirebaseApp, bucketUrl?: string): FirebaseStorage;
79133

134+
// Warning: (ae-forgotten-export) The symbol "FirebaseStorageError" needs to be exported by the entry point index.d.ts
135+
//
136+
// @internal (undocumented)
137+
export function _invalidArgument(message: string): FirebaseStorageError_2;
138+
139+
// @internal (undocumented)
140+
export function _invalidRootOperation(name: string): FirebaseStorageError_2;
141+
80142
// @public
81143
export function list(ref: StorageReference, options?: ListOptions): Promise<ListResult>;
82144

@@ -123,18 +185,17 @@ export function ref(storageOrRef: FirebaseStorage | StorageReference, path?: str
123185

124186
// @internal
125187
export class _Reference {
126-
// Warning: (ae-forgotten-export) The symbol "FirebaseStorageImpl" needs to be exported by the entry point index.d.ts
127-
constructor(_service: FirebaseStorageImpl, location: string | _Location);
188+
constructor(_service: _FirebaseStorageImpl, location: string | _Location);
128189
get bucket(): string;
129190
get fullPath(): string;
130191
// (undocumented)
131192
_location: _Location;
132193
get name(): string;
133194
// (undocumented)
134-
protected _newRef(service: FirebaseStorageImpl, location: _Location): _Reference;
195+
protected _newRef(service: _FirebaseStorageImpl, location: _Location): _Reference;
135196
get parent(): _Reference | null;
136197
get root(): _Reference;
137-
get storage(): FirebaseStorageImpl;
198+
get storage(): _FirebaseStorageImpl;
138199
_throwIfRoot(name: string): void;
139200
// @override
140201
toString(): string;
@@ -187,9 +248,29 @@ export const StringFormat: {
187248
// @public
188249
export type TaskEvent = 'state_changed';
189250

251+
// @public
252+
export type _TaskEvent = string;
253+
254+
// @public
255+
export const _TaskEvent: {
256+
STATE_CHANGED: string;
257+
};
258+
190259
// @public
191260
export type TaskState = 'running' | 'paused' | 'success' | 'canceled' | 'error';
192261

262+
// @public
263+
export type _TaskState = typeof _TaskState[keyof typeof _TaskState];
264+
265+
// @public
266+
export const _TaskState: {
267+
readonly RUNNING: "running";
268+
readonly PAUSED: "paused";
269+
readonly SUCCESS: "success";
270+
readonly CANCELED: "canceled";
271+
readonly ERROR: "error";
272+
};
273+
193274
// @public
194275
export function updateMetadata(ref: StorageReference, metadata: SettableMetadata): Promise<FullMetadata>;
195276

@@ -232,21 +313,15 @@ export class _UploadTask {
232313
catch<T>(onRejected: (p1: FirebaseStorageError_2) => T | Promise<T>): Promise<T>;
233314
// Warning: (ae-forgotten-export) The symbol "Metadata" needs to be exported by the entry point index.d.ts
234315
_metadata: Metadata | null;
235-
// Warning: (ae-forgotten-export) The symbol "TaskEvent" needs to be exported by the entry point index.d.ts
236-
// Warning: (ae-forgotten-export) The symbol "StorageObserver" needs to be exported by the entry point index.d.ts
237-
// Warning: (ae-forgotten-export) The symbol "ErrorFn" needs to be exported by the entry point index.d.ts
238-
// Warning: (ae-forgotten-export) The symbol "CompleteFn" needs to be exported by the entry point index.d.ts
239316
// Warning: (ae-forgotten-export) The symbol "Unsubscribe" needs to be exported by the entry point index.d.ts
240317
// Warning: (ae-forgotten-export) The symbol "Subscribe" needs to be exported by the entry point index.d.ts
241-
on(type: TaskEvent_2, nextOrObserver?: StorageObserver_2<UploadTaskSnapshot_2> | ((a: UploadTaskSnapshot_2) => unknown), error?: ErrorFn, completed?: CompleteFn_2): Unsubscribe_2 | Subscribe_2<UploadTaskSnapshot_2>;
318+
on(type: _TaskEvent, nextOrObserver?: StorageObserver<UploadTaskSnapshot> | null | ((snapshot: UploadTaskSnapshot) => unknown), error?: ((a: FirebaseStorageError_2) => unknown) | null, completed?: Unsubscribe_2 | null): Unsubscribe_2 | Subscribe_2<UploadTaskSnapshot>;
242319
pause(): boolean;
243320
resume(): boolean;
244-
// Warning: (ae-forgotten-export) The symbol "UploadTaskSnapshot" needs to be exported by the entry point index.d.ts
245-
get snapshot(): UploadTaskSnapshot_2;
321+
get snapshot(): UploadTaskSnapshot;
246322
// Warning: (ae-forgotten-export) The symbol "InternalTaskState" needs to be exported by the entry point index.d.ts
247323
_state: InternalTaskState;
248-
// Warning: (ae-forgotten-export) The symbol "FirebaseStorageError" needs to be exported by the entry point index.d.ts
249-
then<U>(onFulfilled?: ((value: UploadTaskSnapshot_2) => U | Promise<U>) | null, onRejected?: ((error: FirebaseStorageError_2) => U | Promise<U>) | null): Promise<U>;
324+
then<U>(onFulfilled?: ((value: UploadTaskSnapshot) => U | Promise<U>) | null, onRejected?: ((error: FirebaseStorageError_2) => U | Promise<U>) | null): Promise<U>;
250325
_transferred: number;
251326
}
252327

‎integration/firebase/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
88
},
99
"devDependencies": {
10-
"firebase": "8.9.1",
10+
"firebase": "8.10.0",
1111
"@types/chai": "4.2.14",
1212
"@types/mocha": "8.2.3",
1313
"chai": "4.3.4",

‎integration/firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
1515
},
1616
"devDependencies": {
17-
"@firebase/app": "0.6.29",
18-
"@firebase/firestore": "2.3.10",
17+
"@firebase/app": "0.6.30",
18+
"@firebase/firestore": "2.4.0",
1919
"@types/mocha": "8.2.3",
2020
"gulp": "4.0.2",
2121
"gulp-filter": "7.0.0",

‎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": "8.9.1",
12+
"firebase": "8.10.0",
1313
"chai": "4.3.4",
1414
"chromedriver": "91.0.0",
1515
"express": "4.17.1",

‎packages-exp/analytics-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
},
4545
"typings": "dist/src/index.d.ts",
4646
"dependencies": {
47-
"@firebase/component": "0.5.5",
47+
"@firebase/component": "0.5.6",
4848
"@firebase/analytics-exp": "0.0.900",
4949
"@firebase/analytics-types": "0.6.0",
50-
"@firebase/util": "1.2.0",
50+
"@firebase/util": "1.3.0",
5151
"tslib": "^2.1.0"
5252
},
5353
"nyc": {

‎packages-exp/analytics-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"dependencies": {
3535
"@firebase/installations-exp": "0.0.900",
3636
"@firebase/logger": "0.2.6",
37-
"@firebase/util": "1.2.0",
38-
"@firebase/component": "0.5.5",
37+
"@firebase/util": "1.3.0",
38+
"@firebase/component": "0.5.6",
3939
"tslib": "^2.1.0"
4040
},
4141
"license": "Apache-2.0",

‎packages-exp/app-check-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"dependencies": {
2929
"@firebase/app-check-exp": "0.0.900",
3030
"@firebase/logger": "0.2.6",
31-
"@firebase/util": "1.2.0",
32-
"@firebase/component": "0.5.5",
31+
"@firebase/util": "1.3.0",
32+
"@firebase/component": "0.5.6",
3333
"tslib": "^2.1.0"
3434
},
3535
"license": "Apache-2.0",

‎packages-exp/app-check-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
},
3232
"dependencies": {
3333
"@firebase/logger": "0.2.6",
34-
"@firebase/util": "1.2.0",
35-
"@firebase/component": "0.5.5",
34+
"@firebase/util": "1.3.0",
35+
"@firebase/component": "0.5.6",
3636
"tslib": "^2.1.0"
3737
},
3838
"license": "Apache-2.0",

‎packages-exp/app-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"license": "Apache-2.0",
3030
"dependencies": {
3131
"@firebase/app-exp": "0.0.900",
32-
"@firebase/util": "1.2.0",
32+
"@firebase/util": "1.3.0",
3333
"@firebase/logger": "0.2.6",
34-
"@firebase/component": "0.5.5",
34+
"@firebase/component": "0.5.6",
3535
"tslib": "^2.1.0",
3636
"dom-storage": "2.1.0",
3737
"xmlhttprequest": "1.8.0"

‎packages-exp/app-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"typings:internal": "node ../../scripts/exp/use_typings.js ./dist/app-exp.d.ts"
3131
},
3232
"dependencies": {
33-
"@firebase/util": "1.2.0",
33+
"@firebase/util": "1.3.0",
3434
"@firebase/logger": "0.2.6",
35-
"@firebase/component": "0.5.5",
35+
"@firebase/component": "0.5.6",
3636
"tslib": "^2.1.0"
3737
},
3838
"license": "Apache-2.0",

‎packages-exp/app-exp/src/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import { name as performanceCompatName } from '../../../packages-exp/performance
3636
import { name as remoteConfigName } from '../../../packages-exp/remote-config-exp/package.json';
3737
import { name as remoteConfigCompatName } from '../../../packages-exp/remote-config-compat/package.json';
3838
import { name as storageName } from '../../../packages/storage/package.json';
39-
import { name as storageCompatName } from '../../../packages/storage/compat/package.json';
39+
import { name as storageCompatName } from '../../../packages/storage-compat/package.json';
4040
import { name as firestoreName } from '../../../packages/firestore/package.json';
4141
import { name as firestoreCompatName } from '../../../packages/firestore/compat/package.json';
4242
import { name as packageName } from '../../../packages-exp/firebase-exp/package.json';

‎packages-exp/auth-compat-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"dependencies": {
3535
"@firebase/auth-exp": "0.0.900",
3636
"@firebase/auth-types": "0.10.3",
37-
"@firebase/component": "0.5.5",
38-
"@firebase/util": "1.2.0",
37+
"@firebase/component": "0.5.6",
38+
"@firebase/util": "1.3.0",
3939
"node-fetch": "2.6.1",
4040
"selenium-webdriver": "^4.0.0-beta.2",
4141
"tslib": "^2.1.0"

‎packages-exp/auth-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
"@firebase/app-exp": "0.x"
5353
},
5454
"dependencies": {
55-
"@firebase/component": "0.5.5",
55+
"@firebase/component": "0.5.6",
5656
"@firebase/logger": "0.2.6",
57-
"@firebase/util": "1.2.0",
57+
"@firebase/util": "1.3.0",
5858
"node-fetch": "2.6.1",
5959
"selenium-webdriver": "4.0.0-beta.1",
6060
"tslib": "^2.1.0"

‎packages-exp/firebase-exp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,11 @@
229229
"@firebase/app-check-compat": "0.0.900",
230230
"@firebase/auth-exp": "0.0.900",
231231
"@firebase/auth-compat": "0.0.900",
232-
"@firebase/database": "0.10.9",
232+
"@firebase/database": "0.11.0",
233233
"@firebase/functions-exp": "0.0.900",
234234
"@firebase/functions-compat": "0.0.900",
235-
"@firebase/firestore": "2.3.10",
236-
"@firebase/storage": "0.6.2",
235+
"@firebase/firestore": "2.4.0",
236+
"@firebase/storage": "0.7.0",
237237
"@firebase/performance-exp": "0.0.900",
238238
"@firebase/performance-compat": "0.0.900",
239239
"@firebase/remote-config-exp": "0.0.900",

‎packages-exp/functions-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
},
4848
"typings": "dist/src/index.d.ts",
4949
"dependencies": {
50-
"@firebase/component": "0.5.5",
50+
"@firebase/component": "0.5.6",
5151
"@firebase/functions-exp": "0.0.900",
5252
"@firebase/functions-types": "0.4.0",
5353
"@firebase/messaging-types": "0.5.0",
54-
"@firebase/util": "1.2.0",
54+
"@firebase/util": "1.3.0",
5555
"tslib": "^2.1.0"
5656
},
5757
"nyc": {

‎packages-exp/functions-exp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
},
5151
"typings": "dist/functions-exp-public.d.ts",
5252
"dependencies": {
53-
"@firebase/component": "0.5.5",
53+
"@firebase/component": "0.5.6",
5454
"@firebase/messaging-types": "0.5.0",
5555
"@firebase/auth-interop-types": "0.1.6",
5656
"@firebase/app-check-interop-types": "0.1.0",
57-
"@firebase/util": "1.2.0",
57+
"@firebase/util": "1.3.0",
5858
"node-fetch": "2.6.1",
5959
"tslib": "^2.1.0"
6060
},

0 commit comments

Comments
 (0)