Skip to content

generate import type instead of import #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jimisaacs wants to merge 7 commits into
base: master
Choose a base branch
from
Open

generate import type instead of import #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a21114
generate instead of
jimisaacs Aug 22, 2021
7dacc99
Expect error until @types/babel-types is upgraded
jimisaacs Aug 23, 2021
43944ed
Merge remote-tracking branch 'upstream/master' into patch-1
hwillson Aug 26, 2021
22db1d0
Lint fixes
hwillson Aug 26, 2021
66f9f7d
Update snapshots to include import type
hwillson Aug 26, 2021
9b62ad6
Remove hard coded check for an apollographql remoteUrl
hwillson Aug 26, 2021
17c3d8b
Slight adjustment to the importKind expect error comment
hwillson Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions packages/apollo-codegen-typescript/src/__tests__/__snapshots__/codeGeneration.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { EnumCommentTestCase, Duplicate } from \\"./../../__generated__/globalTypes\\";
import type { EnumCommentTestCase, Duplicate } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL mutation operation: duplicates
Expand Down Expand Up @@ -739,7 +739,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { Episode } from \\"./../../__generated__/globalTypes\\";
import type { Episode } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL query operation: HeroName
Expand Down Expand Up @@ -865,7 +865,7 @@ export interface humanFragment {
// @generated
// This file was automatically generated and should not be edited.

import { Episode } from \\"./../../__generated__/globalTypes\\";
import type { Episode } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL fragment: droidFragment
Expand Down Expand Up @@ -1018,7 +1018,7 @@ export interface simpleFragment {
// @generated
// This file was automatically generated and should not be edited.

import { Episode } from \\"./../../__generated__/globalTypes\\";
import type { Episode } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL fragment: anotherFragment
Expand Down Expand Up @@ -1149,7 +1149,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { Episode } from \\"./../../__generated__/globalTypes\\";
import type { Episode } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL query operation: HeroInlineFragment
Expand Down Expand Up @@ -1218,7 +1218,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { Episode } from \\"./../../__generated__/globalTypes\\";
import type { Episode } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL query operation: HeroName
Expand Down Expand Up @@ -1321,7 +1321,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { Episode } from \\"./../../__generated__/globalTypes\\";
import type { Episode } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL query operation: HeroName
Expand Down Expand Up @@ -1436,7 +1436,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { EnumCommentTestCase } from \\"./../../__generated__/globalTypes\\";
import type { EnumCommentTestCase } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL query operation: nesting
Expand Down Expand Up @@ -1490,7 +1490,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { EnumCommentTestCase } from \\"./../../__generated__/globalTypes\\";
import type { EnumCommentTestCase } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL query operation: nesting
Expand Down Expand Up @@ -1544,7 +1544,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { Episode } from \\"./../../__generated__/globalTypes\\";
import type { Episode } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL query operation: HeroFragment
Expand Down Expand Up @@ -1682,7 +1682,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { Episode } from \\"./../../__generated__/globalTypes\\";
import type { Episode } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL query operation: HeroName
Expand Down Expand Up @@ -1751,7 +1751,7 @@ Array [
// @generated
// This file was automatically generated and should not be edited.

import { Episode, ReviewInput } from \\"./../../__generated__/globalTypes\\";
import type { Episode, ReviewInput } from \\"./../../__generated__/globalTypes\\";

// ====================================================
// GraphQL mutation operation: ReviewMovie
Expand Down
8 changes: 7 additions & 1 deletion packages/apollo-codegen-typescript/src/language.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export default class TypescriptGenerator {
}

public import(types: GraphQLType[], source: string) {
return t.importDeclaration(
const node = t.importDeclaration(
types.map(type =>
t.importSpecifier(
t.identifier(type.toString()),
Expand All @@ -176,5 +176,11 @@ export default class TypescriptGenerator {
),
t.stringLiteral(source)
);
// Expect an error until `@types/babel-types` is upgraded to match the
// `importKind` changes made to babel:
// https://github.com/babel/babel/issues/9485
// @ts-expect-error
node.importKind = "type";
return node;
}
}
2 changes: 1 addition & 1 deletion packages/apollo/src/__tests__/git.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe("Git integration", () => {
expect(info.remoteUrl).toBeDefined();
// Match both ssh and http/s remotes
expect(info.remoteUrl).toMatch(
/(https?:\/\/|git@)github.com(\/|:)apollographql\/apollo-tooling(.git)?/
/(https?:\/\/|git@)github.com(\/|:)(.*)\/apollo-tooling(.git)?/
);
expect(info.message).toBeDefined();
expect(info.branch).toBeDefined();
Expand Down