Address PR comments

firebase · May 21, 2020 · c5ea05e · c5ea05e
1 parent 1177fa6
commit c5ea05e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/packages-exp/functions-exp/.eslintrc.js b/packages-exp/functions-exp/.eslintrc.js
@@ -29,7 +29,7 @@ module.exports = {
     'import/no-extraneous-dependencies': [
       'error',
       {
-        'packageDir': [path.resolve(__dirname, '../../'), './'],
+        'packageDir': [path.resolve(__dirname, '../../'), __dirname],
         devDependencies: true,
         peerDependencies: true
       }

diff --git a/packages-exp/functions-exp/package.json b/packages-exp/functions-exp/package.json
@@ -15,7 +15,7 @@
     "lint": "eslint -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "lint:fix": "eslint --fix -c .eslintrc.js '**/*.ts' --ignore-path '../../.gitignore'",
     "build": "rollup -c && yarn api-report",
-    "build:deps": "lerna run --scope @firebase/'{app-exp,functions-exp}' --include-dependencies build",
+    "build:deps": "lerna run --scope @firebase/functions-exp --include-dependencies build",
     "dev": "rollup -c -w",
     "test": "yarn type-check && run-p lint test:browser test:node",
     "test:ci": "node ../../scripts/run_tests_in_ci.js",
@@ -32,11 +32,13 @@
   },
   "license": "Apache-2.0",
   "peerDependencies": {
+    "@firebase/app-exp": "0.x",
     "@firebase/app-exp-types": "0.x"
   },
   "devDependencies": {
-    "@firebase/app-exp": "0.x",
+    "@firebase/app-exp": "0.0.800",
     "@firebase/messaging": "0.6.15",
+    "@firebase/util":  "0.2.46",
     "rollup": "2.7.6",
     "rollup-plugin-typescript2": "0.27.0",
     "typescript": "3.8.3"

diff --git a/packages-exp/functions-exp/src/callable.test.ts b/packages-exp/functions-exp/src/callable.test.ts
@@ -16,8 +16,7 @@
  */
 import { expect } from 'chai';
 import * as sinon from 'sinon';
-import { FirebaseApp } from '@firebase/app-types';
-import { _FirebaseApp } from '@firebase/app-types/private';
+import { FirebaseApp } from '@firebase/app-types-exp';
 import { FunctionsErrorCode } from '@firebase/functions-types-exp';
 import {
   Provider,

diff --git a/packages-exp/functions-exp/src/service.ts b/packages-exp/functions-exp/src/service.ts
@@ -29,6 +29,7 @@ import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { FirebaseMessagingName } from '@firebase/messaging-types';
 
 export const DEFAULT_REGION = 'us-central1';
+const serializer = new Serializer();
 
 /**
  * The response to an http request.
@@ -72,7 +73,6 @@ function failAfter(millis: number): Promise<never> {
  */
 export class FunctionsService {
   readonly contextProvider: ContextProvider;
-  readonly serializer = new Serializer();
   emulatorOrigin: string | null = null;
   cancelAllRequests: Promise<void>;
   deleteService!: Function;
@@ -205,7 +205,7 @@ async function call(
   const url = functionsInstance._url(name);
 
   // Encode any special types, such as dates, in the input data.
-  data = functionsInstance.serializer.encode(data);
+  data = serializer.encode(data);
   const body = { data };
 
   // Add a header for the authToken.
@@ -236,11 +236,7 @@ async function call(
   }
 
   // Check for an error status, regardless of http status.
-  const error = _errorForResponse(
-    response.status,
-    response.json,
-    functionsInstance.serializer
-  );
+  const error = _errorForResponse(response.status, response.json, serializer);
   if (error) {
     throw error;
   }
@@ -261,9 +257,7 @@ async function call(
   }
 
   // Decode any special types, such as dates, in the returned data.
-  const decodedData = functionsInstance.serializer.decode(
-    responseData as {} | null
-  );
+  const decodedData = serializer.decode(responseData as {} | null);
 
   return { data: decodedData };
 }
diff --git a/packages-exp/functions-exp/test/utils.ts b/packages-exp/functions-exp/test/utils.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { FirebaseOptions, FirebaseApp } from '@firebase/app-types';
+import { FirebaseOptions, FirebaseApp } from '@firebase/app-types-exp';
 import { Provider, ComponentContainer } from '@firebase/component';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { FirebaseMessagingName } from '@firebase/messaging-types';
@@ -36,8 +36,7 @@ export function makeFakeApp(options: FirebaseOptions = {}): FirebaseApp {
   return {
     name: 'appName',
     options,
-    automaticDataCollectionEnabled: true,
-    delete: async () => {}
+    automaticDataCollectionEnabled: true
   };
 }