Update build config and some types

Author: hsubox76

packages/storage-types/index.d.ts

@@ -84,8 +84,15 @@ export interface UploadMetadata extends SettableMetadata {
   md5Hash?: string | null;
 }
 
+export interface FirebaseStorageError {
+  name: string;
+  code: string;
+  message: string;
+  serverResponse: null | string;
+}
+
 export type NextFn<T> = (value: T) => void;
-export type ErrorFn = (error: Error | Error) => void;
+export type ErrorFn = (error: FirebaseStorageError) => void;
 export type CompleteFn = () => void;
 export type Unsubscribe = () => void;
 export interface StorageObserver<T> {
@@ -96,22 +103,22 @@ export interface StorageObserver<T> {
 
 export interface UploadTask {
   cancel(): boolean;
-  catch(onRejected: (a: Error) => any): Promise<any>;
+  catch(onRejected: (a: FirebaseStorageError) => any): Promise<any>;
   on(
     event: TaskEvent,
     nextOrObserver?:
       | Partial<StorageObserver<UploadTaskSnapshot>>
       | null
       | ((a: UploadTaskSnapshot) => unknown),
-    error?: ((a: Error) => any) | null,
+    error?: ((a: FirebaseStorageError) => any) | null,
     complete?: Unsubscribe | null
   ): Function;
   pause(): boolean;
   resume(): boolean;
   snapshot: UploadTaskSnapshot;
   then(
     onFulfilled?: ((a: UploadTaskSnapshot) => any) | null,
-    onRejected?: ((a: Error) => any) | null
+    onRejected?: ((a: FirebaseStorageError) => any) | null
   ): Promise<any>;
 }
 

packages/storage/exp/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@firebase/storage/exp",
   "description": "A tree-shakeable version of the Storage SDK",
-  "main": "../dist/exp/index.cjs.js",
-  "module": "../dist/exp/index.esm2017.js",
-  "browser": "../dist/exp/index.esm2017.js",
+  "main": "../dist/exp/index.node.umd.js",
+  "main-esm": "../dist/exp/index.node.esm2017.js",
+  "module": "../dist/exp/index.browser.esm2017.js",
+  "browser": "../dist/exp/index.browser.esm2017.js",
   "typings": "./dist/exp/index.d.ts",
   "private": true,
   "dependencies": {

packages/storage/package.json

@@ -6,7 +6,9 @@
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "esm2017": "dist/index.esm2017.js",
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
@@ -39,7 +41,9 @@
     "@firebase/auth": "0.14.9",
     "rollup": "2.28.1",
     "rollup-plugin-json": "4.0.0",
+    "rollup-plugin-sourcemaps": "0.6.2",
     "rollup-plugin-typescript2": "0.27.2",
+    "tmp": "0.2.1",
     "typescript": "4.0.2"
   },
   "repository": {

packages/storage/rollup.config.exp.js

@@ -15,66 +15,105 @@
  * limitations under the License.
  */
 
+import tmp from 'tmp';
 import json from 'rollup-plugin-json';
 import typescriptPlugin from 'rollup-plugin-typescript2';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 import typescript from 'typescript';
+import pkgExp from './exp/package.json';
 import pkg from './package.json';
 import path from 'path';
 
 const deps = Object.keys(
   Object.assign({}, pkg.peerDependencies, pkg.dependencies)
 ).concat('@firebase/app-exp');
 
-/**
- * ES5 Builds
- */
-const es5BuildPlugins = [
+const nodePlugins = [
+  typescriptPlugin({
+    typescript,
+    tsconfigOverride: {
+      compilerOptions: {
+        target: 'es2017'
+      }
+    },
+    cacheDir: tmp.dirSync(),
+    abortOnError: false
+  }),
+  json({ preferConst: true })
+];
+
+const browserPlugins = [
+  typescriptPlugin({
+    typescript,
+    tsconfigOverride: {
+      compilerOptions: {
+        target: 'es2017'
+      }
+    },
+    cacheDir: tmp.dirSync(),
+    abortOnError: false
+  }),
+  json({ preferConst: true })
+];
+
+const es2017ToEs5Plugins = [
   typescriptPlugin({
-    typescript
+    typescript,
+    compilerOptions: {
+      allowJs: true
+    },
+    include: ['dist/*.js', 'dist/exp/*.js']
   }),
-  json()
+  sourcemaps()
 ];
 
-const es5Builds = [
+const nodeBuilds = [
+  // Node ESM build
   {
     input: './exp/index.ts',
     output: {
-      file: path.resolve('./exp', pkg.main),
-      format: 'cjs',
+      file: path.resolve('./exp', pkgExp['main-esm']),
+      format: 'es',
       sourcemap: true
     },
-    plugins: es5BuildPlugins,
+    plugins: nodePlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
     treeshake: {
       moduleSideEffects: false
     }
-  }
-];
-
-/**
- * ES2017 Builds
- */
-const es2017BuildPlugins = [
-  typescriptPlugin({
-    typescript,
-    tsconfigOverride: {
-      compilerOptions: {
-        target: 'es2017'
+  },
+  // Node UMD build
+  {
+    input: path.resolve('./exp', pkgExp['main-esm']),
+    output: {
+      file: path.resolve('./exp', pkgExp.main),
+      format: 'umd',
+      name: 'firebase.storage',
+      sourcemap: true,
+      globals: {
+        'tslib': 'tslib',
+        '@firebase/app-exp': 'appExp',
+        '@firebase/app': 'firebase',
+        '@firebase/component': 'component'
       }
+    },
+    plugins: es2017ToEs5Plugins,
+    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
+    treeshake: {
+      moduleSideEffects: false
     }
-  }),
-  json({ preferConst: true })
+  }
 ];
 
-const es2017Builds = [
+const browserBuilds = [
   {
     input: './exp/index.ts',
     output: {
-      file: path.resolve('./exp', pkg.esm2017),
+      file: path.resolve('./exp', pkgExp.browser),
       format: 'es',
       sourcemap: true
     },
-    plugins: es2017BuildPlugins,
+    plugins: browserPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
     treeshake: {
       moduleSideEffects: false
@@ -83,4 +122,4 @@ const es2017Builds = [
 ];
 
 // eslint-disable-next-line import/no-default-export
-export default [...es5Builds, ...es2017Builds];
+export default [...nodeBuilds, ...browserBuilds];