Skip to content

Commit c0f85bd

Browse files
committed
Clean up paths/imports
1 parent 4664b9a commit c0f85bd

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

packages/storage/api-extractor.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../config/api-extractor.json",
33
// Point it to your entry point d.ts file.
4-
"mainEntryPointFilePath": "<projectFolder>/exp/dist/exp/index.d.ts",
4+
"mainEntryPointFilePath": "<projectFolder>/exp/dist/packages/storage/exp/index.d.ts",
55
"dtsRollup": {
66
"enabled": true,
77
"untrimmedFilePath": "<projectFolder>/exp/dist/<unscopedPackageName>.d.ts",

packages/storage/exp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"main": "./dist/index.browser.cjs.js",
55
"module": "./dist/index.browser.esm2017.js",
66
"browser": "./dist/index.browser.esm2017.js",
7-
"typings": "./dist/index.d.ts",
7+
"typings": "./dist/storage.d.ts",
88
"private": true
99
}

packages/storage/src/implementation/request.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
* abstract representations.
2121
*/
2222

23-
import firebase from '@firebase/app';
2423
import * as backoff from './backoff';
2524
import {
2625
FirebaseStorageError,
@@ -34,6 +33,8 @@ import * as type from './type';
3433
import * as UrlUtils from './url';
3534
import { Headers, XhrIo, ErrorCode } from './xhrio';
3635
import { XhrIoPool } from './xhriopool';
36+
// Firebase SDK version
37+
import { version } from '../../../../package.json';
3738

3839
export interface Request<T> {
3940
getPromise(): Promise<T>;
@@ -268,9 +269,7 @@ export function addAuthHeader_(
268269
}
269270

270271
export function addVersionHeader_(headers: Headers): void {
271-
const version =
272-
typeof firebase !== 'undefined' ? firebase.SDK_VERSION : 'AppManager';
273-
headers['X-Firebase-Storage-Version'] = 'webjs/' + version;
272+
headers['X-Firebase-Storage-Version'] = 'webjs/' + (version ?? 'AppManager');
274273
}
275274

276275
export function addGmpidHeader_(headers: Headers, appId: string | null): void {

packages/storage/test/unit/request.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
*/
1717
import { assert } from 'chai';
1818
import * as sinon from 'sinon';
19-
import firebase from '@firebase/app';
2019
import { makeRequest } from '../../src/implementation/request';
2120
import { RequestInfo } from '../../src/implementation/requestinfo';
2221
import { XhrIo } from '../../src/implementation/xhrio';
2322
import { makePool } from './testshared';
2423
import { TestingXhrIo } from './xhrio';
24+
import { version } from '../../../../package.json';
2525

2626
describe('Firebase Storage > Request', () => {
2727
const versionHeaderName = 'X-Firebase-Storage-Version';
28-
const versionHeaderValue = 'webjs/' + firebase.SDK_VERSION;
28+
const versionHeaderValue = 'webjs/' + version;
2929
const timeout = 60 * 1000;
3030

3131
it('Simple success request works', () => {

0 commit comments

Comments
 (0)