Skip to content

Commit

Permalink
Unbreak v2 TS users by safely removing duplicated manifest definition (
Browse files Browse the repository at this point in the history
…#1033)

Follows up #1032 for V2 API to fix #1031.

While rebasing the branch that moved the location of manifest definition (#1003), the original file was not removed and cleaned up. Having long-lasting PR is dangeroud 🤦🏼‍♂️ .
  • Loading branch information
taeold authored Feb 7, 2022
1 parent 4b3b9b8 commit 9da9a4e
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 89 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix issue where v2 TS users couldn't compile their code because of unexported types. (#1033)
2 changes: 1 addition & 1 deletion src/cloud-functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
durationFromSeconds,
serviceAccountFromShorthand,
} from './common/encoding';
import { ManifestEndpoint, ManifestRequiredAPI } from './common/manifest';
import { ManifestEndpoint, ManifestRequiredAPI } from './runtime/manifest';

/** @hidden */
const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g');
Expand Down
83 changes: 0 additions & 83 deletions src/common/manifest.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/providers/https.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
convertInvoker,
copyIfPresent,
} from '../common/encoding';
import { ManifestEndpoint, ManifestRequiredAPI } from '../common/manifest';
import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest';
import {
CallableContext,
FunctionsErrorCode,
Expand Down
3 changes: 0 additions & 3 deletions src/runtime/manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
/**
* @internal
* An definition of a function as appears in the Manifest.
*/
export interface ManifestEndpoint {
Expand Down Expand Up @@ -68,14 +67,12 @@ export interface ManifestEndpoint {
};
}

/* @internal */
export interface ManifestRequiredAPI {
api: string;
reason: string;
}

/**
* @internal
* An definition of a function deployment as appears in the Manifest.
**/
export interface ManifestStack {
Expand Down
2 changes: 1 addition & 1 deletion src/v2/providers/alerts/alerts.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ManifestEndpoint } from '../../../common/manifest';
import { ManifestEndpoint } from '../../../runtime/manifest';
import { CloudEvent, CloudFunction } from '../../core';
import * as options from '../../options';

Expand Down

0 comments on commit 9da9a4e

Please sign in to comment.