Skip to content

Commit cb59ef4

Browse files
benjiebenjie
authored
Merge branch 'master' into formatting
2 parents b05cfc8 + 81b20f5 commit cb59ef4

File tree

112 files changed

+2032
-1821
lines changed

Some content is hidden

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

112 files changed

+2032
-1821
lines changed

‎.changeset/witty-tables-join.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@graphql-codegen/fragment-matcher': minor
3+
---
4+
5+
Add new flag to make the fragment matcher results deterministic

‎.github/workflows/main.yml

+28-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,31 @@ jobs:
5656
yarn run generate:examples:${{matrix.method}}
5757
git diff --exit-code -- dev-test/
5858
dev-tests:
59-
name: Examples
59+
name: Examples - Normal
60+
runs-on: ubuntu-latest
61+
steps:
62+
- name: Checkout
63+
uses: actions/checkout@v4
64+
- name: Setup env
65+
uses: the-guild-org/shared-config/setup@main
66+
with:
67+
nodeVersion: 18
68+
- name: Build
69+
run: yarn build
70+
env:
71+
CI: true
72+
- name: Generate and Diff Codegen Artifacts
73+
run: |
74+
EXAMPLE_TYPE=normal yarn examples:codegen
75+
git diff --exit-code -- examples/
76+
- name: Build Examples
77+
run: |
78+
EXAMPLE_TYPE=normal yarn examples:build
79+
- name: End2End Test Examples
80+
run: |
81+
EXAMPLE_TYPE=normal yarn examples:test:end2end
82+
dev-tests-swc:
83+
name: Examples - SWC
6084
runs-on: ubuntu-latest
6185
steps:
6286
- name: Checkout
@@ -80,14 +104,14 @@ jobs:
80104
CI: true
81105
- name: Generate and Diff Codegen Artifacts
82106
run: |
83-
yarn examples:codegen
107+
EXAMPLE_TYPE=swc yarn examples:codegen
84108
git diff --exit-code -- examples/
85109
- name: Build Examples
86110
run: |
87-
yarn examples:build
111+
EXAMPLE_TYPE=swc yarn examples:build
88112
- name: End2End Test Examples
89113
run: |
90-
yarn examples:test:end2end
114+
EXAMPLE_TYPE=swc yarn examples:test:end2end
91115
esm:
92116
name: Testing exports integrity
93117
runs-on: ubuntu-latest

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22

‎dev-test/gql-tag-operations-masking/gql/gql.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n fragment TweetFragment on Tweet {\n id\n body\n ...TweetAuthorFragment\n }\n': typeof types.TweetFragmentFragmentDoc;
18+
'\n fragment TweetAuthorFragment on Tweet {\n id\n author {\n id\n username\n }\n }\n': typeof types.TweetAuthorFragmentFragmentDoc;
19+
'\n fragment TweetsFragment on Query {\n Tweets {\n id\n ...TweetFragment\n }\n }\n': typeof types.TweetsFragmentFragmentDoc;
20+
'\n query TweetAppQuery {\n ...TweetsFragment\n }\n': typeof types.TweetAppQueryDocument;
21+
};
22+
const documents: Documents = {
1723
'\n fragment TweetFragment on Tweet {\n id\n body\n ...TweetAuthorFragment\n }\n':
1824
types.TweetFragmentFragmentDoc,
1925
'\n fragment TweetAuthorFragment on Tweet {\n id\n author {\n id\n username\n }\n }\n':

‎dev-test/gql-tag-operations-urql/gql/gql.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n query Foo {\n Tweets {\n id\n }\n }\n': typeof types.FooDocument;
18+
'\n fragment Lel on Tweet {\n id\n body\n }\n': typeof types.LelFragmentDoc;
19+
'\n query Bar {\n Tweets {\n ...Lel\n }\n }\n': typeof types.BarDocument;
20+
};
21+
const documents: Documents = {
1722
'\n query Foo {\n Tweets {\n id\n }\n }\n': types.FooDocument,
1823
'\n fragment Lel on Tweet {\n id\n body\n }\n': types.LelFragmentDoc,
1924
'\n query Bar {\n Tweets {\n ...Lel\n }\n }\n': types.BarDocument,

‎dev-test/gql-tag-operations/gql/gql.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n query Foo {\n Tweets {\n id\n }\n }\n': typeof types.FooDocument;
18+
'\n fragment Lel on Tweet {\n id\n body\n }\n': typeof types.LelFragmentDoc;
19+
'\n query Bar {\n Tweets {\n ...Lel\n }\n }\n': typeof types.BarDocument;
20+
};
21+
const documents: Documents = {
1722
'\n query Foo {\n Tweets {\n id\n }\n }\n': types.FooDocument,
1823
'\n fragment Lel on Tweet {\n id\n body\n }\n': types.LelFragmentDoc,
1924
'\n query Bar {\n Tweets {\n ...Lel\n }\n }\n': types.BarDocument,

‎dev-test/gql-tag-operations/graphql/gql.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n query Foo {\n Tweets {\n id\n }\n }\n': typeof types.FooDocument;
18+
'\n fragment Lel on Tweet {\n id\n body\n }\n': typeof types.LelFragmentDoc;
19+
'\n query Bar {\n Tweets {\n ...Lel\n }\n }\n': typeof types.BarDocument;
20+
};
21+
const documents: Documents = {
1722
'\n query Foo {\n Tweets {\n id\n }\n }\n': types.FooDocument,
1823
'\n fragment Lel on Tweet {\n id\n body\n }\n': types.LelFragmentDoc,
1924
'\n query Bar {\n Tweets {\n ...Lel\n }\n }\n': types.BarDocument,

‎examples/persisted-documents-string-mode/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"@graphql-typed-document-node/core": "3.2.0",
1111
"jest": "28.1.3",
1212
"babel-jest": "29.7.0",
13-
"@graphql-codegen/cli": "5.0.3",
13+
"@graphql-codegen/cli": "5.0.4",
1414
"@babel/core": "7.25.2",
1515
"@babel/preset-env": "7.25.3",
16-
"@babel/preset-typescript": "7.24.7"
16+
"@babel/preset-typescript": "7.26.0"
1717
},
1818
"scripts": {
1919
"test": "jest",

‎examples/persisted-documents-string-mode/src/gql/gql.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ import * as types from './graphql';
1212
* Therefore it is highly recommended to use the babel or swc plugin for production.
1313
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1414
*/
15-
const documents = {
15+
type Documents = {
16+
'\n query HelloQuery {\n hello\n }\n': typeof types.HelloQueryDocument;
17+
};
18+
const documents: Documents = {
1619
'\n query HelloQuery {\n hello\n }\n': types.HelloQueryDocument,
1720
};
1821

‎examples/persisted-documents/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"@graphql-typed-document-node/core": "3.2.0",
1111
"jest": "28.1.3",
1212
"babel-jest": "29.7.0",
13-
"@graphql-codegen/cli": "5.0.3",
13+
"@graphql-codegen/cli": "5.0.4",
1414
"@babel/core": "7.25.2",
1515
"@babel/preset-env": "7.25.3",
16-
"@babel/preset-typescript": "7.24.7"
16+
"@babel/preset-typescript": "7.26.0"
1717
},
1818
"scripts": {
1919
"test": "jest",

‎examples/persisted-documents/src/gql/gql.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n query HelloQuery {\n hello\n }\n': typeof types.HelloQueryDocument;
18+
};
19+
const documents: Documents = {
1720
'\n query HelloQuery {\n hello\n }\n': types.HelloQueryDocument,
1821
};
1922

‎examples/programmatic-typescript/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"dependencies": {
1313
"@graphql-codegen/core": "4.0.2",
1414
"@graphql-codegen/plugin-helpers": "5.1.0",
15-
"@graphql-codegen/typed-document-node": "5.0.12",
16-
"@graphql-codegen/typescript": "4.1.2",
17-
"@graphql-codegen/typescript-operations": "4.4.0",
18-
"@graphql-codegen/typescript-resolvers": "4.4.1",
15+
"@graphql-codegen/typed-document-node": "5.0.13",
16+
"@graphql-codegen/typescript": "4.1.3",
17+
"@graphql-codegen/typescript-operations": "4.4.1",
18+
"@graphql-codegen/typescript-resolvers": "4.4.2",
1919
"@graphql-tools/graphql-file-loader": "8.0.1",
2020
"@graphql-tools/load": "8.0.2",
2121
"@graphql-tools/schema": "10.0.6",
@@ -24,7 +24,7 @@
2424
"prettier": "2.8.8"
2525
},
2626
"devDependencies": {
27-
"@types/node": "20.16.1",
27+
"@types/node": "22.10.7",
2828
"tsup": "8.2.4"
2929
}
3030
}

‎examples/react/apollo-client-defer/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
"graphql-yoga": "5.7.0"
1212
},
1313
"devDependencies": {
14-
"@graphql-codegen/cli": "^5.0.3",
14+
"@graphql-codegen/cli": "^5.0.4",
1515
"@types/jest": "^27.5.2",
16-
"@types/node": "^20.0.0",
16+
"@types/node": "^22.0.0",
1717
"@types/react": "^18.0.15",
1818
"@types/react-dom": "^18.0.10",
1919
"@vitejs/plugin-react": "^4.0.0",
20-
"cypress": "13.13.3",
20+
"cypress": "14.0.0",
2121
"serve": "14.2.3",
2222
"start-server-and-test": "2.0.5",
2323
"typescript": "5.5.4",
24-
"vite": "^5.0.0"
24+
"vite": "^6.0.0"
2525
},
2626
"scripts": {
2727
"dev": "vite",

‎examples/react/apollo-client-defer/src/gql/gql.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n fragment SlowFieldFragment on Query {\n slowField(waitFor: 5000)\n }\n': typeof types.SlowFieldFragmentFragmentDoc;
18+
'\n query SlowAndFastFieldWithDefer {\n fastField\n ...SlowFieldFragment @defer\n\n ... @defer {\n inlinedSlowField: slowField(waitFor: 5000)\n }\n }\n': typeof types.SlowAndFastFieldWithDeferDocument;
19+
};
20+
const documents: Documents = {
1721
'\n fragment SlowFieldFragment on Query {\n slowField(waitFor: 5000)\n }\n': types.SlowFieldFragmentFragmentDoc,
1822
'\n query SlowAndFastFieldWithDefer {\n fastField\n ...SlowFieldFragment @defer\n\n ... @defer {\n inlinedSlowField: slowField(waitFor: 5000)\n }\n }\n':
1923
types.SlowAndFastFieldWithDeferDocument,

‎examples/react/apollo-client-swc-plugin/codegen.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { CodegenConfig } from '@graphql-codegen/cli';
33

44
const config: CodegenConfig = {
5-
schema: 'https://swapi-graphql.netlify.app/.netlify/functions/index',
5+
schema: 'https://graphql.org/graphql/',
66
documents: ['src/**/*.tsx', '!src/gql/**/*'],
77
generates: {
88
'./src/gql/': {

‎examples/react/apollo-client-swc-plugin/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
},
1010
"devDependencies": {
1111
"@graphql-codegen/client-preset-swc-plugin": "0.2.0",
12-
"@graphql-codegen/cli": "^5.0.3",
12+
"@graphql-codegen/cli": "^5.0.4",
1313
"@vitejs/plugin-react-swc": "^3.3.0",
1414
"@types/react": "18.3.3",
1515
"@types/react-dom": "18.3.0",
1616
"typescript": "5.5.4",
17-
"vite": "^5.0.0"
17+
"vite": "^6.0.0"
1818
},
1919
"scripts": {
2020
"dev": "vite",

‎examples/react/apollo-client-swc-plugin/src/gql/gql.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n query allFilmsWithVariablesQuery($first: Int!) {\n allFilms(first: $first) {\n edges {\n node {\n ...FilmItem\n }\n }\n }\n }\n': typeof types.AllFilmsWithVariablesQueryDocument;
18+
'\n fragment FilmItem on Film {\n id\n title\n releaseDate\n producers\n }\n': typeof types.FilmItemFragmentDoc;
19+
};
20+
const documents: Documents = {
1721
'\n query allFilmsWithVariablesQuery($first: Int!) {\n allFilms(first: $first) {\n edges {\n node {\n ...FilmItem\n }\n }\n }\n }\n':
1822
types.AllFilmsWithVariablesQueryDocument,
1923
'\n fragment FilmItem on Film {\n id\n title\n releaseDate\n producers\n }\n':

‎examples/react/apollo-client-swc-plugin/src/main.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import App from './App';
55
import { ApolloClient, InMemoryCache, ApolloProvider } from '@apollo/client';
66

77
const client = new ApolloClient({
8-
uri: 'https://swapi-graphql.netlify.app/.netlify/functions/index',
8+
uri: 'https://graphql.org/graphql/',
99
cache: new InMemoryCache(),
1010
});
1111

‎examples/react/apollo-client/codegen.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { type CodegenConfig } from '@graphql-codegen/cli';
33

44
const config: CodegenConfig = {
5-
schema: 'https://swapi-graphql.netlify.app/.netlify/functions/index',
5+
schema: 'https://graphql.org/graphql/',
66
documents: ['src/**/*.tsx'],
77
generates: {
88
'./src/gql/': {

‎examples/react/apollo-client/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
"react-dom": "^18.2.0"
1010
},
1111
"devDependencies": {
12-
"@graphql-codegen/cli": "^5.0.3",
12+
"@graphql-codegen/cli": "^5.0.4",
1313
"@vitejs/plugin-react": "^4.0.0",
1414
"@types/jest": "^27.5.2",
15-
"@types/node": "^20.0.0",
15+
"@types/node": "^22.0.0",
1616
"@types/react": "^18.0.15",
1717
"@types/react-dom": "^18.0.10",
1818
"typescript": "5.5.4",
1919
"serve": "14.2.3",
20-
"cypress": "13.13.3",
20+
"cypress": "14.0.0",
2121
"start-server-and-test": "2.0.5",
22-
"vite": "^5.0.0"
22+
"vite": "^6.0.0"
2323
},
2424
"scripts": {
2525
"dev": "vite",

‎examples/react/apollo-client/src/gql/gql.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n query allFilmsWithVariablesQuery($first: Int!) {\n allFilms(first: $first) {\n edges {\n node {\n ...FilmItem\n }\n }\n }\n }\n': typeof types.AllFilmsWithVariablesQueryDocument;
18+
'\n fragment FilmItem on Film {\n id\n title\n releaseDate\n producers\n }\n': typeof types.FilmItemFragmentDoc;
19+
};
20+
const documents: Documents = {
1721
'\n query allFilmsWithVariablesQuery($first: Int!) {\n allFilms(first: $first) {\n edges {\n node {\n ...FilmItem\n }\n }\n }\n }\n':
1822
types.AllFilmsWithVariablesQueryDocument,
1923
'\n fragment FilmItem on Film {\n id\n title\n releaseDate\n producers\n }\n':

‎examples/react/apollo-client/src/main.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import App from './App';
55
import { ApolloClient, InMemoryCache, ApolloProvider } from '@apollo/client';
66

77
const client = new ApolloClient({
8-
uri: 'https://swapi-graphql.netlify.app/.netlify/functions/index',
8+
uri: 'https://graphql.org/graphql/',
99
cache: new InMemoryCache(),
1010
});
1111

‎examples/react/http-executor/codegen.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { type CodegenConfig } from '@graphql-codegen/cli';
33

44
const config: CodegenConfig = {
5-
schema: 'https://swapi-graphql.netlify.app/.netlify/functions/index',
5+
schema: 'https://graphql.org/graphql/',
66
documents: ['src/**/*.tsx'],
77
generates: {
88
'./src/gql/': {

‎examples/react/http-executor/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
"react-dom": "^18.2.0"
99
},
1010
"devDependencies": {
11-
"@graphql-codegen/cli": "^5.0.3",
11+
"@graphql-codegen/cli": "^5.0.4",
1212
"@vitejs/plugin-react": "^4.0.0",
1313
"@types/jest": "^27.5.2",
14-
"@types/node": "^20.0.0",
14+
"@types/node": "^22.0.0",
1515
"@types/react": "^18.0.17",
1616
"@types/react-dom": "^18.0.10",
1717
"typescript": "5.5.4",
1818
"serve": "14.2.3",
19-
"cypress": "13.13.3",
19+
"cypress": "14.0.0",
2020
"start-server-and-test": "2.0.5",
21-
"vite": "^5.0.0"
21+
"vite": "^6.0.0"
2222
},
2323
"scripts": {
2424
"dev": "vite",

‎examples/react/http-executor/src/App.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Film from './Film';
55
import { graphql, DocumentType } from './gql';
66

77
const executor = buildHTTPExecutor({
8-
endpoint: 'https://swapi-graphql.netlify.app/.netlify/functions/index',
8+
endpoint: 'https://graphql.org/graphql/',
99
});
1010

1111
const AllFilmsWithVariablesQuery = graphql(/* GraphQL */ `
@@ -21,7 +21,7 @@ const AllFilmsWithVariablesQuery = graphql(/* GraphQL */ `
2121
`);
2222

2323
// we could also define a client:
24-
// `const client = new GraphQLClient('https://swapi-graphql.netlify.app/.netlify/functions/index')`
24+
// `const client = new GraphQLClient('https://graphql.org/graphql/')`
2525
// and use:
2626
// `client.request(allFilmsWithVariablesQueryDocument, { first: 10 })`
2727

‎examples/react/http-executor/src/gql/gql.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/
1313
* Therefore it is highly recommended to use the babel or swc plugin for production.
1414
* Learn more about it here: https://the-guild.dev/graphql/codegen/plugins/presets/preset-client#reducing-bundle-size
1515
*/
16-
const documents = {
16+
type Documents = {
17+
'\n query allFilmsWithVariablesQuery($first: Int!) {\n allFilms(first: $first) {\n edges {\n node {\n ...FilmItem\n }\n }\n }\n }\n': typeof types.AllFilmsWithVariablesQueryDocument;
18+
'\n fragment FilmItem on Film {\n id\n title\n releaseDate\n producers\n }\n': typeof types.FilmItemFragmentDoc;
19+
};
20+
const documents: Documents = {
1721
'\n query allFilmsWithVariablesQuery($first: Int!) {\n allFilms(first: $first) {\n edges {\n node {\n ...FilmItem\n }\n }\n }\n }\n':
1822
types.AllFilmsWithVariablesQueryDocument,
1923
'\n fragment FilmItem on Film {\n id\n title\n releaseDate\n producers\n }\n':

‎examples/react/nextjs-swr/codegen.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { CodegenConfig } from '@graphql-codegen/cli';
33

44
const config: CodegenConfig = {
5-
schema: 'https://swapi-graphql.netlify.app/.netlify/functions/index',
5+
schema: 'https://graphql.org/graphql/',
66
documents: ['components/**/*.tsx', 'pages/**/*.tsx'],
77
generates: {
88
'./gql/': {

0 commit comments

Comments
 (0)