Clean up paths/imports

Author: hsubox76

packages/storage/api-extractor.json

@@ -1,7 +1,7 @@
 {
     "extends": "../../config/api-extractor.json",
     // Point it to your entry point d.ts file. 
-    "mainEntryPointFilePath": "<projectFolder>/exp/dist/exp/index.d.ts",
+    "mainEntryPointFilePath": "<projectFolder>/exp/dist/packages/storage/exp/index.d.ts",
     "dtsRollup": {
         "enabled": true,
         "untrimmedFilePath": "<projectFolder>/exp/dist/<unscopedPackageName>.d.ts",

packages/storage/exp/package.json

@@ -4,6 +4,6 @@
   "main": "./dist/index.browser.cjs.js",
   "module": "./dist/index.browser.esm2017.js",
   "browser": "./dist/index.browser.esm2017.js",
-  "typings": "./dist/index.d.ts",
+  "typings": "./dist/storage.d.ts",
   "private": true
 }

packages/storage/src/implementation/request.ts

@@ -20,7 +20,6 @@
  * abstract representations.
  */
 
-import firebase from '@firebase/app';
 import * as backoff from './backoff';
 import {
   FirebaseStorageError,
@@ -34,6 +33,8 @@ import * as type from './type';
 import * as UrlUtils from './url';
 import { Headers, XhrIo, ErrorCode } from './xhrio';
 import { XhrIoPool } from './xhriopool';
+// Firebase SDK version
+import { version } from '../../../../package.json';
 
 export interface Request<T> {
   getPromise(): Promise<T>;
@@ -268,9 +269,7 @@ export function addAuthHeader_(
 }
 
 export function addVersionHeader_(headers: Headers): void {
-  const version =
-    typeof firebase !== 'undefined' ? firebase.SDK_VERSION : 'AppManager';
-  headers['X-Firebase-Storage-Version'] = 'webjs/' + version;
+  headers['X-Firebase-Storage-Version'] = 'webjs/' + (version ?? 'AppManager');
 }
 
 export function addGmpidHeader_(headers: Headers, appId: string | null): void {

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

@@ -16,16 +16,16 @@
  */
 import { assert } from 'chai';
 import * as sinon from 'sinon';
-import firebase from '@firebase/app';
 import { makeRequest } from '../../src/implementation/request';
 import { RequestInfo } from '../../src/implementation/requestinfo';
 import { XhrIo } from '../../src/implementation/xhrio';
 import { makePool } from './testshared';
 import { TestingXhrIo } from './xhrio';
+import { version } from '../../../../package.json';
 
 describe('Firebase Storage > Request', () => {
   const versionHeaderName = 'X-Firebase-Storage-Version';
-  const versionHeaderValue = 'webjs/' + firebase.SDK_VERSION;
+  const versionHeaderValue = 'webjs/' + version;
   const timeout = 60 * 1000;
 
   it('Simple success request works', () => {