Skip to content

Commit

Permalink
chore(deps): update
Browse files Browse the repository at this point in the history
  • Loading branch information
enisdenjo committed Nov 29, 2023
1 parent af795c4 commit 2547963
Show file tree
Hide file tree
Showing 19 changed files with 5,984 additions and 6,921 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/algolia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: yarn
- name: Install
run: yarn install --immutable
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: yarn
- name: Install
run: yarn install --immutable
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: yarn
- name: Install
run: yarn install --immutable
Expand All @@ -63,7 +63,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: yarn
- name: Install
run: yarn install --immutable
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: yarn
- name: Install
run: yarn install --immutable
- name: Check
run: yarn workspaces foreach -v run check:${{ matrix.check }}
run: yarn workspaces foreach -A -p -v run check:${{ matrix.check }}

test:
name: Test
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: yarn
- name: Install
run: yarn install --immutable
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v3
with:
node-version: 18
node-version-file: .nvmrc
cache: yarn
- name: Install
run: yarn install --immutable
Expand All @@ -40,4 +40,4 @@ jobs:
prId: ${{ github.event.pull_request.number }}
websiteDirectory: website
buildScript: yarn build
artifactDir: dist
artifactDir: out
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
node_modules/
lib/
umd/
dist/
.vscode/
.yarn/*
!.yarn/releases
!.yarn/plugins
.next/
!.yarn/releases/
.idea/
website/.next/
website/src/pages/docs/
website/out/
website/algolia-lockfile.json
website/public/sitemap.xml
tsconfig.tsbuildinfo
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v21
541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

28 changes: 0 additions & 28 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

This file was deleted.

874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.2.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
nodeLinker: node-modules
compressionLevel: mixed

enableGlobalCache: false

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: '@yarnpkg/plugin-interactive-tools'
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.2.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"engines": {
"node": ">=12"
},
"packageManager": "yarn@3.6.2",
"packageManager": "yarn@4.0.2",
"main": "lib/index.js",
"module": "lib/index.mjs",
"browser": "umd/graphql-sse.js",
Expand Down Expand Up @@ -98,35 +98,35 @@
"graphql": ">=0.11 <=16"
},
"devDependencies": {
"@rollup/plugin-terser": "^0.4.3",
"@rollup/plugin-typescript": "^11.1.3",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^11.1.5",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@types/eslint": "^8.44.2",
"@types/eventsource": "^1.1.11",
"@types/express": "^4.17.17",
"@types/eslint": "^8.44.7",
"@types/eventsource": "^1.1.15",
"@types/express": "^4.17.21",
"@types/glob": "^8.1.0",
"@types/koa": "^2.13.8",
"@types/koa-mount": "^4.0.2",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"eslint": "^8.48.0",
"@types/koa": "^2.13.12",
"@types/koa-mount": "^4.0.5",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eventsource": "^2.0.2",
"express": "^4.18.2",
"fastify": "^4.22.2",
"glob": "^10.3.4",
"graphql": "^16.8.0",
"fastify": "^4.24.3",
"glob": "^10.3.10",
"graphql": "^16.8.1",
"koa": "^2.14.2",
"koa-mount": "^4.0.0",
"prettier": "^3.0.3",
"rollup": "^3.29.0",
"prettier": "^3.1.0",
"rollup": "^4.6.0",
"rollup-plugin-gzip": "^3.1.0",
"semantic-release": "^21.1.1",
"semantic-release": "^22.0.8",
"tslib": "^2.6.2",
"typedoc": "^0.25.1",
"typedoc-plugin-markdown": "^3.16.0",
"typescript": "^5.2.2",
"vitest": "^0.34.3"
"typedoc": "^0.25.4",
"typedoc-plugin-markdown": "^3.17.1",
"typescript": "^5.3.2",
"vitest": "^0.34.6"
}
}
8 changes: 4 additions & 4 deletions src/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ export interface ExecutionPatchResult<
export type StreamData<E extends StreamEvent> = E extends 'next'
? ExecutionResult | ExecutionPatchResult
: E extends 'complete'
? null
: never;
? null
: never;

/** @category Common */
export type StreamDataForID<E extends StreamEvent> = E extends 'next'
? { id: string; payload: ExecutionResult | ExecutionPatchResult }
: E extends 'complete'
? { id: string }
: never;
? { id: string }
: never;

/** @category Common */
export function parseStreamData<ForID extends boolean, E extends StreamEvent>(
Expand Down
6 changes: 2 additions & 4 deletions tests/use.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,8 @@ data: {"data":{"ping":"pong"}}
});

ctrl.abort();
await expect(reader.next()).rejects.toEqual(
expect.objectContaining({
message: 'The operation was aborted.',
}),
await expect(reader.next()).rejects.toThrowError(
'This operation was aborted',
);

// wait for one tick
Expand Down
1 change: 1 addition & 0 deletions website/next-sitemap.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* @type {import('next-sitemap').IConfig}
*/
const opts = {
outDir: 'out', // next has to be built first
siteUrl: process.env.SITE_URL || 'https://the-guild.dev/graphql/sse',
generateIndexSitemap: false,
exclude: ['*/_meta'],
Expand Down
5 changes: 4 additions & 1 deletion website/next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
import { withGuildDocs } from '@theguild/components/next.config';
export default withGuildDocs();

export default withGuildDocs({
output: 'export',
});
14 changes: 7 additions & 7 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
"check:lint": "echo 'Check is done in root...'",
"check:type": "tsc --noEmit",
"start": "next",
"build": "next build && next-sitemap --config next-sitemap.config.cjs && next export -o dist"
"build": "next build && next-sitemap --config next-sitemap.config.cjs"
},
"dependencies": {
"@theguild/components": "^6.0.0",
"@theguild/components": "^6.1.0",
"clsx": "^2.0.0",
"next": "^13.4.19",
"next": "^14.0.3",
"next-sitemap": "^4.2.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.11.0"
"react-icons": "^4.12.0"
},
"devDependencies": {
"@theguild/algolia": "^2.0.0",
"@theguild/algolia": "^2.1.0",
"@theguild/tailwind-config": "^0.3.0",
"@types/react": "^18.2.21",
"typescript": "^5.2.2"
"@types/react": "^18.2.39",
"typescript": "^5.3.2"
}
}
4 changes: 2 additions & 2 deletions website/scripts/algolia-sync.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ indexToAlgolia({
docsBaseDir: 'src/pages/',
source,
domain,
sitemapXmlPath: 'public/sitemap.xml',
sitemapXmlPath: 'out/sitemap.xml',
},
source,
domain,
sitemapXmlPath: 'public/sitemap.xml',
sitemapXmlPath: 'out/sitemap.xml',
lockfilePath: 'algolia-lockfile.json',
dryMode: process.env.ALGOLIA_DRY_RUN === 'true',
});
Loading

0 comments on commit 2547963

Please sign in to comment.