Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ _Progress of the issue based on the
[Contributor Workflow](https://github.com/the-guild-org/Stack/blob/master/CONTRIBUTING.md#a-typical-contributor-workflow)_

- [ ] 1. The issue provides a reproduction available on Github, Stackblitz or CodeSandbox
> Make sure to fork this template and run `yarn generate` in the terminal.
> Make sure to fork this template and run `npm run generate` in the terminal.
>
> Please make sure the GraphQL Tools package versions under `package.json` matches yours.
- [ ] 2. A failing test has been provided
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
permissions:
contents: read
id-token: write
uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main
uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@v1
if: ${{ github.event.pull_request.title != 'Upcoming Release Changes' }}
with:
npmTag: alpha
buildScript: build
nodeVersion: 24
node-version-file: .node-version
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
contents: write
id-token: write
pull-requests: write
uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main
uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@v1
with:
releaseScript: release
nodeVersion: 24
node-version-file: .node-version
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
56 changes: 31 additions & 25 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,37 @@ jobs:
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5

- name: Setup env
uses: the-guild-org/shared-config/setup@main
uses: the-guild-org/shared-config/setup@v1
with:
nodeVersion: 24
node-version-file: .node-version

- name: Use GraphQL v15
run: node ./scripts/match-graphql.js 15
- name: Install Dependencies using Yarn
run: yarn install --ignore-engines && git checkout yarn.lock
run: |
node ./scripts/match-graphql.js 15
npm install --ignore-engines
git checkout package-lock.json
npx rimraf packages/**/*/node_modules/graphql
npx rimraf packages/executor/node_modules/graphql
- name: Type Check
run: yarn ts:check
run: npm run ts:check
check:
name: Full Check on GraphQL v16
runs-on: ubuntu-latest
steps:
- name: Checkout Master
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
- name: Setup env
uses: the-guild-org/shared-config/setup@main
uses: the-guild-org/shared-config/setup@v1
with:
nodeVersion: 24
node-version-file: .node-version
- name: Prettier
run: yarn prettier:check
run: npm run prettier:check
- name: Lint
run: yarn lint
run: npm run lint
- name: Build
run: yarn build
run: npm run build
- name: Test ESM and CJS integrity
run: yarn bob check
run: npx bob check
test:
name:
Unit Test on Node ${{matrix.node-version}} (${{matrix.os}}) and GraphQL
Expand All @@ -76,52 +79,55 @@ jobs:
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5

- name: Setup env
uses: the-guild-org/shared-config/setup@main
uses: the-guild-org/shared-config/setup@v1
with:
nodeVersion: ${{matrix.node-version}}
node-version: ${{matrix.node-version}}

- name: Use GraphQL v${{matrix.graphql_version}}
run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
- name: Install Dependencies using Yarn
run: yarn install --ignore-engines && git checkout yarn.lock
run: |
node ./scripts/match-graphql.js ${{matrix.graphql_version}}
npm install --ignore-engines
git checkout package-lock.json
npx rimraf packages/**/*/node_modules/graphql
npx rimraf packages/executor/node_modules/graphql
- name: Cache Jest
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
with:
path: .cache/jest
key:
${{ runner.os }}-${{matrix.node-version}}-${{matrix.graphql_version}}-jest-${{
hashFiles('yarn.lock') }}
hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.os }}-${{matrix.node-version}}-${{matrix.graphql_version}}-jest-
- name: Build
run: yarn build
run: npm run build
- name: Unit Tests
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
with:
timeout_minutes: 10
max_attempts: 5
command: yarn test --ci
command: npm run test --ci
- name: Leak Tests
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
with:
timeout_minutes: 10
max_attempts: 5
command: yarn test:leaks --ci
command: npm run test:leaks --ci
test-bun:
name: Unit Test on Bun
runs-on: ubuntu-latest
steps:
- name: Checkout Master
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
- name: Setup env
uses: the-guild-org/shared-config/setup@main
uses: the-guild-org/shared-config/setup@v1
with:
nodeVersion: 24
node-version-file: .node-version
- name: Build
run: yarn build
run: npm run build
- name: Unit Tests
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
with:
timeout_minutes: 10
max_attempts: 5
command: yarn test:bun --ci
command: npm run test:bun --ci
7 changes: 3 additions & 4 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
- name: checkout
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5

- uses: the-guild-org/shared-config/setup@main
- uses: the-guild-org/shared-config/setup@v1
name: setup env
with:
nodeVersion: 20
packageManager: yarn
node-version-file: .node-version

- uses: the-guild-org/shared-config/website-cf@main
name: build and deploy website
Expand All @@ -39,5 +38,5 @@ jobs:
projectName: graphql-tools
prId: ${{ github.event.pull_request.number }}
websiteDirectory: ./
buildScript: yarn build && yarn build:api-docs && cd website && yarn build
buildScript: npm run build && npm run build:api-docs && cd website && npm run build
artifactDir: website/out
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ temp
test-results/
junit.xml

package-lock.json
yarn.lock
website/public/_redirects
website/public/sitemap.xml
website/src/content/api/
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
yarn lint-staged
npx lint-staged
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v24
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
provenance=true
ignore-engines=true
force=true
2 changes: 0 additions & 2 deletions .yarnrc

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ improvement, no matter how small! If you would like to suggest a big change or m
love to hear your ideas but please open an issue for discussion before writing the PR.

If you want to edit the documentation locally you have to clone this project, install the
dependencies using `yarn` and run the command `yarn build:api-docs`. Afterwards, run
`yarn workspace website dev` and visit `http://localhost:3000`. All the documentation can be found
dependencies using `npm` and run the command `npm run build:api-docs`. Afterwards, run
`npm workspace website dev` and visit `http://localhost:3000`. All the documentation can be found
within `website/src/pages/docs`.

### Responding to issues
Expand Down
Loading
Loading