Skip to content

Commit b78cbc4

Browse files
EnduringBetaEnduringBeta
authored
Update to firebase-functions 6 (#243)
* firebase-functions + /v1; firebase-functions/v2 - /v2
1 parent c3c9abc commit b78cbc4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+92
-91
lines changed

‎package-lock.json

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@types/mocha": "^5.2.7",
4949
"chai": "^4.2.0",
5050
"firebase-admin": "^12.0.0",
51-
"firebase-functions": "^4.9.0",
51+
"firebase-functions": "^6.0.1",
5252
"firebase-tools": "^8.9.2",
5353
"mocha": "^6.2.2",
5454
"prettier": "^1.19.1",
@@ -58,7 +58,7 @@
5858
},
5959
"peerDependencies": {
6060
"firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0",
61-
"firebase-functions": ">=4.9.0",
61+
"firebase-functions": ">=6.0.1",
6262
"jest": ">=28.0.0"
6363
},
6464
"engines": {

‎spec/cloudevent/generate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import { expect } from 'chai';
2424

25-
import { alerts, storage } from 'firebase-functions/v2';
25+
import { alerts, storage } from 'firebase-functions';
2626
import { generateMockCloudEvent } from '../../src/cloudevent/generate';
2727

2828
describe('generate (CloudEvent)', () => {

‎spec/main.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
// SOFTWARE.
2222

2323
import { expect } from 'chai';
24-
import * as functions from 'firebase-functions';
24+
import * as functions from 'firebase-functions/v1';
2525
import { set } from 'lodash';
2626

2727
import { mockConfig, makeChange, wrap } from '../src/main';
2828
import { _makeResourceName, _extractParams } from '../src/v1';
2929
import { features } from '../src/features';
3030
import { FirebaseFunctionsTest } from '../src/lifecycle';
31-
import { alerts } from 'firebase-functions/v2';
31+
import { alerts } from 'firebase-functions';
3232
import { wrapV2 } from '../src/v2';
3333

3434
describe('main', () => {

‎spec/providers/https.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect } from 'chai';
2-
import * as functions from 'firebase-functions';
2+
import * as functions from 'firebase-functions/v1';
33
import fft = require('../../src/index');
44

55
const cfToUpperCaseOnRequest = functions.https.onRequest((req, res) => {

‎spec/providers/scheduled.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as sinon from 'sinon';
2-
import * as functions from 'firebase-functions';
2+
import * as functions from 'firebase-functions/v1';
33
import fft = require('../../src/index');
44
import { WrappedScheduledFunction } from '../../src/main';
55

‎spec/v2.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {
3535
eventarc,
3636
https,
3737
firestore,
38-
} from 'firebase-functions/v2';
38+
} from 'firebase-functions';
3939
import { defineString } from 'firebase-functions/params';
4040
import { makeDataSnapshot } from '../src/providers/database';
4141
import { makeDocumentSnapshot } from '../src/providers/firestore';

‎src/cloudevent/generate.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import {
33
CloudFunction,
44
database,
55
pubsub,
6-
} from 'firebase-functions/v2';
6+
} from 'firebase-functions';
77
import {
88
DocumentSnapshot,
99
QueryDocumentSnapshot,
1010
} from 'firebase-admin/firestore';
1111
import { LIST_OF_MOCK_CLOUD_EVENT_PARTIALS } from './mocks/partials';
1212
import { DeepPartial } from './types';
13-
import { Change } from 'firebase-functions';
13+
import { Change } from 'firebase-functions/v1';
1414
import merge from 'ts-deepmerge';
1515

1616
/**

‎src/cloudevent/mocks/alerts/alerts-on-alert-published.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
APP_ID,
55
getBaseCloudEvent,
66
getEventType,
77
PROJECT_ID,
88
} from '../helpers';
9-
import { FirebaseAlertData, AlertEvent } from 'firebase-functions/v2/alerts';
9+
import { FirebaseAlertData, AlertEvent } from 'firebase-functions/alerts';
1010

1111
export const alertsOnAlertPublished: MockCloudEventAbstractFactory<AlertEvent<
1212
FirebaseAlertData

‎src/cloudevent/mocks/alerts/app-distribution-on-new-tester-ios-device-published.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,
@@ -9,7 +9,7 @@ import {
99
import {
1010
AppDistributionEvent,
1111
NewTesterDevicePayload,
12-
} from 'firebase-functions/v2/alerts/appDistribution';
12+
} from 'firebase-functions/alerts/appDistribution';
1313

1414
export const alertsAppDistributionOnNewTesterIosDevicePublished: MockCloudEventAbstractFactory<AppDistributionEvent<
1515
NewTesterDevicePayload

‎src/cloudevent/mocks/alerts/billing-on-plan-automated-update-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
3-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
2+
import { CloudFunction } from 'firebase-functions';
3+
import { FirebaseAlertData } from 'firebase-functions/alerts';
44
import {
55
BillingEvent,
66
PlanAutomatedUpdatePayload,
7-
} from 'firebase-functions/v2/alerts/billing';
7+
} from 'firebase-functions/alerts/billing';
88
import {
99
getBaseCloudEvent,
1010
getEventFilters,

‎src/cloudevent/mocks/alerts/billing-on-plan-update-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
3-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
2+
import { CloudFunction } from 'firebase-functions';
3+
import { FirebaseAlertData } from 'firebase-functions/alerts';
44
import {
55
BillingEvent,
66
PlanUpdatePayload,
7-
} from 'firebase-functions/v2/alerts/billing';
7+
} from 'firebase-functions/alerts/billing';
88
import {
99
getBaseCloudEvent,
1010
getEventFilters,

‎src/cloudevent/mocks/alerts/crashlytics-on-new-anr-issue-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,
@@ -9,8 +9,8 @@ import {
99
import {
1010
CrashlyticsEvent,
1111
NewAnrIssuePayload,
12-
} from 'firebase-functions/v2/alerts/crashlytics';
13-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
12+
} from 'firebase-functions/alerts/crashlytics';
13+
import { FirebaseAlertData } from 'firebase-functions/alerts';
1414

1515
export const alertsCrashlyticsOnNewAnrIssuePublished: MockCloudEventAbstractFactory<CrashlyticsEvent<
1616
NewAnrIssuePayload

‎src/cloudevent/mocks/alerts/crashlytics-on-new-fatal-issue-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,
@@ -9,8 +9,8 @@ import {
99
import {
1010
CrashlyticsEvent,
1111
NewFatalIssuePayload,
12-
} from 'firebase-functions/v2/alerts/crashlytics';
13-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
12+
} from 'firebase-functions/alerts/crashlytics';
13+
import { FirebaseAlertData } from 'firebase-functions/alerts';
1414

1515
export const alertsCrashlyticsOnNewFatalIssuePublished: MockCloudEventAbstractFactory<CrashlyticsEvent<
1616
NewFatalIssuePayload

‎src/cloudevent/mocks/alerts/crashlytics-on-new-nonfatal-issue-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,
@@ -9,8 +9,8 @@ import {
99
import {
1010
CrashlyticsEvent,
1111
NewNonfatalIssuePayload,
12-
} from 'firebase-functions/v2/alerts/crashlytics';
13-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
12+
} from 'firebase-functions/alerts/crashlytics';
13+
import { FirebaseAlertData } from 'firebase-functions/alerts';
1414

1515
export const alertsCrashlyticsOnNewNonfatalIssuePublished: MockCloudEventAbstractFactory<CrashlyticsEvent<
1616
NewNonfatalIssuePayload

‎src/cloudevent/mocks/alerts/crashlytics-on-regression-alert-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,
@@ -9,8 +9,8 @@ import {
99
import {
1010
CrashlyticsEvent,
1111
RegressionAlertPayload,
12-
} from 'firebase-functions/v2/alerts/crashlytics';
13-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
12+
} from 'firebase-functions/alerts/crashlytics';
13+
import { FirebaseAlertData } from 'firebase-functions/alerts';
1414

1515
export const alertsCrashlyticsOnRegressionAlertPublished: MockCloudEventAbstractFactory<CrashlyticsEvent<
1616
RegressionAlertPayload

‎src/cloudevent/mocks/alerts/crashlytics-on-stability-digest-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,
@@ -9,8 +9,8 @@ import {
99
import {
1010
CrashlyticsEvent,
1111
StabilityDigestPayload,
12-
} from 'firebase-functions/v2/alerts/crashlytics';
13-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
12+
} from 'firebase-functions/alerts/crashlytics';
13+
import { FirebaseAlertData } from 'firebase-functions/alerts';
1414

1515
export const alertsCrashlyticsOnStabilityDigestPublished: MockCloudEventAbstractFactory<CrashlyticsEvent<
1616
StabilityDigestPayload

‎src/cloudevent/mocks/alerts/crashlytics-on-velocity-alert-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,
@@ -9,8 +9,8 @@ import {
99
import {
1010
CrashlyticsEvent,
1111
VelocityAlertPayload,
12-
} from 'firebase-functions/v2/alerts/crashlytics';
13-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
12+
} from 'firebase-functions/alerts/crashlytics';
13+
import { FirebaseAlertData } from 'firebase-functions/alerts';
1414

1515
export const alertsCrashlyticsOnVelocityAlertPublished: MockCloudEventAbstractFactory<CrashlyticsEvent<
1616
VelocityAlertPayload

‎src/cloudevent/mocks/alerts/performance-on-threshold-alert-published.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudFunction } from 'firebase-functions/v2';
2+
import { CloudFunction } from 'firebase-functions';
33
import {
44
PerformanceEvent,
55
ThresholdAlertPayload,
6-
} from 'firebase-functions/v2/alerts/performance';
6+
} from 'firebase-functions/alerts/performance';
77
import {
88
getBaseCloudEvent,
99
getEventFilters,
1010
getEventType,
1111
PROJECT_ID,
1212
APP_ID,
1313
} from '../helpers';
14-
import { FirebaseAlertData } from 'firebase-functions/v2/alerts';
14+
import { FirebaseAlertData } from 'firebase-functions/alerts';
1515

1616
export const performanceThresholdOnThresholdAlertPublished: MockCloudEventAbstractFactory<PerformanceEvent<
1717
ThresholdAlertPayload

‎src/cloudevent/mocks/database/database-on-value-created.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudEvent, CloudFunction, database } from 'firebase-functions/v2';
2+
import { CloudEvent, CloudFunction, database } from 'firebase-functions';
33
import { getEventType } from '../helpers';
44
import { getDatabaseSnapshotCloudEvent } from './helpers';
55

‎src/cloudevent/mocks/database/database-on-value-deleted.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudEvent, CloudFunction, database } from 'firebase-functions/v2';
2+
import { CloudEvent, CloudFunction, database } from 'firebase-functions';
33
import { getEventType } from '../helpers';
44
import { getDatabaseSnapshotCloudEvent } from './helpers';
55

‎src/cloudevent/mocks/database/database-on-value-updated.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudEvent, CloudFunction, database } from 'firebase-functions/v2';
2+
import { CloudEvent, CloudFunction, database } from 'firebase-functions';
33
import { getEventType } from '../helpers';
4-
import { Change } from 'firebase-functions';
4+
import { Change } from 'firebase-functions/v1';
55
import { getDatabaseChangeSnapshotCloudEvent } from './helpers';
66

77
export const databaseOnValueUpdated: MockCloudEventAbstractFactory<database.DatabaseEvent<

‎src/cloudevent/mocks/database/database-on-value-written.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudEvent, CloudFunction, database } from 'firebase-functions/v2';
2+
import { CloudEvent, CloudFunction, database } from 'firebase-functions';
33
import { getEventType } from '../helpers';
4-
import { Change } from 'firebase-functions';
4+
import { Change } from 'firebase-functions/v1';
55
import { getDatabaseChangeSnapshotCloudEvent } from './helpers';
66

77
export const databaseOnValueWritten: MockCloudEventAbstractFactory<database.DatabaseEvent<

‎src/cloudevent/mocks/database/helpers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CloudFunction, database } from 'firebase-functions/v2';
1+
import { CloudFunction, database } from 'firebase-functions';
22
import { DeepPartial } from '../../types';
33
import {
44
exampleDataSnapshot,
@@ -9,7 +9,7 @@ import {
99
getBaseCloudEvent,
1010
extractRef,
1111
} from '../helpers';
12-
import { Change } from 'firebase-functions';
12+
import { Change } from 'firebase-functions/v1';
1313
import { makeDataSnapshot } from '../../../providers/database';
1414

1515
type ChangeLike = {

‎src/cloudevent/mocks/eventarc/eventarc-on-custom-event-published.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DeepPartial, MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudEvent, CloudFunction } from 'firebase-functions/v2';
2+
import { CloudEvent, CloudFunction } from 'firebase-functions';
33
import { getBaseCloudEvent } from '../helpers';
44

55
export const eventarcOnCustomEventPublished: MockCloudEventAbstractFactory<any> = {

‎src/cloudevent/mocks/firestore/firestore-on-document-created-with-auth-context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudEvent, CloudFunction, firestore } from 'firebase-functions/v2';
2+
import { CloudEvent, CloudFunction, firestore } from 'firebase-functions';
33
import { getEventType } from '../helpers';
44
import { QueryDocumentSnapshot } from 'firebase-admin/firestore';
55
import { getDocumentSnapshotCloudEventWithAuthContext } from './helpers';

‎src/cloudevent/mocks/firestore/firestore-on-document-created.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { MockCloudEventAbstractFactory } from '../../types';
2-
import { CloudEvent, CloudFunction, firestore } from 'firebase-functions/v2';
2+
import { CloudEvent, CloudFunction, firestore } from 'firebase-functions';
33
import { getEventType } from '../helpers';
44
import { QueryDocumentSnapshot } from 'firebase-admin/firestore';
55
import { getDocumentSnapshotCloudEvent } from './helpers';

0 commit comments

Comments
 (0)