Skip to content

Commit 6ef4bec

Browse files
committed
Merge branch '16.x.x' into semantic-non-null
2 parents eb9b6c8 + 6b253e7 commit 6ef4bec

File tree

89 files changed

+20363
-26684
lines changed

Some content is hidden

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

89 files changed

+20363
-26684
lines changed

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Copied from '.gitignore', please keep it in sync.
22
/.eslintcache
3-
/.docusaurus
43
/node_modules
54
/coverage
65
/npmDist
76
/denoDist
87
/websiteDist
8+
/website
99

1010
# Ignore TS files inside integration test
1111
/integrationTests/ts/*.ts

.eslintrc.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -466,11 +466,13 @@ rules:
466466
yield-star-spacing: off
467467

468468
overrides:
469-
- files: '**/*.ts'
469+
- files:
470+
- '**/*.ts'
471+
- '**/*.tsx'
470472
parser: '@typescript-eslint/parser'
471473
parserOptions:
472474
sourceType: module
473-
project: ['tsconfig.json']
475+
project: ['./tsconfig.json', './website/tsconfig.json']
474476
plugins:
475477
- '@typescript-eslint'
476478
- 'eslint-plugin-tsdoc'
@@ -726,6 +728,3 @@ overrides:
726728
import/no-commonjs: off
727729
import/no-nodejs-modules: off
728730
import/no-extraneous-dependencies: off
729-
# Ignore docusarus related webpack aliases
730-
import/no-unresolved:
731-
['error', { 'ignore': ['^@theme', '^@docusaurus', '^@generated'] }]

.github/workflows/ci.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ jobs:
7272
- name: Install Dependencies
7373
run: npm ci --ignore-scripts
7474

75-
# Disabled due to https://github.com/milesj/docusaurus-plugin-typedoc-api/pull/19
76-
# - name: Check that package-lock.json doesn't have conflicts
77-
# run: npm ls --depth 999
78-
7975
- name: Run npm install
8076
run: npm install --ignore-scripts --force --package-lock-only --engine-strict --strict-peer-deps
8177

@@ -219,7 +215,6 @@ jobs:
219215
- name: Setup Node.js
220216
uses: actions/setup-node@v2
221217
with:
222-
cache: npm
223218
node-version-file: '.node-version'
224219

225220
- name: Install Dependencies
@@ -233,30 +228,3 @@ jobs:
233228
with:
234229
name: denoDist
235230
path: ./denoDist
236-
237-
build-website-dist:
238-
name: Build website
239-
runs-on: ubuntu-latest
240-
steps:
241-
- name: Checkout repo
242-
uses: actions/checkout@v2
243-
with:
244-
persist-credentials: false
245-
246-
- name: Setup Node.js
247-
uses: actions/setup-node@v2
248-
with:
249-
cache: npm
250-
node-version-file: '.node-version'
251-
252-
- name: Install Dependencies
253-
run: npm ci --ignore-scripts
254-
255-
- name: Build Docs
256-
run: npm run build:website
257-
258-
- name: Upload denoDist package
259-
uses: actions/upload-artifact@v4
260-
with:
261-
name: websiteDist
262-
path: ./websiteDist

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
/diff-npm-package.html
99
/.eslintcache
1010
/.cspellcache
11-
/.docusaurus
12-
/node_modules
11+
node_modules
1312
/coverage
1413
/npmDist
1514
/denoDist
1615
/websiteDist
16+
/website/.next
17+
/website/out

.prettierignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# Copied from '.gitignore', please keep it in sync.
22
/diff-npm-package.html
33
/.eslintcache
4-
/.docusaurus
54
/node_modules
65
/coverage
76
/npmDist
87
/denoDist
98
/websiteDist
9+
/website/out
10+
/website/**/*.mdx
11+
.next

benchmark/fixtures.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ exports.bigSchemaSDL = fs.readFileSync(
88
'utf8',
99
);
1010

11+
exports.bigDocumentSDL = fs.readFileSync(
12+
path.join(__dirname, 'kitchen-sink.graphql'),
13+
'utf8',
14+
);
15+
1116
exports.bigSchemaIntrospectionResult = JSON.parse(
1217
fs.readFileSync(path.join(__dirname, 'github-schema.json'), 'utf8'),
1318
);

benchmark/kitchen-sink.graphql

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
query queryName($foo: ComplexType, $site: Site = MOBILE) @onQuery {
2+
whoever123is: node(id: [123, 456]) {
3+
id
4+
... on User @onInlineFragment {
5+
field2 {
6+
id
7+
alias: field1(first: 10, after: $foo) @include(if: $foo) {
8+
id
9+
...frag @onFragmentSpread
10+
}
11+
}
12+
}
13+
... @skip(unless: $foo) {
14+
id
15+
}
16+
... {
17+
id
18+
}
19+
}
20+
}
21+
22+
mutation likeStory @onMutation {
23+
like(story: 123) @onField {
24+
story {
25+
id @onField
26+
}
27+
}
28+
}
29+
30+
subscription StoryLikeSubscription(
31+
$input: StoryLikeSubscribeInput @onVariableDefinition
32+
) @onSubscription {
33+
storyLikeSubscribe(input: $input) {
34+
story {
35+
likers {
36+
count
37+
}
38+
likeSentence {
39+
text
40+
}
41+
}
42+
}
43+
}
44+
45+
fragment frag on Friend @onFragmentDefinition {
46+
foo(
47+
size: $size
48+
bar: $b
49+
obj: {
50+
key: "value"
51+
block: """
52+
block string uses \"""
53+
"""
54+
}
55+
)
56+
}
57+
58+
{
59+
unnamed(truthy: true, falsy: false, nullish: null)
60+
query
61+
}
62+
63+
query {
64+
__typename
65+
}

benchmark/printer-benchmark.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
'use strict';
2+
3+
const { parse } = require('graphql/language/parser.js');
4+
const { print } = require('graphql/language/printer.js');
5+
6+
const { bigDocumentSDL } = require('./fixtures.js');
7+
8+
const document = parse(bigDocumentSDL);
9+
10+
module.exports = {
11+
name: 'Print kitchen sink document',
12+
count: 1000,
13+
measure() {
14+
print(document);
15+
},
16+
};

cspell.yml

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ignorePaths:
99
- tsconfig.json
1010
- benchmark/github-schema.graphql
1111
- benchmark/github-schema.json
12+
- website/icons
13+
- website/css
1214
overrides:
13-
- filename: '**/docs-old/APIReference-*.md'
14-
ignoreRegExpList: ['/href="[^"]*"/']
1515
- filename: 'website/**'
1616
dictionaries:
1717
- fullstack
@@ -52,6 +52,61 @@ words:
5252
- deno
5353
- codecov
5454

55+
# Website tech
56+
- Nextra
57+
- headlessui
58+
- Fastify
59+
- tailwindcss
60+
- svgr
61+
- ruru
62+
- oneof
63+
- vercel
64+
65+
# used as href anchors
66+
- graphqlerror
67+
- syntaxerror
68+
- formaterror
69+
- graphqlschema
70+
- graphqlscalartype
71+
- graphqlobjecttype
72+
- graphqlinterfacetype
73+
- graphqluniontype
74+
- graphqlenumtype
75+
- graphqlinputobjecttype
76+
- graphqllist
77+
- graphqlnonnull
78+
- graphqlint
79+
- graphqlfloat
80+
- graphqlstring
81+
- graphqlboolean
82+
- graphqlid
83+
- getlocation
84+
- isinputtype
85+
- isoutputtype
86+
- isleaftype
87+
- iscompositetype
88+
- isabstracttype
89+
- getnullabletype
90+
- getnamedtype
91+
- introspectionquery
92+
- buildclientschema
93+
- buildschema
94+
- printschema
95+
- printintrospectionschema
96+
- buildastschema
97+
- typefromast
98+
- astfromvalue
99+
- typeinfo
100+
- isvalidjsvalue
101+
- isvalidliteralvalue
102+
- specifiedrules
103+
- Wordmark
104+
- codeofconduct
105+
- graphqlconf
106+
107+
# website words
108+
- runtimes
109+
55110
# TODO: remove bellow words
56111
- QLID # GraphQLID
57112
- QLJS # GraphQLJS

0 commit comments

Comments
 (0)