Merge 955efa2 into 4e7c78b

Author: hsubox76

packages-exp/functions-compat/src/register.ts

@@ -24,10 +24,13 @@ import {
   Component,
   ComponentType,
   InstanceFactory,
-  ComponentContainer
+  ComponentContainer,
+  InstanceFactoryOptions
 } from '@firebase/component';
 import { Functions as FunctionsServiceExp } from '@firebase/functions-exp';
 
+const DEFAULT_REGION = 'us-central1';
+
 declare module '@firebase/component' {
   interface NameServiceMapping {
     'app-compat': FirebaseApp;
@@ -38,14 +41,14 @@ declare module '@firebase/component' {
 
 const factory: InstanceFactory<'functions-compat'> = (
   container: ComponentContainer,
-  regionOrCustomDomain?: string
+  { instanceIdentifier: regionOrCustomDomain }: InstanceFactoryOptions
 ) => {
   // Dependencies
   const app = container.getProvider('app-compat').getImmediate();
   const functionsServiceExp = container
     .getProvider('functions-exp')
     .getImmediate({
-      identifier: regionOrCustomDomain
+      identifier: regionOrCustomDomain ?? DEFAULT_REGION
     });
 
   return new FunctionsService(app, functionsServiceExp);

packages-exp/functions-exp/src/config.ts

@@ -25,8 +25,6 @@ import {
 } from '@firebase/component';
 import { FUNCTIONS_TYPE } from './constants';
 
-export const DEFAULT_REGION = 'us-central1';
-
 export function registerFunctions(fetchImpl: typeof fetch): void {
   const factory: InstanceFactory<'functions'> = (
     container: ComponentContainer,