From c9575b2361afc53904a303af90e0f091b6194c1a Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Tue, 23 Feb 2021 10:35:09 -0800 Subject: [PATCH 1/3] Remove functions-types-exp and clean app-types-exp --- .changeset/config.json | 1 - common/api-review/functions-exp.api.md | 43 ++++++++---- common/api-review/functions-types-exp.api.md | 67 ------------------- packages-exp/functions-compat/package.json | 1 - .../functions-compat/src/callable.test.ts | 2 +- packages-exp/functions-compat/src/register.ts | 2 +- packages-exp/functions-compat/src/service.ts | 2 +- packages-exp/functions-exp/package.json | 1 - packages-exp/functions-exp/src/api.ts | 18 +---- .../functions-exp/src/callable.test.ts | 2 +- packages-exp/functions-exp/src/error.ts | 2 +- .../src/public-types.ts} | 6 +- packages-exp/functions-exp/src/service.ts | 2 +- packages-exp/functions-types-exp/README.md | 3 - .../functions-types-exp/api-extractor.json | 5 -- packages-exp/functions-types-exp/package.json | 31 --------- .../functions-types-exp/tsconfig.json | 9 --- packages-exp/installations-exp/package.json | 3 +- packages/component/src/provider.test.ts | 2 +- .../prune-dts/tests/firestore.input.d.ts | 4 +- .../prune-dts/tests/firestore.output.d.ts | 4 +- yarn.lock | 17 ++++- 22 files changed, 62 insertions(+), 165 deletions(-) delete mode 100644 common/api-review/functions-types-exp.api.md rename packages-exp/{functions-types-exp/index.d.ts => functions-exp/src/public-types.ts} (97%) delete mode 100644 packages-exp/functions-types-exp/README.md delete mode 100644 packages-exp/functions-types-exp/api-extractor.json delete mode 100644 packages-exp/functions-types-exp/package.json delete mode 100644 packages-exp/functions-types-exp/tsconfig.json diff --git a/.changeset/config.json b/.changeset/config.json index df5d7815c91..471a680a234 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -20,7 +20,6 @@ "@firebase/auth-types-exp", "@firebase/functions-compat", "@firebase/functions-exp", - "@firebase/functions-types-exp", "@firebase/installations-exp", "@firebase/installations-types-exp", "@firebase/installations-compat", diff --git a/common/api-review/functions-exp.api.md b/common/api-review/functions-exp.api.md index 6b3e2eb481d..7f72b8170bf 100644 --- a/common/api-review/functions-exp.api.md +++ b/common/api-review/functions-exp.api.md @@ -5,30 +5,47 @@ ```ts import { FirebaseApp } from '@firebase/app-exp'; -import { Functions } from '@firebase/functions-types-exp'; -import { FunctionsError } from '@firebase/functions-types-exp'; -import { FunctionsErrorCode } from '@firebase/functions-types-exp'; -import { HttpsCallable } from '@firebase/functions-types-exp'; -import { HttpsCallableOptions } from '@firebase/functions-types-exp'; -import { HttpsCallableResult } from '@firebase/functions-types-exp'; +import { FirebaseError } from '@firebase/util'; -export { Functions } - -export { FunctionsError } +// @public +export interface Functions { + app: FirebaseApp; + customDomain: string | null; + region: string; +} + +// @public (undocumented) +export interface FunctionsError extends FirebaseError { + readonly code: FunctionsErrorCode; + readonly details?: unknown; +} -export { FunctionsErrorCode } +// @public +export type FunctionsErrorCode = 'ok' | 'cancelled' | 'unknown' | 'invalid-argument' | 'deadline-exceeded' | 'not-found' | 'already-exists' | 'permission-denied' | 'resource-exhausted' | 'failed-precondition' | 'aborted' | 'out-of-range' | 'unimplemented' | 'internal' | 'unavailable' | 'data-loss' | 'unauthenticated'; // @public export function getFunctions(app: FirebaseApp, regionOrCustomDomain?: string): Functions; -export { HttpsCallable } +// @public +export interface HttpsCallable { + // (undocumented) + (data?: {} | null): Promise; +} // @public export function httpsCallable(functionsInstance: Functions, name: string, options?: HttpsCallableOptions): HttpsCallable; -export { HttpsCallableOptions } +// @public +export interface HttpsCallableOptions { + // (undocumented) + timeout?: number; +} -export { HttpsCallableResult } +// @public +export interface HttpsCallableResult { + // (undocumented) + readonly data: unknown; +} // @public export function useFunctionsEmulator(functionsInstance: Functions, host: string, port: number): void; diff --git a/common/api-review/functions-types-exp.api.md b/common/api-review/functions-types-exp.api.md deleted file mode 100644 index 466816b7e1e..00000000000 --- a/common/api-review/functions-types-exp.api.md +++ /dev/null @@ -1,67 +0,0 @@ -## API Report File for "@firebase/functions-types-exp" - -> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). - -```ts - -import { FirebaseApp } from '@firebase/app-types-exp'; -import { FirebaseError } from '@firebase/util'; - -// @public -export interface Functions { - app: FirebaseApp; - - customDomain: string | null; - - region: string; -} - -// @public (undocumented) -export interface FunctionsError extends FirebaseError { - readonly code: FunctionsErrorCode; - - readonly details?: any; -} - -// @public -export type FunctionsErrorCode = - | 'ok' - | 'cancelled' - | 'unknown' - | 'invalid-argument' - | 'deadline-exceeded' - | 'not-found' - | 'already-exists' - | 'permission-denied' - | 'resource-exhausted' - | 'failed-precondition' - | 'aborted' - | 'out-of-range' - | 'unimplemented' - | 'internal' - | 'unavailable' - | 'data-loss' - | 'unauthenticated'; - -// @public -export interface HttpsCallable { - // (undocumented) - (data?: {} | null): Promise; -} - -// @public -export interface HttpsCallableOptions { - // (undocumented) - timeout?: number; // in millis -} - -// @public -export interface HttpsCallableResult { - // (undocumented) - readonly data: any; -} - - -// (No @packageDocumentation comment for this package) - -``` diff --git a/packages-exp/functions-compat/package.json b/packages-exp/functions-compat/package.json index fff08640331..66527cfc52b 100644 --- a/packages-exp/functions-compat/package.json +++ b/packages-exp/functions-compat/package.json @@ -49,7 +49,6 @@ "dependencies": { "@firebase/component": "0.2.0", "@firebase/functions-exp": "0.0.900", - "@firebase/functions-types-exp": "0.0.900", "@firebase/messaging-types": "0.5.0", "@firebase/util": "0.3.4", "tslib": "^1.11.1" diff --git a/packages-exp/functions-compat/src/callable.test.ts b/packages-exp/functions-compat/src/callable.test.ts index 08690be479b..248cae71c3e 100644 --- a/packages-exp/functions-compat/src/callable.test.ts +++ b/packages-exp/functions-compat/src/callable.test.ts @@ -15,7 +15,7 @@ * limitations under the License. */ import { expect } from 'chai'; -import { FunctionsErrorCode } from '@firebase/functions-types-exp'; +import { FunctionsErrorCode } from '@firebase/functions-exp'; import { createTestService } from '../test/utils'; import { firebase, FirebaseApp } from '@firebase/app-compat'; diff --git a/packages-exp/functions-compat/src/register.ts b/packages-exp/functions-compat/src/register.ts index 77e50ff8d15..3739875cf52 100644 --- a/packages-exp/functions-compat/src/register.ts +++ b/packages-exp/functions-compat/src/register.ts @@ -26,7 +26,7 @@ import { InstanceFactory, ComponentContainer } from '@firebase/component'; -import { Functions as FunctionsServiceExp } from '@firebase/functions-types-exp'; +import { Functions as FunctionsServiceExp } from '@firebase/functions-exp'; declare module '@firebase/component' { interface NameServiceMapping { diff --git a/packages-exp/functions-compat/src/service.ts b/packages-exp/functions-compat/src/service.ts index 720617561e6..e23561e9fb7 100644 --- a/packages-exp/functions-compat/src/service.ts +++ b/packages-exp/functions-compat/src/service.ts @@ -23,7 +23,7 @@ import { FirebaseFunctions, HttpsCallable } from '@firebase/functions-types'; import { HttpsCallableOptions, Functions as FunctionsServiceExp -} from '@firebase/functions-types-exp'; +} from '@firebase/functions-exp'; import { FirebaseApp } from '@firebase/app-compat'; import { FirebaseError } from '@firebase/util'; diff --git a/packages-exp/functions-exp/package.json b/packages-exp/functions-exp/package.json index d6c75886638..d18081dc954 100644 --- a/packages-exp/functions-exp/package.json +++ b/packages-exp/functions-exp/package.json @@ -52,7 +52,6 @@ "typings": "dist/functions-exp-public.d.ts", "dependencies": { "@firebase/component": "0.2.0", - "@firebase/functions-types-exp": "0.0.900", "@firebase/messaging-types": "0.5.0", "@firebase/util": "0.3.4", "node-fetch": "2.6.1", diff --git a/packages-exp/functions-exp/src/api.ts b/packages-exp/functions-exp/src/api.ts index 00956fdeaaa..e8a0a42b95e 100644 --- a/packages-exp/functions-exp/src/api.ts +++ b/packages-exp/functions-exp/src/api.ts @@ -19,14 +19,7 @@ import { _getProvider, FirebaseApp } from '@firebase/app-exp'; import { FUNCTIONS_TYPE } from './constants'; import { Provider } from '@firebase/component'; -import { - Functions, - HttpsCallableOptions, - HttpsCallable, - HttpsCallableResult, - FunctionsError, - FunctionsErrorCode -} from '@firebase/functions-types-exp'; +import { Functions, HttpsCallableOptions, HttpsCallable } from './public-types'; import { FunctionsService, DEFAULT_REGION, @@ -34,14 +27,7 @@ import { httpsCallable as _httpsCallable } from './service'; -export { - Functions, - HttpsCallableOptions, - HttpsCallable, - HttpsCallableResult, - FunctionsError, - FunctionsErrorCode -}; +export * from './public-types'; /** * Returns a Functions instance for the given app. diff --git a/packages-exp/functions-exp/src/callable.test.ts b/packages-exp/functions-exp/src/callable.test.ts index 7f61e9ca5c0..8cf6d74f570 100644 --- a/packages-exp/functions-exp/src/callable.test.ts +++ b/packages-exp/functions-exp/src/callable.test.ts @@ -17,7 +17,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import { FirebaseApp } from '@firebase/app-exp'; -import { FunctionsErrorCode } from '@firebase/functions-types-exp'; +import { FunctionsErrorCode } from './public-types'; import { Provider, ComponentContainer, diff --git a/packages-exp/functions-exp/src/error.ts b/packages-exp/functions-exp/src/error.ts index 16d454e025c..b30abbdfe6a 100644 --- a/packages-exp/functions-exp/src/error.ts +++ b/packages-exp/functions-exp/src/error.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { FunctionsErrorCode } from '@firebase/functions-types-exp'; +import { FunctionsErrorCode } from './public-types'; import { decode } from './serializer'; import { HttpResponseBody } from './service'; import { FirebaseError } from '@firebase/util'; diff --git a/packages-exp/functions-types-exp/index.d.ts b/packages-exp/functions-exp/src/public-types.ts similarity index 97% rename from packages-exp/functions-types-exp/index.d.ts rename to packages-exp/functions-exp/src/public-types.ts index 9b529870825..5e7fc9474b0 100644 --- a/packages-exp/functions-types-exp/index.d.ts +++ b/packages-exp/functions-exp/src/public-types.ts @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { FirebaseApp } from '@firebase/app-types-exp'; +import { FirebaseApp } from '@firebase/app-exp'; import { FirebaseError } from '@firebase/util'; /** * An HttpsCallableResult wraps a single result from a function call. */ export interface HttpsCallableResult { - readonly data: any; + readonly data: unknown; } /** @@ -130,7 +130,7 @@ export interface FunctionsError extends FirebaseError { /** * Extra data to be converted to JSON and included in the error response. */ - readonly details?: any; + readonly details?: unknown; } declare module '@firebase/component' { diff --git a/packages-exp/functions-exp/src/service.ts b/packages-exp/functions-exp/src/service.ts index 9cfe9fad16f..04c8031b80a 100644 --- a/packages-exp/functions-exp/src/service.ts +++ b/packages-exp/functions-exp/src/service.ts @@ -20,7 +20,7 @@ import { HttpsCallable, HttpsCallableResult, HttpsCallableOptions -} from '@firebase/functions-types-exp'; +} from './public-types'; import { _errorForResponse, FunctionsError } from './error'; import { ContextProvider } from './context'; import { encode, decode } from './serializer'; diff --git a/packages-exp/functions-types-exp/README.md b/packages-exp/functions-types-exp/README.md deleted file mode 100644 index 59e884b28ea..00000000000 --- a/packages-exp/functions-types-exp/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @firebase/functions-types - -**This package is not intended for direct usage, and should only be used via the officially supported [firebase](https://www.npmjs.com/package/firebase) package.** diff --git a/packages-exp/functions-types-exp/api-extractor.json b/packages-exp/functions-types-exp/api-extractor.json deleted file mode 100644 index 42f37a88c4b..00000000000 --- a/packages-exp/functions-types-exp/api-extractor.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "../../config/api-extractor.json", - // Point it to your entry point d.ts file. - "mainEntryPointFilePath": "/index.d.ts" -} \ No newline at end of file diff --git a/packages-exp/functions-types-exp/package.json b/packages-exp/functions-types-exp/package.json deleted file mode 100644 index f9b3cb02418..00000000000 --- a/packages-exp/functions-types-exp/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "@firebase/functions-types-exp", - "version": "0.0.900", - "description": "@firebase/functions Types", - "private": true, - "author": "Firebase (https://firebase.google.com/)", - "license": "Apache-2.0", - "scripts": { - "test": "tsc", - "test:ci": "node ../../scripts/run_tests_in_ci.js", - "build:release": "node ../../scripts/exp/remove-exp.js ./index.d.ts", - "api-report": "api-extractor run --local --verbose", - "predoc": "node ../../scripts/exp/remove-exp.js temp", - "doc": "api-documenter markdown --input temp --output docs", - "build:doc": "yarn api-report && yarn doc" - }, - "files": [ - "index.d.ts" - ], - "repository": { - "directory": "packages/functions-types", - "type": "git", - "url": "https://github.com/firebase/firebase-js-sdk.git" - }, - "bugs": { - "url": "https://github.com/firebase/firebase-js-sdk/issues" - }, - "devDependencies": { - "typescript": "4.0.5" - } -} diff --git a/packages-exp/functions-types-exp/tsconfig.json b/packages-exp/functions-types-exp/tsconfig.json deleted file mode 100644 index 9a785433d90..00000000000 --- a/packages-exp/functions-types-exp/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../config/tsconfig.base.json", - "compilerOptions": { - "noEmit": true - }, - "exclude": [ - "dist/**/*" - ] -} diff --git a/packages-exp/installations-exp/package.json b/packages-exp/installations-exp/package.json index 266d096dc2a..9ca09190acd 100644 --- a/packages-exp/installations-exp/package.json +++ b/packages-exp/installations-exp/package.json @@ -51,8 +51,7 @@ "typescript": "4.0.5" }, "peerDependencies": { - "@firebase/app-exp": "0.x", - "@firebase/app-types-exp": "0.x" + "@firebase/app-exp": "0.x" }, "dependencies": { "@firebase/installations-types-exp": "0.0.900", diff --git a/packages/component/src/provider.test.ts b/packages/component/src/provider.test.ts index cd321a2b522..90ba5bd44c9 100644 --- a/packages/component/src/provider.test.ts +++ b/packages/component/src/provider.test.ts @@ -19,7 +19,7 @@ import { expect } from 'chai'; import { fake, SinonSpy } from 'sinon'; import { ComponentContainer } from './component_container'; import { FirebaseService } from '@firebase/app-types/private'; -import { _FirebaseService } from '@firebase/app-types-exp'; +import { _FirebaseService } from '@firebase/app-exp'; import { Provider } from './provider'; import { getFakeApp, getFakeComponent } from '../test/util'; import '../test/setup'; diff --git a/repo-scripts/prune-dts/tests/firestore.input.d.ts b/repo-scripts/prune-dts/tests/firestore.input.d.ts index b61a64ac837..ffd2b242f29 100644 --- a/repo-scripts/prune-dts/tests/firestore.input.d.ts +++ b/repo-scripts/prune-dts/tests/firestore.input.d.ts @@ -15,9 +15,9 @@ * limitations under the License. */ import { DocumentData as DocumentData_2 } from '@firebase/firestore-types'; -import { FirebaseApp } from '@firebase/app-types-exp'; +import { FirebaseApp } from '@firebase/app-exp'; import { FirebaseAuthInternalName } from '@firebase/auth-interop-types'; -import { _FirebaseService } from '@firebase/app-types-exp'; +import { _FirebaseService } from '@firebase/app-exp'; import { LogLevelString as LogLevel } from '@firebase/logger'; import { Provider } from '@firebase/component'; import { SetOptions as SetOptions_2 } from '@firebase/firestore-types'; diff --git a/repo-scripts/prune-dts/tests/firestore.output.d.ts b/repo-scripts/prune-dts/tests/firestore.output.d.ts index c4d32edf780..1d840696660 100644 --- a/repo-scripts/prune-dts/tests/firestore.output.d.ts +++ b/repo-scripts/prune-dts/tests/firestore.output.d.ts @@ -15,9 +15,9 @@ * limitations under the License. */ import { DocumentData as DocumentData_2 } from '@firebase/firestore-types'; -import { FirebaseApp } from '@firebase/app-types-exp'; +import { FirebaseApp } from '@firebase/app-exp'; import { FirebaseAuthInternalName } from '@firebase/auth-interop-types'; -import { _FirebaseService } from '@firebase/app-types-exp'; +import { _FirebaseService } from '@firebase/app-exp'; import { LogLevelString as LogLevel } from '@firebase/logger'; import { Provider } from '@firebase/component'; import { SetOptions as SetOptions_2 } from '@firebase/firestore-types'; diff --git a/yarn.lock b/yarn.lock index 1c7c81f4fc0..f59df27b06a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1173,6 +1173,21 @@ unique-filename "^1.1.1" which "^1.3.1" +"@firebase/component@0.1.21": + version "0.1.21" + resolved "https://registry.npmjs.org/@firebase/component/-/component-0.1.21.tgz#56062eb0d449dc1e7bbef3c084a9b5fa48c7c14d" + integrity sha512-kd5sVmCLB95EK81Pj+yDTea8pzN2qo/1yr0ua9yVi6UgMzm6zAeih73iVUkaat96MAHy26yosMufkvd3zC4IKg== + dependencies: + "@firebase/util" "0.3.4" + tslib "^1.11.1" + +"@firebase/database-types@0.6.1", "@firebase/database-types@^0.6.1": + version "0.6.1" + resolved "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.6.1.tgz#cf1cfc03e617ed4c2561703781f85ba4c707ff65" + integrity sha512-JtL3FUbWG+bM59iYuphfx9WOu2Mzf0OZNaqWiQ7lJR8wBe7bS9rIm9jlBFtksB7xcya1lZSQPA/GAy2jIlMIkA== + dependencies: + "@firebase/app-types" "0.6.1" + "@firebase/database@^0.8.1": version "0.8.3" resolved "https://registry.npmjs.org/@firebase/database/-/database-0.8.3.tgz#4e5efa8fc8df00d6febfd9c8d6d6e409596659f7" @@ -14725,7 +14740,6 @@ symbol-observable@^1.1.0: "sync-promise@git+https://github.com/brettz9/sync-promise.git#full-sync-missing-promise-features": version "1.0.1" - uid "25845a49a00aa2d2c985a5149b97c86a1fcdc75a" resolved "git+https://github.com/brettz9/sync-promise.git#25845a49a00aa2d2c985a5149b97c86a1fcdc75a" table@^6.0.4: @@ -16045,7 +16059,6 @@ websocket-extensions@>=0.1.1: "websql@git+https://github.com/brettz9/node-websql.git#configurable-secure2": version "1.0.0" - uid "5149bc0763376ca757fc32dc74345ada0467bfbb" resolved "git+https://github.com/brettz9/node-websql.git#5149bc0763376ca757fc32dc74345ada0467bfbb" dependencies: argsarray "^0.0.1" From a9336d8da02e758175fa677b7d2f604ddb6060f3 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Tue, 23 Feb 2021 10:38:18 -0800 Subject: [PATCH 2/3] Remove storage-types.md --- common/api-review/storage-types.api.md | 156 ------------------------- 1 file changed, 156 deletions(-) delete mode 100644 common/api-review/storage-types.api.md diff --git a/common/api-review/storage-types.api.md b/common/api-review/storage-types.api.md deleted file mode 100644 index 5fa394efeb3..00000000000 --- a/common/api-review/storage-types.api.md +++ /dev/null @@ -1,156 +0,0 @@ -## API Report File for "@firebase/storage-types" - -> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). - -```ts - -import { CompleteFn } from '@firebase/util'; -import { FirebaseApp } from '@firebase/app-types-exp'; -import { FirebaseError } from '@firebase/util'; -import { NextFn } from '@firebase/util'; -import { Unsubscribe } from '@firebase/util'; - -// @public -export interface FirebaseStorageError extends FirebaseError { - serverResponse: string | null; -} - -// @public -export interface ListOptions { - maxResults?: number | null; - pageToken?: string | null; -} - -// @public -export interface ListResult { - items: StorageReference[]; - nextPageToken?: string; - prefixes: StorageReference[]; -} - -// @public -export interface Metadata { - // (undocumented) - [prop: string]: unknown; - - bucket: string; - - cacheControl: string | undefined; - - contentDisposition: string | undefined; - - contentEncoding: string | undefined; - - contentLanguage: string | undefined; - - contentType: string | undefined; - - customMetadata: - | { - [key: string]: string; - } - | undefined; - - downloadTokens: string[] | undefined; - - fullPath: string; - - generation: string; - - md5Hash: string | undefined; - - metageneration: string; - - name: string; - - ref: StorageReference | undefined; - - size: number; - - timeCreated: string; - - updated: string; -} - -// @public -export interface StorageObserver { - // (undocumented) - complete?: CompleteFn | null; - // (undocumented) - error?: (error: FirebaseStorageError) => void | null; - // (undocumented) - next?: NextFn | null; -} - -// @public -export interface StorageReference { - bucket: string; - fullPath: string; - name: string; - parent: StorageReference | null; - root: StorageReference; - storage: StorageService; - toString(): string; -} - -// @public -export interface StorageService { - readonly app: FirebaseApp; - maxOperationRetryTime: number; - maxUploadRetryTime: number; -} - -// @public -export type TaskEvent = 'state_changed'; - -// @public -export type TaskState = 'running' | 'paused' | 'success' | 'canceled' | 'error'; - -// @public -export interface UploadResult { - readonly metadata: Metadata; - - readonly ref: StorageReference; -} - -// @public -export interface UploadTask { - cancel(): boolean; - catch(onRejected: (error: FirebaseStorageError) => any): Promise; - on( - event: TaskEvent, - nextOrObserver?: - | StorageObserver - | null - | ((snapshot: UploadTaskSnapshot) => any), - error?: ((a: FirebaseStorageError) => any) | null, - complete?: Unsubscribe | null - ): Function; - pause(): boolean; - resume(): boolean; - snapshot: UploadTaskSnapshot; - then( - onFulfilled?: ((snapshot: UploadTaskSnapshot) => any) | null, - onRejected?: ((error: FirebaseStorageError) => any) | null - ): Promise; -} - -// @public -export interface UploadTaskSnapshot { - bytesTransferred: number; - - metadata: Metadata; - - ref: StorageReference; - - state: TaskState; - - task: UploadTask; - - totalBytes: number; -} - - -// (No @packageDocumentation comment for this package) - -``` From 3f182fdefce3aeb2eee8c9701574f5b06a949311 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Tue, 23 Feb 2021 11:04:14 -0800 Subject: [PATCH 3/3] Fix lint --- packages-exp/functions-compat/src/service.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages-exp/functions-compat/src/service.ts b/packages-exp/functions-compat/src/service.ts index e23561e9fb7..d485c5a69ea 100644 --- a/packages-exp/functions-compat/src/service.ts +++ b/packages-exp/functions-compat/src/service.ts @@ -15,12 +15,10 @@ * limitations under the License. */ -import { - httpsCallable as httpsCallableExp, - useFunctionsEmulator as useFunctionsEmulatorExp -} from '@firebase/functions-exp'; import { FirebaseFunctions, HttpsCallable } from '@firebase/functions-types'; import { + httpsCallable as httpsCallableExp, + useFunctionsEmulator as useFunctionsEmulatorExp, HttpsCallableOptions, Functions as FunctionsServiceExp } from '@firebase/functions-exp';