Cleanup build tree a bit

Author: avolkovi

packages-exp/auth-exp/demo/rollup.config.js

@@ -38,25 +38,27 @@ const es5Builds = [
   {
     input: 'src/index.js',
     output: [{ file: pkg.bundle, format: 'esm', sourcemap: true }],
-    plugins: commonPlugins,
+    plugins: commonPlugins
   },
   {
     input: 'src/worker/index.ts',
     output: [{ file: pkg.worker, format: 'esm', sourcemap: true }],
-    plugins: [...commonPlugins,
+    plugins: [
+      ...commonPlugins,
       typescriptPlugin({
-      typescript,
-      tsconfigOverride: {
-        compilerOptions: {
-          lib: [
-            // TODO: remove this
-            "dom",
-            "es6",
-            "webworker"
-          ]
+        typescript,
+        tsconfigOverride: {
+          compilerOptions: {
+            lib: [
+              // TODO: remove this
+              'dom',
+              'es2015',
+              'webworker'
+            ]
+          }
         }
-      }
-      })],
+      })
+    ]
   }
 ];
 

packages-exp/auth-exp/demo/src/index.js

@@ -59,7 +59,7 @@ import {
   // linkWithPopup,
   // reauthenticateWithPopup,
   // browserPopupRedirectResolver
-} from '@firebase/auth-exp';
+} from '@firebase/auth-exp/dist/index.browser';
 
 import { config } from './config';
 import {

packages-exp/auth-exp/demo/src/worker/index.ts

@@ -22,7 +22,7 @@ import {
   inMemoryPersistence,
   signInAnonymously,
   signInWithEmailAndPassword,
-  updateProfile,
+  updateProfile
 } from '@firebase/auth-exp/dist/index.webworker';
 import { OAuthCredential, User } from '@firebase/auth-types-exp';
 
@@ -45,14 +45,15 @@ const auth = initializeAuth(app, {
  *     available. Otherwise, the promise resolves with null.
  */
 function getIdToken(): Promise<string | null> {
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     auth.onAuthStateChanged((user: User | null) => {
       if (user) {
-        user.getIdToken().then(resolve).catch(
-          () => {
+        user
+          .getIdToken()
+          .then(resolve)
+          .catch(() => {
             resolve(null);
-          }
-        );
+          });
       } else {
         resolve(null);
       }
@@ -168,7 +169,7 @@ self.onmessage = (e: MessageEvent) => {
             ctx.postMessage({
               type: e.data.type,
               idToken,
-              uid: auth.currentUser?.uid,
+              uid: auth.currentUser?.uid
             });
           })
           .catch(error => {
@@ -180,7 +181,7 @@ self.onmessage = (e: MessageEvent) => {
           .then(() => {
             ctx.postMessage({
               type: e.data.type,
-              status: 'success',
+              status: 'success'
             });
           })
           .catch(error => {

packages-exp/auth-exp/index.ts renamed to packages-exp/auth-exp/index.browser.ts

@@ -15,21 +15,17 @@
  * limitations under the License.
  */
 
-import * as externs from '@firebase/auth-types-exp';
-import { CompleteFn, ErrorFn, Unsubscribe } from '@firebase/util';
-
 // Core functionality shared by all browser based clients
 export * from './index.webworker';
 
-// Additional DOM dependend functionality 
+// Additional DOM dependend functionality
 
 // core/persistence
 export {
   browserLocalPersistence,
   browserSessionPersistence
 } from './src/core/persistence/browser';
 export { indexedDBLocalPersistence } from './src/core/persistence/indexed_db';
-export { getReactNativePersistence } from './src/core/persistence/react_native';
 
 // core/strategies
 export {

packages-exp/auth-exp/index.node.ts

@@ -19,5 +19,8 @@
  * This is the file that people using Node.js will actually import. You should
  * only include this file if you have something specific about your
  * implementation that mandates having a separate entrypoint. Otherwise you can
- * just use index.ts
+ * just use index.browser.ts
  */
+
+// Core functionality shared by all clients
+export * from './index.webworker';

packages-exp/auth-exp/package.json

@@ -5,10 +5,10 @@
   "description": "TODO",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
-  "browser": "dist/index.cjs.js",
-  "module": "dist/index.esm.js",
+  "browser": "dist/index.browser.esm5.js",
+  "module": "dist/index.node.esm5.js",
   "esm2017": "dist/index.esm2017.js",
-  "webworker": "dist/index.webworker.js",
+  "webworker": "dist/index.webworker.esm5.js",
   "files": [
     "dist"
   ],

packages-exp/auth-exp/rollup.config.js

@@ -48,20 +48,14 @@ const es5Builds = [
    * Browser Builds
    */
   {
-    input: 'index.ts',
-    output: [{ file: pkg.browser, format: 'cjs', sourcemap: true }],
-    plugins: es5BuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
-  },
-  {
-    input: 'index.ts',
-    output: [{ file: pkg.module, format: 'es', sourcemap: true }],
+    input: 'index.browser.ts',
+    output: [{ file: pkg.browser, format: 'es', sourcemap: true }],
     plugins: es5BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   /**
-  * Web Worker Build (compiled without DOM)
-  */
+   * Web Worker Build (compiled without DOM)
+   */
   {
     input: 'index.webworker.ts',
     output: [{ file: pkg.webworker, format: 'es', sourcemap: true }],
@@ -73,9 +67,9 @@ const es5Builds = [
           compilerOptions: {
             lib: [
               // Remove dom after we figure out why navigator stuff doesn't exist
-              "dom", 
-              "es6",
-              "webworker"
+              'dom',
+              'es2015',
+              'webworker'
             ]
           }
         }
@@ -88,7 +82,10 @@ const es5Builds = [
    */
   {
     input: 'index.node.ts',
-    output: [{ file: pkg.main, format: 'cjs', sourcemap: true }],
+    output: [
+      { file: pkg.main, format: 'cjs', sourcemap: true },
+      { file: pkg.module, format: 'esm', sourcemap: true }
+    ],
     plugins: es5BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   }
@@ -114,7 +111,7 @@ const es2017Builds = [
    *  Browser Builds
    */
   {
-    input: 'index.ts',
+    input: 'index.browser.ts',
     output: {
       file: pkg.esm2017,
       format: 'es',