Skip to content

Commit fdcd309

Browse files
authored
Hyrum's law breaks my heart (#943)
* Hyrum's law breaks my heart * Changelog
1 parent 7f4db13 commit fdcd309

40 files changed

+81
-103
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Fix an error that broke `firebase emulators:start` on older CLIs

spec/common/providers/https.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { expect } from 'chai';
22
import * as express from 'express';
33
import * as firebase from 'firebase-admin';
44

5+
import { apps as appsNamespace } from '../../../src/apps';
56
import * as https from '../../../src/common/providers/https';
6-
import { apps as appsNamespace } from '../../../src/v1/apps';
77
import * as mocks from '../../fixtures/credential/key.json';
88
import {
99
expectedResponseHeaders,

spec/v1/apps.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// SOFTWARE.
2222

2323
import { expect } from 'chai';
24-
import { apps as appsNamespace } from '../../src/v1/apps';
24+
import { apps as appsNamespace } from '../../src/apps';
2525

2626
import * as firebase from 'firebase-admin';
2727
import * as _ from 'lodash';

spec/v1/cloud-functions.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
EventContext,
3030
makeCloudFunction,
3131
MakeCloudFunctionArgs,
32-
} from '../../src/v1/cloud-functions';
32+
} from '../../src/cloud-functions';
3333

3434
describe('makeCloudFunction', () => {
3535
const cloudFunctionArgs: MakeCloudFunctionArgs<any> = {

spec/v1/config.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import * as fs from 'fs';
2525
import * as process from 'process';
2626
import Sinon = require('sinon');
2727

28-
import * as config from '../../src/v1/config';
28+
import * as config from '../../src/config';
2929

3030
describe('config()', () => {
3131
let readFileSync: Sinon.SinonStub;

spec/v1/function-builder.spec.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 * as functions from '../../src/v1';
25+
import * as functions from '../../src';
2626

2727
describe('FunctionBuilder', () => {
2828
before(() => {

spec/v1/providers/analytics.spec.input.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// SOFTWARE.
2222

2323
/* tslint:disable:max-line-length */
24-
import { AnalyticsEvent } from '../../../src/v1/providers/analytics';
24+
import { AnalyticsEvent } from '../../../src/providers/analytics';
2525

2626
// A payload, as it might arrive over the wire. Every possible field is filled out at least once.
2727
export const fullPayload = JSON.parse(`{

spec/v1/providers/analytics.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import { expect } from 'chai';
2424

25-
import * as functions from '../../../src/v1';
26-
import { Event, EventContext } from '../../../src/v1/cloud-functions';
27-
import * as analytics from '../../../src/v1/providers/analytics';
25+
import * as functions from '../../../src';
26+
import { Event, EventContext } from '../../../src/cloud-functions';
27+
import * as analytics from '../../../src/providers/analytics';
2828
import * as analytics_spec_input from './analytics.spec.input';
2929

3030
describe('Analytics Functions', () => {

spec/v1/providers/auth.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
import { expect } from 'chai';
2424
import * as firebase from 'firebase-admin';
2525

26-
import * as functions from '../../../src/index';
2726
import {
2827
CloudFunction,
2928
Event,
3029
EventContext,
31-
} from '../../../src/v1/cloud-functions';
32-
import * as auth from '../../../src/v1/providers/auth';
30+
} from '../../../src/cloud-functions';
31+
import * as functions from '../../../src/index';
32+
import * as auth from '../../../src/providers/auth';
3333

3434
describe('Auth Functions', () => {
3535
const event: Event = {

spec/v1/providers/database.spec.ts

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

2323
import { expect } from 'chai';
24-
import { apps as appsNamespace } from '../../../src/v1/apps';
25-
import * as config from '../../../src/v1/config';
26-
import * as functions from '../../../src/v1/index';
27-
import * as database from '../../../src/v1/providers/database';
28-
import { applyChange } from '../../../src/v1/utils';
24+
import { apps as appsNamespace } from '../../../src/apps';
25+
import * as config from '../../../src/config';
26+
import * as functions from '../../../src/index';
27+
import * as database from '../../../src/providers/database';
28+
import { applyChange } from '../../../src/utils';
2929

3030
describe('Database Functions', () => {
3131
describe('DatabaseBuilder', () => {

0 commit comments

Comments
 (0)