Merge branch 'master' into funcs

dwyfrequency · web-flow · commit baba214702b2 · 2022-04-27T13:05:11.000-04:00
diff --git a/config/functions/package.json b/config/functions/package.json
@@ -3,7 +3,7 @@
   "description": "Cloud Functions for Firebase",
   "dependencies": {
     "cors": "2.8.5",
-    "firebase-admin": "9.11.1",
+    "firebase-admin": "9.12.0",
     "firebase-functions": "3.20.0"
   },
   "private": true,
diff --git a/packages/auth-compat/demo/functions/package.json b/packages/auth-compat/demo/functions/package.json
@@ -9,7 +9,7 @@
     "logs": "firebase functions:log"
   },
   "dependencies": {
-    "firebase-admin": "8.13.0",
+    "firebase-admin": "9.12.0",
     "firebase-functions": "3.20.0"
   },
   "private": true
diff --git a/packages/auth/demo/functions/package.json b/packages/auth/demo/functions/package.json
@@ -9,7 +9,7 @@
     "logs": "firebase functions:log"
   },
   "dependencies": {
-    "firebase-admin": "8.13.0",
+    "firebase-admin": "9.12.0",
     "firebase-functions": "3.20.0"
   },
   "private": true,
diff --git a/packages/rules-unit-testing/functions/package.json b/packages/rules-unit-testing/functions/package.json
@@ -8,7 +8,7 @@
   },
   "private": true,
   "dependencies": {
-    "firebase-admin": "9.11.1",
+    "firebase-admin": "9.12.0",
     "firebase-functions": "3.20.0"
   }
 }
diff --git a/scripts/docgen-compat/content-sources/js/toc.yaml b/scripts/docgen-compat/content-sources/js/toc.yaml
@@ -28,6 +28,8 @@ toc:
     path: /docs/reference/js/v8/firebase.appcheck.CustomProvider
   - title: "CustomProviderOptions"
     path: /docs/reference/js/v8/firebase.appcheck.CustomProviderOptions
+  - title: "ReCaptchaEnterpriseProvider"
+    path: /docs/reference/js/v8/firebase.appcheck.ReCaptchaEnterpriseProvider
   - title: "ReCaptchaV3Provider"
     path: /docs/reference/js/v8/firebase.appcheck.ReCaptchaV3Provider
 
@@ -154,6 +156,8 @@ toc:
     path: /docs/reference/js/v8/firebase.database.ServerValue
   - title: "ThenableReference"
     path: /docs/reference/js/v8/firebase.database.ThenableReference
+  - title: "TransactionResult"
+    path: /docs/reference/js/v8/firebase.database.TransactionResult
 
 - title: "firebase.firestore"
   path: /docs/reference/js/v8/firebase.firestore
diff --git a/scripts/docgen-compat/content-sources/node/toc.yaml b/scripts/docgen-compat/content-sources/node/toc.yaml
@@ -112,6 +112,8 @@ toc:
     path: /docs/reference/node/firebase.database.ServerValue
   - title: "ThenableReference"
     path: /docs/reference/node/firebase.database.ThenableReference
+  - title: "TransactionResult"
+    path: /docs/reference/node/firebase.database.TransactionResult
 
 - title: "firebase.firestore"
   path: /docs/reference/node/firebase.firestore

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`},`
`9`	`9`	`"private": true,`
`10`	`10`	`"dependencies": {`
`11`		`- "firebase-admin": "9.11.1",`
	`11`	`+ "firebase-admin": "9.12.0",`
`12`	`12`	`"firebase-functions": "3.20.0"`
`13`	`13`	`}`
`14`	`14`	`}`