Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanchapman authored Mar 14, 2023
2 parents 1e4c86a + c17b986 commit 1d5e659
Show file tree
Hide file tree
Showing 100 changed files with 14,658 additions and 13,054 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/audit-command': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/code-loader': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
7 changes: 7 additions & 0 deletions .changeset/@graphql-inspector_commands-2393-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/commands': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
7 changes: 7 additions & 0 deletions .changeset/@graphql-inspector_config-2393-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/config': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
7 changes: 7 additions & 0 deletions .changeset/@graphql-inspector_core-2393-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/core': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/coverage-command': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/diff-command': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/docs-command': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
7 changes: 7 additions & 0 deletions .changeset/@graphql-inspector_git-loader-2393-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/git-loader': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
7 changes: 7 additions & 0 deletions .changeset/@graphql-inspector_github-2393-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/github': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^14.0.0 || ^15.0.0 || ^16.0.0`, in
`peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/github-loader': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/graphql-loader': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/introspect-command': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/json-loader': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
7 changes: 7 additions & 0 deletions .changeset/@graphql-inspector_loaders-2393-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/loaders': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/serve-command': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/similar-command': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
7 changes: 7 additions & 0 deletions .changeset/@graphql-inspector_url-loader-2393-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/url-loader': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@graphql-inspector/validate-command': patch
---
dependencies updates:
- Updated dependency [`graphql@^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0`
↗︎](https://www.npmjs.com/package/graphql/v/13.0.0) (from `^0.13.0 || ^14.0.0 || ^15.0.0 ||
^16.0.0`, in `peerDependencies`)
5 changes: 0 additions & 5 deletions .changeset/clever-bikes-check.md

This file was deleted.

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 `pnpm generate` in the terminal.
>
> Please make sure the Codegen and plugins version under `package.json` matches yours.
- [ ] 2. A failing test has been provided
Expand Down
59 changes: 59 additions & 0 deletions .github/workflows/algolia-integrity.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Algolia Integrity
on:
pull_request:
paths:
- 'website/**'
branches:
- master
jobs:
algolia-records-check:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Fetch
run: git fetch origin master

- name: Setup env
uses: the-guild-org/shared-config/setup@main
with:
nodeVersion: 18
packageManager: pnpm

- name: Build Packages
run: pnpm build

- name: Typecheck
run: pnpm --filter website build

- name: Algolia generate
run: pnpm --filter website algolia-sync
env:
ALGOLIA_DRY_RUN: true
SITE_URL: https://www.the-guild.dev/graphql/inspector/

- name: Format
run: pnpm prettier

- name: Compare
run: git diff origin/${{ github.base_ref }}.. -- website/algolia-lockfile.json

- name: Diff to file
if: always()
id: diff_result
run: |
OUTPUT=$(git diff origin/${{ github.base_ref }}.. -- website/algolia-lockfile.json)
OUTPUT="${OUTPUT//'%'/'%25'}"
OUTPUT="${OUTPUT//$'\n'/'%0A'}"
OUTPUT="${OUTPUT//$'\r'/'%0D'}"
echo "::set-output name=result::$OUTPUT"
- name: Publish a message
if: always() && contains(steps.diff_result.outputs.result, 'diff')
uses: marocchino/sticky-pull-request-comment@v2
with:
message: |
```diff
${{ steps.diff_result.outputs.result }}
```
58 changes: 58 additions & 0 deletions .github/workflows/algolia-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Algolia Publish

on:
push:
branches:
- master

jobs:
algolia-push-records:
name: Push new records if changes
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3

- name: Setup env
uses: the-guild-org/shared-config/setup@main
with:
nodeVersion: 18
packageManager: pnpm

- name: Build Packages
run: pnpm build

- name: Typecheck
run: pnpm --filter website build

- name: Algolia push
run: pnpm --filter website algolia-sync
env:
ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
ALGOLIA_ADMIN_API_KEY: ${{ secrets.ALGOLIA_ADMIN_API_KEY }}
ALGOLIA_INDEX_NAME: ${{ secrets.ALGOLIA_INDEX_NAME }}
SITE_URL: https://www.the-guild.dev/graphql/inspector/

- name: Format
run: pnpm prettier

- name: Compare
run: git diff website/algolia-lockfile.json

- name: Diff to file
if: always()
id: diff_result
run: |
OUTPUT=$(git diff website/algolia-lockfile.json)
OUTPUT="${OUTPUT//'%'/'%25'}"
OUTPUT="${OUTPUT//$'\n'/'%0A'}"
OUTPUT="${OUTPUT//$'\r'/'%0D'}"
echo "::set-output name=result::$OUTPUT"
- name: Commit algolia-lockfile.json
if: always() && contains(steps.diff_result.outputs.result, 'diff')
uses: EndBug/add-and-commit@v9
with:
commit: website/algolia-lockfile.json
message: Update algolia-lockfile.json
default_author: github_actions
29 changes: 17 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,37 @@ jobs:
with:
node-version: ${{ matrix.node_version }}

- name: Get yarn cache
id: yarn-cache
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
- name: Install pnpm
uses: pnpm/action-setup@v2.2.4
with:
version: 7

- name: Get pnpm cache - Set output
id: pnpm-cache
run: echo "{dir}={pnpm cache dir}" >> $GITHUB_OUTPUT

- name: Cache Yarn
- name: Cache pnpm
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
path: ${ env.dir }
key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-yarn-
${{ runner.os }}-pnpm-
- name: Install
run: yarn --ignore-engines
run: pnpm i --no-frozen-lockfile

- name: Build
run: yarn build
run: pnpm build

- name: Test
run: yarn test
run: pnpm test

- name: Lint ESLint
run: yarn lint
run: pnpm lint

- name: Lint Prettier
run: yarn lint:prettier
run: pnpm lint:prettier

- name: Integration tests
run: |
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,21 @@ on:
- master

jobs:
algolia:
uses: the-guild-org/shared-config/.github/workflows/algolia-integrity.yml@main
secrets:
githubToken: ${{ secrets.GUILD_BOT_TOKEN }}
with:
domain: https://www.the-guild.dev/graphql/inspector/
source: 'Inspector'
release:
uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main
with:
npmTag: alpha
buildScript: build
nodeVersion: 18
packageManager: pnpm
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
npmToken: ${{ secrets.NPM_TOKEN }}
dependencies:
uses: the-guild-org/shared-config/.github/workflows/changesets-dependencies.yaml@main
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
with:
installDependencies: true
packageManager: pnpm
nodeVersion: 18
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
with:
releaseScript: release
nodeVersion: 16
packageManager: pnpm
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
npmToken: ${{ secrets.NPM_TOKEN }}
Loading

0 comments on commit 1d5e659

Please sign in to comment.