Skip to content

Commit 87bd7e1

Browse files
committed
plain imports
1 parent b78cbc4 commit 87bd7e1

38 files changed

+38
-38
lines changed

spec/main.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ 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';
31+
import { alerts } from 'firebase-functions/v2';
3232
import { wrapV2 } from '../src/v2';
3333

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

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';
38+
} from 'firebase-functions/v2';
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
CloudFunction,
44
database,
55
pubsub,
6-
} from 'firebase-functions';
6+
} from 'firebase-functions/v2';
77
import {
88
DocumentSnapshot,
99
QueryDocumentSnapshot,

src/cloudevent/mocks/alerts/alerts-on-alert-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
APP_ID,
55
getBaseCloudEvent,

src/cloudevent/mocks/alerts/app-distribution-on-new-tester-ios-device-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,

src/cloudevent/mocks/alerts/billing-on-plan-automated-update-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import { FirebaseAlertData } from 'firebase-functions/alerts';
44
import {
55
BillingEvent,

src/cloudevent/mocks/alerts/billing-on-plan-update-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import { FirebaseAlertData } from 'firebase-functions/alerts';
44
import {
55
BillingEvent,

src/cloudevent/mocks/alerts/crashlytics-on-new-anr-issue-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,

src/cloudevent/mocks/alerts/crashlytics-on-new-fatal-issue-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,

src/cloudevent/mocks/alerts/crashlytics-on-new-nonfatal-issue-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,

src/cloudevent/mocks/alerts/crashlytics-on-regression-alert-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,

src/cloudevent/mocks/alerts/crashlytics-on-stability-digest-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,

src/cloudevent/mocks/alerts/crashlytics-on-velocity-alert-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,

src/cloudevent/mocks/alerts/performance-on-threshold-alert-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 { CloudFunction } from 'firebase-functions';
2+
import { CloudFunction } from 'firebase-functions/v2';
33
import {
44
PerformanceEvent,
55
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';
2+
import { CloudEvent, CloudFunction, database } from 'firebase-functions/v2';
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';
2+
import { CloudEvent, CloudFunction, database } from 'firebase-functions/v2';
33
import { getEventType } from '../helpers';
44
import { getDatabaseSnapshotCloudEvent } from './helpers';
55

src/cloudevent/mocks/database/database-on-value-updated.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';
2+
import { CloudEvent, CloudFunction, database } from 'firebase-functions/v2';
33
import { getEventType } from '../helpers';
44
import { Change } from 'firebase-functions/v1';
55
import { getDatabaseChangeSnapshotCloudEvent } from './helpers';

src/cloudevent/mocks/database/database-on-value-written.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';
2+
import { CloudEvent, CloudFunction, database } from 'firebase-functions/v2';
33
import { getEventType } from '../helpers';
44
import { Change } from 'firebase-functions/v1';
55
import { getDatabaseChangeSnapshotCloudEvent } from './helpers';

src/cloudevent/mocks/database/helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CloudFunction, database } from 'firebase-functions';
1+
import { CloudFunction, database } from 'firebase-functions/v2';
22
import { DeepPartial } from '../../types';
33
import {
44
exampleDataSnapshot,

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';
2+
import { CloudEvent, CloudFunction } from 'firebase-functions/v2';
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';
2+
import { CloudEvent, CloudFunction, firestore } from 'firebase-functions/v2';
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';
2+
import { CloudEvent, CloudFunction, firestore } from 'firebase-functions/v2';
33
import { getEventType } from '../helpers';
44
import { QueryDocumentSnapshot } from 'firebase-admin/firestore';
55
import { getDocumentSnapshotCloudEvent } from './helpers';

src/cloudevent/mocks/firestore/firestore-on-document-deleted-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';
2+
import { CloudEvent, CloudFunction, firestore } from 'firebase-functions/v2';
33
import { getEventType } from '../helpers';
44
import { QueryDocumentSnapshot } from 'firebase-admin/firestore';
55
import { getDocumentSnapshotCloudEventWithAuthContext } from './helpers';

src/cloudevent/mocks/firestore/firestore-on-document-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, firestore } from 'firebase-functions';
2+
import { CloudEvent, CloudFunction, firestore } from 'firebase-functions/v2';
33
import { getEventType } from '../helpers';
44
import { QueryDocumentSnapshot } from 'firebase-admin/firestore';
55
import { getDocumentSnapshotCloudEvent } from './helpers';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
CloudEvent,
55
CloudFunction,
66
firestore,
7-
} from 'firebase-functions';
7+
} from 'firebase-functions/v2';
88
import { getEventType } from '../helpers';
99
import { QueryDocumentSnapshot } from 'firebase-admin/firestore';
1010
import { getDocumentSnapshotChangeCloudEventWithAuthContext } from './helpers';

src/cloudevent/mocks/firestore/firestore-on-document-updated.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
CloudEvent,
55
CloudFunction,
66
firestore,
7-
} from 'firebase-functions';
7+
} from 'firebase-functions/v2';
88
import { getEventType } from '../helpers';
99
import { QueryDocumentSnapshot } from 'firebase-admin/firestore';
1010
import { getDocumentSnapshotChangeCloudEvent } from './helpers';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
CloudEvent,
55
CloudFunction,
66
firestore,
7-
} from 'firebase-functions';
7+
} from 'firebase-functions/v2';
88
import { getEventType } from '../helpers';
99
import { DocumentSnapshot } from 'firebase-admin/firestore';
1010
import { getDocumentSnapshotChangeCloudEventWithAuthContext } from './helpers';

src/cloudevent/mocks/firestore/firestore-on-document-written.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
CloudEvent,
55
CloudFunction,
66
firestore,
7-
} from 'firebase-functions';
7+
} from 'firebase-functions/v2';
88
import { getEventType } from '../helpers';
99
import { DocumentSnapshot } from 'firebase-admin/firestore';
1010
import { getDocumentSnapshotChangeCloudEvent } from './helpers';

src/cloudevent/mocks/firestore/helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DocumentSnapshot } from 'firebase-admin/firestore';
2-
import { Change, CloudFunction, firestore } from 'firebase-functions';
2+
import { Change, CloudFunction, firestore } from 'firebase-functions/v2';
33
import {
44
exampleDocumentSnapshot,
55
exampleDocumentSnapshotChange,

src/cloudevent/mocks/helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as v1 from 'firebase-functions/v1';
2-
import * as v2 from 'firebase-functions';
2+
import * as v2 from 'firebase-functions/v2';
33
import { Expression } from 'firebase-functions/params';
44

55
export const APP_ID = '__APP_ID__';

src/cloudevent/mocks/pubsub/pubsub-on-message-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, pubsub } from 'firebase-functions';
2+
import { CloudEvent, CloudFunction, pubsub } from 'firebase-functions/v2';
33
import {
44
getBaseCloudEvent,
55
getEventFilters,

src/cloudevent/mocks/remoteconfig/remote-config-on-config-updated.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 { CloudFunction, CloudEvent } from 'firebase-functions';
2+
import { CloudFunction, CloudEvent } from 'firebase-functions/v2';
33
import { ConfigUpdateData } from 'firebase-functions/remoteConfig';
44
import { getBaseCloudEvent, getEventType, PROJECT_ID } from '../helpers';
55

src/cloudevent/mocks/storage/index.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 { CloudFunction, CloudEvent } from 'firebase-functions';
2+
import { CloudFunction, CloudEvent } from 'firebase-functions/v2';
33
import { StorageEvent } from 'firebase-functions/storage';
44
import {
55
FILENAME,

src/cloudevent/mocks/storage/storage-data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { storage } from 'firebase-functions';
1+
import { storage } from 'firebase-functions/v2';
22
import { FILENAME } from '../helpers';
33

44
/** Storage Data */

src/cloudevent/mocks/testlab/test-lab-on-test-matrix-completed.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 { CloudFunction, CloudEvent } from 'firebase-functions';
2+
import { CloudFunction, CloudEvent } from 'firebase-functions/v2';
33
import { TestMatrixCompletedData } from 'firebase-functions/testLab';
44
import { getBaseCloudEvent, getEventType, PROJECT_ID } from '../helpers';
55

src/cloudevent/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CloudEvent, CloudFunction } from 'firebase-functions';
1+
import { CloudEvent, CloudFunction } from 'firebase-functions/v2';
22

33
export type DeepPartial<T extends object> = {
44
[Key in keyof T]?: T[Key] extends object ? DeepPartial<T[Key]> : T[Key];

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
import {
3030
CloudFunction as CloudFunctionV2,
3131
CloudEvent,
32-
} from 'firebase-functions';
32+
} from 'firebase-functions/v2';
3333

3434
import {
3535
CallableFunction,

src/v2.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
// SOFTWARE.
2222

23-
import { CloudFunction, CloudEvent } from 'firebase-functions';
23+
import { CloudFunction, CloudEvent } from 'firebase-functions/v2';
2424
import { CallableFunction, CallableRequest } from 'firebase-functions/https';
2525

2626
import { generateCombinedCloudEvent } from './cloudevent/generate';

0 commit comments

Comments
 (0)