Merge branch 'master' into ss-v9-compat

samtstern · web-flow · commit 9889cb510a76 · 2021-07-23T10:08:40.000+01:00
diff --git a/analytics-next/package.json b/analytics-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/analytics/package.json b/analytics/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/appcheck-next/package.json b/appcheck-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/appcheck/package.json b/appcheck/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^8.7.1"
+    "firebase": "^8.8.0"
   }
 }
diff --git a/auth-next/emulator-suite.js b/auth-next/emulator-suite.js
@@ -3,10 +3,10 @@
 
 function emulatorConnect() {
   // [START auth_emulator_connect]
-  const { getAuth, useAuthEmulator } = require("firebase/auth");
+  const { getAuth, connectAuthEmulator } = require("firebase/auth");
 
   const auth = getAuth();
-  useAuthEmulator(auth, "http://localhost:9099");
+  connectAuthEmulator(auth, "http://localhost:9099");
   // [END auth_emulator_connect]
 }
 
diff --git a/auth-next/package.json b/auth-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/auth/package.json b/auth/package.json
@@ -6,7 +6,7 @@
   },
   "license": "Apache 2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6".7.1",
-    "firebaseui": "^4.8.0"
+    "firebase": "^9.0.0-beta.7",
+    "firebaseui": "^4.8.1"
   }
 }
diff --git a/database-next/emulator-suite.js b/database-next/emulator-suite.js
@@ -3,12 +3,12 @@
 
 function onDocumentReady() {
   // [START rtdb_emulator_connect]
-  const { getDatabase, useDatabaseEmulator } = require("firebase/database");
+  const { getDatabase, connectDatabaseEmulator } = require("firebase/database");
 
   const db = getDatabase();
   if (location.hostname === "localhost") {
     // Point to the RTDB emulator running on localhost.
-    useDatabaseEmulator(db, "localhost", 9000);
+    connectDatabaseEmulator(db, "localhost", 9000);
   } 
   // [END rtdb_emulator_connect]
 }
diff --git a/database-next/package.json b/database-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/database/package.json b/database/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache 2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
   }
 }
diff --git a/firebaseapp-next/package.json b/firebaseapp-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/firebaseapp/package.json b/firebaseapp/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
   }
 }
diff --git a/firestore-next/emulator-suite.js b/firestore-next/emulator-suite.js
@@ -3,10 +3,10 @@
 
 function onDocumentReady() {
   // [START fs_emulator_connect]
-  const { getFirestore, useFirestoreEmulator } = require("firebase/firestore");
+  const { getFirestore, connectFirestoreEmulator } = require("firebase/firestore");
 
   // firebaseApps previously initialized using initializeApp()
   const db = getFirestore();
-  useFirestoreEmulator(db, 'localhost', 8080);
+  connectFirestoreEmulator(db, 'localhost', 8080);
   // [END fs_emulator_connect]
 }
diff --git a/firestore-next/package.json b/firestore-next/package.json
@@ -6,7 +6,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6",
+    "firebase": "^9.0.0-beta.7",
     "geofire-common": "^5.1.0"
   },
   "devDependencies": {
diff --git a/firestore/package.json b/firestore/package.json
@@ -6,7 +6,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
     "geofire-common": "^5.1.0"
   },
   "devDependencies": {
diff --git a/functions-next/emulator-suite.js b/functions-next/emulator-suite.js
@@ -12,10 +12,10 @@ initializeApp({
 export function emulatorSettings() {
   // [START fb_functions_emulator_connect]
   const { getApp } = require("firebase/app");
-  const { getFunctions, useFunctionsEmulator } = require("firebase/functions");
+  const { getFunctions, connectFunctionsEmulator } = require("firebase/functions");
 
   const functions = getFunctions(getApp());
-  useFunctionsEmulator(functions, "localhost", 5001);
+  connectFunctionsEmulator(functions, "localhost", 5001);
   // [END fb_functions_emulator_connect]
 }
 
diff --git a/functions-next/package.json b/functions-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/functions/package.json b/functions/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
   }
 }
diff --git a/installations/package.json b/installations/package.json
@@ -4,6 +4,6 @@
   "scripts": {},
   "license": "Apache 2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
   }
 }
diff --git a/messaging-next/package.json b/messaging-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/messaging/package.json b/messaging/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
   }
 }
diff --git a/perf-next/package.json b/perf-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/perf/package.json b/perf/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
   }
 }
diff --git a/remoteconfig-next/package.json b/remoteconfig-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/remoteconfig/package.json b/remoteconfig/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
   }
 }
diff --git a/snippets/auth-next/emulator-suite/auth_emulator_connect.js b/snippets/auth-next/emulator-suite/auth_emulator_connect.js
@@ -4,8 +4,8 @@
 // To make edits to the snippets in this file, please edit the source
 
 // [START auth_emulator_connect_modular]
-import { getAuth, useAuthEmulator } from "firebase/auth";
+import { getAuth, connectAuthEmulator } from "firebase/auth";
 
 const auth = getAuth();
-useAuthEmulator(auth, "http://localhost:9099");
+connectAuthEmulator(auth, "http://localhost:9099");
 // [END auth_emulator_connect_modular]
diff --git a/snippets/database-next/emulator-suite/rtdb_emulator_connect.js b/snippets/database-next/emulator-suite/rtdb_emulator_connect.js
@@ -4,11 +4,11 @@
 // To make edits to the snippets in this file, please edit the source
 
 // [START rtdb_emulator_connect_modular]
-import { getDatabase, useDatabaseEmulator } from "firebase/database";
+import { getDatabase, connectDatabaseEmulator } from "firebase/database";
 
 const db = getDatabase();
 if (location.hostname === "localhost") {
   // Point to the RTDB emulator running on localhost.
-  useDatabaseEmulator(db, "localhost", 9000);
+  connectDatabaseEmulator(db, "localhost", 9000);
 } 
 // [END rtdb_emulator_connect_modular]
diff --git a/snippets/firestore-next/emulator-suite/fs_emulator_connect.js b/snippets/firestore-next/emulator-suite/fs_emulator_connect.js
@@ -4,9 +4,9 @@
 // To make edits to the snippets in this file, please edit the source
 
 // [START fs_emulator_connect_modular]
-import { getFirestore, useFirestoreEmulator } from "firebase/firestore";
+import { getFirestore, connectFirestoreEmulator } from "firebase/firestore";
 
 // firebaseApps previously initialized using initializeApp()
 const db = getFirestore();
-useFirestoreEmulator(db, 'localhost', 8080);
+connectFirestoreEmulator(db, 'localhost', 8080);
 // [END fs_emulator_connect_modular]
diff --git a/snippets/functions-next/emulator-suite/fb_functions_emulator_connect.js b/snippets/functions-next/emulator-suite/fb_functions_emulator_connect.js
@@ -5,8 +5,8 @@
 
 // [START fb_functions_emulator_connect_modular]
 import { getApp } from "firebase/app";
-import { getFunctions, useFunctionsEmulator } from "firebase/functions";
+import { getFunctions, connectFunctionsEmulator } from "firebase/functions";
 
 const functions = getFunctions(getApp());
-useFunctionsEmulator(functions, "localhost", 5001);
+connectFunctionsEmulator(functions, "localhost", 5001);
 // [END fb_functions_emulator_connect_modular]
diff --git a/storage-next/package.json b/storage-next/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7"
   }
 }
diff --git a/storage/package.json b/storage/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^9.0.0-beta.6"
+    "firebase": "^9.0.0-beta.7",
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@`
`6`	`6`	`},`
`7`	`7`	`"license": "Apache-2.0",`
`8`	`8`	`"dependencies": {`
`9`		`- "firebase": "^9.0.0-beta.6"`
	`9`	`+ "firebase": "^9.0.0-beta.7"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`},`
`7`	`7`	`"license": "Apache 2.0",`
`8`	`8`	`"dependencies": {`
`9`		`- "firebase": "^9.0.0-beta.6".7.1",`
`10`		`- "firebaseui": "^4.8.0"`
	`9`	`+ "firebase": "^9.0.0-beta.7",`
	`10`	`+ "firebaseui": "^4.8.1"`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@`
`3`	`3`
`4`	`4`	`function onDocumentReady() {`
`5`	`5`	`// [START rtdb_emulator_connect]`
`6`		`- const { getDatabase, useDatabaseEmulator } = require("firebase/database");`
	`6`	`+ const { getDatabase, connectDatabaseEmulator } = require("firebase/database");`
`7`	`7`
`8`	`8`	`const db = getDatabase();`
`9`	`9`	`if (location.hostname === "localhost") {`
`10`	`10`	`// Point to the RTDB emulator running on localhost.`
`11`		`- useDatabaseEmulator(db, "localhost", 9000);`
	`11`	`+ connectDatabaseEmulator(db, "localhost", 9000);`
`12`	`12`	`}`
`13`	`13`	`// [END rtdb_emulator_connect]`
`14`	`14`	`}`