Merging.

Author: egilmorez

.changeset/hip-dingos-judge.md

@@ -0,0 +1,7 @@
+---
+"@firebase/database": minor
+"firebase": minor
+"@firebase/util": minor
+---
+
+Add mockUserToken support for database emulator.

.changeset/loud-feet-jump.md

@@ -55,12 +55,12 @@ packages/messaging-types @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-a
 integration/messaging @zwu52 @chliangGoogle @ciarand @firebase/jssdk-global-approvers
 
 # Auth Code
-packages/auth  @bojeil-google @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
-packages/auth-types  @bojeil-google @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
+packages/auth  @bojeil-google @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
+packages/auth-types  @bojeil-google @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
 
 # Testing Code
-packages/testing  @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
-packages/rules-unit-testing  @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
+packages/testing  @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
+packages/rules-unit-testing  @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
 
 # RxFire Code
 packages/rxfire @davideast @jamesdaniels @firebase/jssdk-global-approvers
@@ -89,8 +89,8 @@ scripts/docgen/content-sources/ @firebase/firebase-techwriters @firebase/jssdk-g
 .changeset @firebase/firebase-techwriters @firebase/jssdk-changeset-approvers @firebase/firestore-js-team @firebase/jssdk-global-approvers
 
 # Auth-Exp Code
-packages-exp/auth-exp  @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
-packages-exp/auth-compat-exp @avolkovi @samhorlbeck @yuchenshi @firebase/jssdk-global-approvers
+packages-exp/auth-exp  @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
+packages-exp/auth-compat-exp @avolkovi @sam-gc @yuchenshi @firebase/jssdk-global-approvers
 
 # Installations-Exp Code
 packages/installations-exp @andirayo @ChaoqunCHEN @firebase/jssdk-global-approvers

.github/CODEOWNERS

@@ -4,9 +4,10 @@
 
 ```ts
 
+import { EmulatorMockTokenOptions } from '@firebase/util';
 import { FirebaseApp } from '@firebase/app';
 
-// @public (undocumented)
+// @public
 export function child(parent: Reference, path: string): Reference;
 
 // @public
@@ -229,7 +230,9 @@ export type Unsubscribe = () => void;
 export function update(ref: Reference, values: object): Promise<void>;
 
 // @public
-export function useDatabaseEmulator(db: FirebaseDatabase, host: string, port: number): void;
+export function useDatabaseEmulator(db: FirebaseDatabase, host: string, port: number, options?: {
+    mockUserToken?: EmulatorMockTokenOptions;
+}): void;
 
 
 ```

.github/ISSUE_TEMPLATE/alpha_bug_report.md

@@ -4,6 +4,7 @@
 
 ```ts
 
+import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
 import { CompleteFn } from '@firebase/util';
 import { FirebaseApp } from '@firebase/app';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';

common/api-review/database.api.md

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "8.4.0",
+    "firebase": "8.4.3",
     "@types/chai": "4.2.14",
     "@types/mocha": "7.0.2",
     "chai": "4.2.0",

common/api-review/storage.api.md

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@firebase/app": "0.6.20",
-    "@firebase/firestore": "2.2.4",
+    "@firebase/firestore": "2.2.5",
     "@types/mocha": "7.0.2",
     "gulp": "4.0.2",
     "gulp-filter": "6.0.0",

integration/firebase/package.json

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "8.4.0",
+    "firebase": "8.4.3",
     "chai": "4.2.0",
     "chromedriver": "89.0.0",
     "express": "4.17.1",

integration/firestore/package.json

@@ -5,9 +5,8 @@
   "private": true,
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "esm2017": "dist/index.esm2017.js",
+  "browser": "dist/index.esm2017.js",
+  "module": "dist/index.esm2017.js",
   "files": [
     "dist"
   ],
@@ -56,5 +55,6 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
-  }
-}
+  },
+  "esm5": "dist/index.esm.js"
+}

integration/messaging/package.json

@@ -29,7 +29,7 @@ export const es5BuildsNoPlugin = [
     input: 'src/index.ts',
     output: [
       { file: pkg.main, format: 'cjs', sourcemap: true },
-      { file: pkg.module, format: 'es', sourcemap: true }
+      { file: pkg.esm5, format: 'es', sourcemap: true }
     ],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   }
@@ -45,7 +45,7 @@ export const es2017BuildsNoPlugin = [
      */
     input: 'src/index.ts',
     output: {
-      file: pkg.esm2017,
+      file: pkg.browser,
       format: 'es',
       sourcemap: true
     },

packages-exp/analytics-compat/package.json

@@ -5,9 +5,8 @@
   "description": "A analytics package for new firebase packages",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "esm2017": "dist/index.esm2017.js",
+  "browser": "dist/index.esm2017.js",
+  "module": "dist/index.esm2017.js",
   "files": [
     "dist"
   ],
@@ -63,5 +62,6 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
-  }
-}
+  },
+  "esm5": "dist/index.esm.js"
+}

packages-exp/analytics-compat/rollup.shared.js

@@ -29,7 +29,7 @@ export const es5BuildsNoPlugin = [
     input: 'src/index.ts',
     output: [
       { file: pkg.main, format: 'cjs', sourcemap: true },
-      { file: pkg.module, format: 'es', sourcemap: true }
+      { file: pkg.esm5, format: 'es', sourcemap: true }
     ],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   }
@@ -45,7 +45,7 @@ export const es2017BuildsNoPlugin = [
      */
     input: 'src/index.ts',
     output: {
-      file: pkg.esm2017,
+      file: pkg.browser,
       format: 'es',
       sourcemap: true
     },

packages-exp/analytics-exp/package.json

@@ -5,11 +5,10 @@
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "private": true,
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm5.js",
-  "module": "dist/index.esm5.js",
-  "esm2017": "dist/index.esm2017.js",
+  "browser": "dist/index.esm2017.js",
+  "module": "dist/index.esm2017.js",
   "lite": "dist/index.lite.js",
-  "lite-esm2017": "dist/index.lite.esm2017.js",
+  "lite-esm5": "dist/index.lite.esm5.js",
   "files": [
     "dist"
   ],
@@ -58,5 +57,6 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
-  }
-}
+  },
+  "esm5": "dist/index.esm5.js"
+}

packages-exp/analytics-exp/rollup.shared.js

@@ -40,15 +40,15 @@ const es5Builds = [
     input: 'src/index.ts',
     output: [
       { file: pkg.main, format: 'cjs', sourcemap: true },
-      { file: pkg.module, format: 'es', sourcemap: true }
+      { file: pkg.esm5, format: 'es', sourcemap: true }
     ],
     plugins: es5BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   {
     input: 'src/index.lite.ts',
     output: {
-      file: pkg.lite,
+      file: pkg['lite-esm5'],
       format: 'es',
       sourcemap: true
     },
@@ -82,7 +82,7 @@ const es2017Builds = [
   {
     input: 'src/index.ts',
     output: {
-      file: pkg.esm2017,
+      file: pkg.browser,
       format: 'es',
       sourcemap: true
     },
@@ -92,7 +92,7 @@ const es2017Builds = [
   {
     input: 'src/index.lite.ts',
     output: {
-      file: pkg['lite-esm2017'],
+      file: pkg.lite,
       format: 'es',
       sourcemap: true
     },

packages-exp/app-compat/package.json

@@ -44,7 +44,7 @@ const es5Builds = [
     input: 'src/index.ts',
     output: [
       { file: pkg.main, format: 'cjs', sourcemap: true },
-      { file: pkg.module, format: 'es', sourcemap: true }
+      { file: pkg.esm5, format: 'es', sourcemap: true }
     ],
     plugins: es5BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`)),
@@ -55,7 +55,7 @@ const es5Builds = [
   {
     input: 'src/index.lite.ts',
     output: {
-      file: pkg.lite,
+      file: pkg['lite-esm5'],
       format: 'es',
       sourcemap: true
     },
@@ -94,7 +94,7 @@ const es2017Builds = [
   {
     input: 'src/index.ts',
     output: {
-      file: pkg.esm2017,
+      file: pkg.browser,
       format: 'es',
       sourcemap: true
     },
@@ -107,7 +107,7 @@ const es2017Builds = [
   {
     input: 'src/index.lite.ts',
     output: {
-      file: pkg['lite-esm2017'],
+      file: pkg.lite,
       format: 'es',
       sourcemap: true
     },

packages-exp/app-compat/rollup.config.js

@@ -5,9 +5,8 @@
   "description": "FirebaseApp",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
-  "browser": "dist/index.esm5.js",
-  "module": "dist/index.esm5.js",
-  "esm2017": "dist/index.esm2017.js",
+  "browser": "dist/index.esm2017.js",
+  "module": "dist/index.esm2017.js",
   "files": [
     "dist"
   ],
@@ -58,5 +57,6 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
-  }
-}
+  },
+  "esm5": "dist/index.esm5.js"
+}

packages-exp/app-compat/rollup.config.release.js

@@ -27,7 +27,7 @@ export const es5BuildsNoPlugin = [
    */
   {
     input: 'src/index.ts',
-    output: [{ file: pkg.browser, format: 'es', sourcemap: true }],
+    output: [{ file: pkg.esm5, format: 'es', sourcemap: true }],
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
   /**
@@ -47,7 +47,7 @@ export const es2017BuildsNoPlugin = [
   {
     input: 'src/index.ts',
     output: {
-      file: pkg.esm2017,
+      file: pkg.browser,
       format: 'es',
       sourcemap: true
     },

packages-exp/app-exp/package.json

@@ -5,9 +5,8 @@
   "description": "FirebaseAuth compatibility package that uses API style compatible with Firebase@7 and prior versions",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.node.cjs.js",
-  "browser": "dist/index.esm.js",
-  "module": "dist/index.esm.js",
-  "esm2017": "dist/index.esm2017.js",
+  "browser": "dist/index.esm2017.js",
+  "module": "dist/index.esm2017.js",
   "files": [
     "dist"
   ],
@@ -34,7 +33,7 @@
   },
   "dependencies": {
     "@firebase/auth-exp": "0.0.900",
-    "@firebase/auth-types": "0.10.2",
+    "@firebase/auth-types": "0.10.3",
     "@firebase/component": "0.4.1",
     "@firebase/util": "1.0.0",
     "node-fetch": "2.6.1",
@@ -64,5 +63,6 @@
       ".ts"
     ],
     "reportDir": "./coverage/node"
-  }
-}
+  },
+  "esm5": "dist/index.esm.js"
+}