make compat work in runtime

Author: Feiyang1

packages/storage/compat/index.ts

@@ -20,10 +20,8 @@ import { _FirebaseNamespace } from '@firebase/app-types/private';
 import { StringFormat } from '../src/implementation/string';
 import { TaskEvent, TaskState } from '../src/implementation/taskenums';
 
-import { XhrIoPool } from '../src/implementation/xhriopool';
 import { ReferenceCompat } from './reference';
 import { StorageServiceCompat } from './service';
-import { StorageService } from '../src/service';
 import * as types from '@firebase/storage-types';
 import {
   Component,
@@ -34,6 +32,8 @@ import {
 
 import { name, version } from '../package.json';
 
+import '../register-module';
+
 /**
  * Type constant for Firebase Storage.
  */
@@ -44,21 +44,16 @@ function factory(
   { instanceIdentifier: url }: InstanceFactoryOptions
 ): types.FirebaseStorage {
   // Dependencies
-  // TODO: This should eventually be 'app-compat'
-  const app = container.getProvider('app').getImmediate();
-  const authProvider = container.getProvider('auth-internal');
+  const app = container.getProvider('app-compat').getImmediate();
+  const storageExp = container
+    .getProvider('storage-exp')
+    .getImmediate({ identifier: url });
 
   // TODO: get StorageService instance from component framework instead
   // of creating a new one.
   const storageServiceCompat: StorageServiceCompat = new StorageServiceCompat(
     app,
-    new StorageService(
-      app,
-      authProvider,
-      new XhrIoPool(),
-      url,
-      firebase.SDK_VERSION
-    )
+    storageExp
   );
   return storageServiceCompat;
 }
@@ -69,7 +64,7 @@ export function registerStorage(instance: _FirebaseNamespace): void {
     TaskState,
     TaskEvent,
     StringFormat,
-    Storage: StorageService,
+    Storage: StorageServiceCompat,
     Reference: ReferenceCompat
   };
   instance.INTERNAL.registerComponent(

packages/storage/compat/package.json

@@ -8,6 +8,6 @@
     "module": "../dist/compat/esm5/index.js",
     "esm2017": "../dist/compat/esm2017/index.js",
     "license": "Apache-2.0",
-    "typings": "../dist/compat/esm5/packages/firestore/compat/index.d.ts"
+    "typings": "../dist/compat/esm5/compat/index.d.ts"
   }
 

packages/storage/index.ts

@@ -34,6 +34,8 @@ import {
 
 import { name, version } from './package.json';
 
+import './register-module';
+
 /**
  * Type constant for Firebase Storage.
  */
@@ -82,35 +84,3 @@ export function registerStorage(instance: _FirebaseNamespace): void {
 }
 
 registerStorage(firebase as _FirebaseNamespace);
-
-/**
- * Define extension behavior for `registerStorage`
- */
-declare module '@firebase/app-types' {
-  interface FirebaseNamespace {
-    storage?: {
-      (app?: FirebaseApp, url?: string): types.FirebaseStorage;
-      Storage: typeof types.FirebaseStorage;
-
-      StringFormat: {
-        BASE64: types.StringFormat;
-        BASE64URL: types.StringFormat;
-        DATA_URL: types.StringFormat;
-        RAW: types.StringFormat;
-      };
-      TaskEvent: {
-        STATE_CHANGED: types.TaskEvent;
-      };
-      TaskState: {
-        CANCELED: types.TaskState;
-        ERROR: types.TaskState;
-        PAUSED: types.TaskState;
-        RUNNING: types.TaskState;
-        SUCCESS: types.TaskState;
-      };
-    };
-  }
-  interface FirebaseApp {
-    storage?(storageBucket?: string): types.FirebaseStorage;
-  }
-}

packages/storage/register-module.ts

@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as types from '@firebase/storage-types';
+
+/**
+ * Define extension behavior for `registerStorage`
+ */
+declare module '@firebase/app-types' {
+  interface FirebaseNamespace {
+    storage?: {
+      (app?: FirebaseApp, url?: string): types.FirebaseStorage;
+      Storage: typeof types.FirebaseStorage;
+
+      StringFormat: {
+        BASE64: types.StringFormat;
+        BASE64URL: types.StringFormat;
+        DATA_URL: types.StringFormat;
+        RAW: types.StringFormat;
+      };
+      TaskEvent: {
+        STATE_CHANGED: types.TaskEvent;
+      };
+      TaskState: {
+        CANCELED: types.TaskState;
+        ERROR: types.TaskState;
+        PAUSED: types.TaskState;
+        RUNNING: types.TaskState;
+        SUCCESS: types.TaskState;
+      };
+    };
+  }
+  interface FirebaseApp {
+    storage?(storageBucket?: string): types.FirebaseStorage;
+  }
+}

packages/storage/rollup.config.compat.js

@@ -60,7 +60,10 @@ const es5Builds = [
       }
     ],
     plugins: es5BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    treeshake: {
+      moduleSideEffects: false
+    }
   }
 ];
 
@@ -96,7 +99,10 @@ const es2017Builds = [
       sourcemap: true
     },
     plugins: es2017BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    treeshake: {
+      moduleSideEffects: false
+    }
   }
 ];