Skip to content

Commit 00aba1d

Browse files
authored
Merge branch 'graphql:main' into main
2 parents ef4b1f7 + 79d1d99 commit 00aba1d

File tree

103 files changed

+3821
-1524
lines changed

Some content is hidden

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

103 files changed

+3821
-1524
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ working-group/
55
packages/codemirror-graphql/src/__tests__/schema-kitchen-sink.graphql
66
CHANGELOG.md
77
**/CHANGELOG.md
8+
packages/vscode-graphql-syntax/tests/__fixtures__/

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ module.exports = {
3030
'changesets/**/*.md',
3131
'**/CHANGELOG.md',
3232
'functions/*',
33+
'packages/vscode-graphql-syntax/tests/__fixtures__/*',
3334
],
3435
overrides: [
3536
{

.github/workflows/main-test.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Main Tests
2+
# report coverage on main for codecov baseline
3+
on:
4+
push:
5+
branches: [main]
6+
jobs:
7+
install:
8+
name: Install
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout Code
13+
uses: actions/checkout@v3
14+
- uses: actions/setup-node@v3
15+
with:
16+
node-version: 16
17+
cache: yarn
18+
- name: Cache node modules
19+
id: cache-modules
20+
uses: actions/cache@v3
21+
with:
22+
path: |
23+
**/node_modules
24+
key: modules-${{ github.sha }}
25+
- uses: actions/cache@v3
26+
with:
27+
path: |
28+
~/.cache/Cypress
29+
key: cypress-${{ runner.os }}
30+
- run: yarn install --frozen-lockfile --immutable
31+
32+
jest:
33+
name: Jest Unit Tests
34+
runs-on: ubuntu-latest
35+
needs: [install]
36+
steps:
37+
- uses: actions/checkout@v3
38+
- uses: actions/setup-node@v3
39+
with:
40+
node-version: 16
41+
- id: cache-modules
42+
uses: actions/cache@v3
43+
with:
44+
path: |
45+
**/node_modules
46+
key: modules-${{ github.sha }}
47+
- run: yarn test --coverage
48+
- uses: codecov/codecov-action@v3
49+
with:
50+
token: ${{ secrets.CODECOV_TOKEN }}
51+
files: coverage/lcov.info
52+
fail_ci_if_error: true
53+
verbose: true

.vscode/settings.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"npm.packageManager": "yarn",
33
"editor.formatOnSave": true,
4-
"files.insertFinalNewline": true
4+
"files.insertFinalNewline": true,
5+
"editor.trimAutoWhitespace": false,
6+
"coverage-gutters.showLineCoverage": true,
7+
"coverage-gutters.coverageBaseDir": "coverage",
8+
"coverage-gutters.coverageFileNames": [
9+
"lcov.info",
10+
"cov.xml",
11+
"coverage.xml",
12+
"jacoco.xml",
13+
"coverage.cobertura.xml"
14+
]
515
}

DEVELOPMENT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ this repo._
4444
If you are focused on GraphiQL development, you can run —
4545

4646
```sh
47-
yarn start-graphiql
47+
yarn dev-graphiql
4848
```
4949

5050
5. Get coding! If you've added code, add tests. If you've changed APIs, update
@@ -89,7 +89,7 @@ First, you'll need to `yarn build` all the packages from the root.
8989

9090
Then, you can run these commands:
9191

92-
- `yarn start-graphiql` — which will launch `webpack` dev server for graphiql
92+
- `yarn dev-graphiql` — which will launch `webpack` dev server for graphiql
9393
from the root
9494

9595
> The GraphiQL UI is available at http://localhost:8080/dev.html

custom-words.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ yoshiakis
6565

6666
// packages and tools
6767
argparse
68+
astro
69+
astrojs
6870
changesets
6971
clsx
7072
codemirror
@@ -81,6 +83,8 @@ intellij
8183
jsdelivr
8284
lezer
8385
manypkg
86+
modulemap
87+
mockfs
8488
meros
8589
nullthrows
8690
onig
@@ -94,6 +98,7 @@ typedoc
9498
vite
9599
vitest
96100
vitejs
101+
vsix
97102
wonka
98103
urql
99104
tsup
@@ -128,7 +133,6 @@ listvalues
128133
marko
129134
matchingbracket
130135
middlewares
131-
modulemap
132136
newhope
133137
nextjs
134138
nocheck
@@ -228,3 +232,4 @@ unparsable
228232
randomthing
229233
codicon
230234
edcore
235+
tokenizes

examples/cm6-graphql-legacy-parcel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@codemirror/basic-setup": "^0.20.0",
2626
"@codemirror/language": "^0.20.0",
2727
"codemirror-graphql": "^2.0.2",
28-
"graphql": "^16.4.0"
28+
"graphql": "^16.8.1"
2929
},
3030
"devDependencies": {
3131
"parcel-bundler": "^1.12.4",

examples/cm6-graphql-parcel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@codemirror/theme-one-dark": "6.0.0",
3030
"@codemirror/view": "6.1.2",
3131
"cm6-graphql": "0.0.1",
32-
"graphql": "^16.4.0"
32+
"graphql": "^16.8.1"
3333
},
3434
"devDependencies": {
3535
"parcel": "^2.6.2",

examples/graphiql-create-react-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"dependencies": {
66
"graphiql": "^2.2.0",
7-
"graphql": "^16.4.0",
7+
"graphql": "^16.8.1",
88
"react": "^18.2.0",
99
"react-dom": "^18.2.0",
1010
"react-scripts": "5.0.1"

examples/graphiql-parcel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"graphiql": "^2.2.0",
26-
"graphql": "^16.4.0",
26+
"graphql": "^16.8.1",
2727
"react": "^18.2.0",
2828
"react-dom": "^18.2.0"
2929
},

0 commit comments

Comments
 (0)