Update dependencies (#49)

samtstern · dpebot · web-flow · commit 043cc5ac8786 · 2020-10-27T16:53:45.000-04:00
Co-authored-by: DPE bot &lt;dpebot@google.com&gt;
diff --git a/auth/link-multiple-accounts.js b/auth/link-multiple-accounts.js
@@ -1,7 +1,9 @@
 // These samples are intended for Web so this import would normally be
 // done in HTML however using modules here is more convenient for
 // ensuring sample correctness offline.
-const firebase = require('firebase');
+import firebase from "firebase/app";
+import "firebase/auth";
+
 const auth = firebase.auth();
 
 const MyUserDataRepo = function() {};
diff --git a/auth/package.json b/auth/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache 2.0",
   "dependencies": {
-    "firebase": "^7.24.0"
+    "firebase": "^8.0.0"
   }
 }
diff --git a/database/emulator-suite.js b/database/emulator-suite.js
@@ -2,27 +2,20 @@
 // These samples are intended for Web so this import would normally be
 // done in HTML however using modules here is more convenient for
 // ensuring sample correctness offline.
-var firebase = require("firebase/app");
-require("firebase/database");
+import firebase from "firebase/app";
+import "firebase/database";
 
-function onDocumentReady(firebase) {
+function onDocumentReady() {
   //[START rtdb_emulator_connect]
+  var db = firebase.database();
   if (location.hostname === "localhost") {
-
-    var firebaseConfig = {
-      // Point to the RTDB emulator running on localhost.
-      // In almost all cases the ns (namespace) is your project ID.
-      databaseURL: "http://localhost:9000?ns=YOUR_DATABASE_NAMESPACE"
-    }
-
-    var myApp = firebase.initializeApp(firebaseConfig);
-    var db = myApp.database();
+    // Point to the RTDB emulator running on localhost.
+    db.useEmulator("localhost", 9000);
   } 
   // [END rtdb_emulator_connect]
 }
 
-function flushRealtimeDatabase(firebase) {
-
+function flushRealtimeDatabase() {
   //[START rtdb_emulator_flush]
   // With a database Reference, write null to clear the database.
   firebase.database().ref().set(null);
diff --git a/database/package.json b/database/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache 2.0",
   "dependencies": {
-    "firebase": "^7.24.0"
+    "firebase": "^8.0.0"
   }
 }
diff --git a/database/read-and-write.js b/database/read-and-write.js
@@ -1,8 +1,8 @@
 // These samples are intended for Web so this import would normally be
 // done in HTML however using modules here is more convenient for
 // ensuring sample correctness offline.
-var firebase = require("firebase/app");
-require("firebase/database");
+import firebase from "firebase/app";
+import "firebase/database";
 
 // [START rtdb_write_new_user]
 function writeUserData(userId, name, email, imageUrl) {
diff --git a/firebaseapp/firebaseapp.js b/firebaseapp/firebaseapp.js
@@ -1,4 +1,4 @@
-var firebase = require('firebase/app');
+import firebase  from 'firebase/app';
 
 function multpleFirebaseApps() {
     // [START firebase_options]
diff --git a/firebaseapp/package.json b/firebaseapp/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^7.24.0"
+    "firebase": "^8.0.0"
   }
 }
diff --git a/firestore-next/package.json b/firestore-next/package.json
@@ -6,7 +6,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^7.24.0"
+    "firebase": "exp"
   },
   "devDependencies": {
     "@types/chai": "^4.2.12",
diff --git a/firestore/emulator-suite.js b/firestore/emulator-suite.js
@@ -1,15 +1,12 @@
-const firebase = require('firebase');
-require('firebase/firestore');
+import firebase from "firebase/app";
+import 'firebase/firestore';
 
-function onDocumentReady(firebaseApp) {
+function onDocumentReady() {
   //[START fs_emulator_connect]
   // Firebase previously initialized using firebase.initializeApp().
   var db = firebase.firestore();
   if (location.hostname === "localhost") {
-    db.settings({
-      host: "localhost:8080",
-      ssl: false
-    });
+    db.useEmulator("localhost", 8080);
   }
   // [END fs_emulator_connect]
 }
diff --git a/firestore/package.json b/firestore/package.json
@@ -6,7 +6,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^7.24.0"
+    "firebase": "^8.0.0"
   },
   "devDependencies": {
     "@types/chai": "^4.2.12",
diff --git a/firestore/test.firestore.js b/firestore/test.firestore.js
@@ -1,5 +1,5 @@
-const firebase = require('firebase/app');
-require('firebase/firestore');
+import firebase from 'firebase/app';
+import 'firebase/firestore';
 
 const { expect } = require('chai');
 
diff --git a/firestore/test.solution-aggregation.js b/firestore/test.solution-aggregation.js
@@ -1,5 +1,5 @@
-var firebase = require('firebase/app');
-require('firebase/firestore');
+import firebase from 'firebase/app';
+import 'firebase/firestore';
 
 // [START sample_doc]
 var arinellDoc = {
diff --git a/firestore/test.solution-arrays.js b/firestore/test.solution-arrays.js
@@ -1,5 +1,5 @@
-var firebase = require('firebase/app');
-require('firebase/firestore');
+import firebase from 'firebase/app';
+import 'firebase/firestore';
 
 let postsWithArray = [
     // [START post_with_array]
diff --git a/firestore/test.solution-counters.js b/firestore/test.solution-counters.js
@@ -1,5 +1,5 @@
-var firebase = require('firebase/app');
-require('firebase/firestore');
+import firebase from 'firebase/app';
+import 'firebase/firestore';
 
 var db;
 
diff --git a/functions-next/emulator-suite.js b/functions-next/emulator-suite.js
@@ -9,20 +9,20 @@ initializeApp({
 
 export function emulatorSettings() {
   // [START functions_emulator_connect]
-  const { app } = require("firebase/app");
-  const { getFunctions, useFunctionsEmulator } = require( "firebase/functions");
+  const { getApp } = require("firebase/app");
+  const { getFunctions, useFunctionsEmulator } = require("firebase/functions");
 
-  const functions = getFunctions(app());
+  const functions = getFunctions(getApp());
   useFunctionsEmulator(functions, "http://localhost:5001");
   // [END functions_emulator_connect]
 }
 
 export async function callFunction() {
   // [START functions_callable_call]
-  const { app } = require("firebase/app");
-  const { getFunctions, httpsCallable } = require( "firebase/functions");
+  const { getApp } = require("firebase/app");
+  const { getFunctions, httpsCallable } = require("firebase/functions");
 
-  const functions = getFunctions(app());
+  const functions = getFunctions(getApp());
   const addMessage = httpsCallable(functions, 'addMessage');
 
   const result = await addMessage({ text: '<message text>'});
diff --git a/functions-next/package.json b/functions-next/package.json
@@ -7,6 +7,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^7.24.0"
+    "firebase": "exp"
   }
 }
diff --git a/functions/emulator-suite.js b/functions/emulator-suite.js
@@ -1,8 +1,8 @@
-var firebase = require('firebase/app');
-require('firebase/functions');
+import firebase from "firebase/app";
+import "firebase/functions";
 
 function emulatorSettings() {
   // [START functions_emulator_connect]
-  firebase.functions().useFunctionsEmulator("http://localhost:5001")
+  firebase.functions().useEmulator("localhost", 5001);
   // [END functions_emulator_connect]
 }
diff --git a/functions/package.json b/functions/package.json
@@ -6,6 +6,6 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "^7.24.0"
+    "firebase": "^8.0.0"
   }
 }
diff --git a/installations/index.js b/installations/index.js
@@ -1,5 +1,5 @@
-const firebase = require("firebase/app");
-require("firebase/installations");
+import firebase from "firebase/app";
+import "firebase/installations";
 
 async function deleteInstallation() {
   try {
diff --git a/installations/package.json b/installations/package.json
@@ -4,6 +4,6 @@
   "scripts": {},
   "license": "Apache 2.0",
   "dependencies": {
-    "firebase": "^7.24.0"
+    "firebase": "^8.0.0"
   }
 }
diff --git a/snippets/functions-next/emulator-suite/functions_callable_call.js b/snippets/functions-next/emulator-suite/functions_callable_call.js
@@ -4,10 +4,10 @@
 // To make edits to the snippets in this file, please edit the source
 
 // [START modular_functions_callable_call]
-import { app } from "firebase/app";
-import { getFunctions, httpsCallable } from  "firebase/functions";
+import { getApp } from "firebase/app";
+import { getFunctions, httpsCallable } from "firebase/functions";
 
-const functions = getFunctions(app());
+const functions = getFunctions(getApp());
 const addMessage = httpsCallable(functions, 'addMessage');
 
 const result = await addMessage({ text: '<message text>'});
diff --git a/snippets/functions-next/emulator-suite/functions_emulator_connect.js b/snippets/functions-next/emulator-suite/functions_emulator_connect.js
@@ -4,9 +4,9 @@
 // To make edits to the snippets in this file, please edit the source
 
 // [START modular_functions_emulator_connect]
-import { app } from "firebase/app";
-import { getFunctions, useFunctionsEmulator } from  "firebase/functions";
+import { getApp } from "firebase/app";
+import { getFunctions, useFunctionsEmulator } from "firebase/functions";
 
-const functions = getFunctions(app());
+const functions = getFunctions(getApp());
 useFunctionsEmulator(functions, "http://localhost:5001");
 // [END modular_functions_emulator_connect]

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": "^7.24.0"`
	`9`	`+ "firebase": "^8.0.0"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var firebase = require('firebase/app');`
	`1`	`+import firebase from 'firebase/app';`
`2`	`2`
`3`	`3`	`function multpleFirebaseApps() {`
`4`	`4`	`// [START firebase_options]`
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": "^7.24.0"`
	`9`	`+ "firebase": "^8.0.0"`
`10`	`10`	`}`
`11`	`11`	`}`