fix(deps): update all non-major dependencies (#2479)

renovate[bot] · github-actions[bot] · web-flow · commit 482499a6b288 · 2025-01-21T03:22:27.000+03:00
* fix(deps): update all non-major dependencies

* chore(dependencies): updated changesets for modified dependencies

---------

Co-authored-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
Co-authored-by: github-actions[bot] &lt;github-actions[bot]@users.noreply.github.com&gt;
diff --git a/.changeset/graphql-modules-2479-dependencies.md b/.changeset/graphql-modules-2479-dependencies.md
@@ -0,0 +1,5 @@
+---
+'graphql-modules': patch
+---
+dependencies updates:
+  - Updated dependency [`ramda@^0.30.0` ↗︎](https://www.npmjs.com/package/ramda/v/0.30.0) (from `^0.29.0`, in `dependencies`)
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -8,4 +8,4 @@ jobs:
     uses: the-guild-org/shared-config/.github/workflows/ci-node-matrix.yml@main
     with:
       script: 'yarn build && yarn benchmark:basic'
-      nodeVersions: '[16,18]'
+      nodeVersions: '[18,20,22,23]'
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -10,7 +10,7 @@ jobs:
     with:
       npmTag: alpha
       buildScript: build
-      nodeVersion: 18
+      nodeVersion: 23
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main
     with:
       releaseScript: release
-      nodeVersion: 18
+      nodeVersion: 23
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,9 +28,9 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 18
+          nodeVersion: 23
       - name: Use GraphQL v${{matrix.graphql_version}}
-        run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
+        run: node ./scripts/match-graphql.js ${{matrix.graphql_version}} && yarn install --no-frozen-lockfile
       - name: Type Check
         run: yarn ts:check
   test:
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest] # remove windows to speed up the tests
-        node-version: [12, 16, 18]
+        node-version: [18, 20, 22, 23]
         graphql_version:
           - 15
           - 16
@@ -49,9 +49,9 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 18
+          nodeVersion: 23
       - name: Use GraphQL v${{matrix.graphql_version}}
-        run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
+        run: node ./scripts/match-graphql.js ${{matrix.graphql_version}} && yarn install --no-frozen-lockfile
       - name: Cache Jest
         uses: actions/cache@v3
         with:
@@ -72,7 +72,7 @@ jobs:
       - name: Setup env
         uses: the-guild-org/shared-config/setup@main
         with:
-          nodeVersion: 18
+          nodeVersion: 23
       - name: Build Packages
         run: yarn build
       - name: Test ESM
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: the-guild-org/shared-config/setup@main
         name: setup env
         with:
-          nodeVersion: 18
+          nodeVersion: 23
           packageManager: yarn
 
       - uses: the-guild-org/shared-config/website-cf@main
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 yarn lint-staged
diff --git a/.npmrc b/.npmrc
@@ -1 +1,2 @@
 save-exact=true
+ignore-engines=true
diff --git a/.prettierignore b/.prettierignore
@@ -2,3 +2,4 @@ website/src/pages/docs/advanced/middlewares.mdx
 website/src/pages/docs/advanced/subscriptions.mdx
 website/src/pages/docs/di/providers.mdx
 website/src/pages/docs/recipes/migration.mdx
+website/out
diff --git a/jest.config.base.js b/jest.config.base.js
@@ -3,7 +3,6 @@ const { pathsToModuleNameMapper } = require('ts-jest');
 
 const ROOT_DIR = __dirname;
 const TSCONFIG_PATH = resolve(ROOT_DIR, 'tsconfig.json');
-const TSCONFIG_TEST_PATH = resolve(ROOT_DIR, 'tsconfig.test.json');
 const tsconfig = require(TSCONFIG_PATH);
 const CI = !!process.env.CI;
 
@@ -12,7 +11,7 @@ module.exports = (dir) => {
     testEnvironment: 'node',
     rootDir: dir,
     reporters: ['default'],
-    modulePathIgnorePatterns: ['dist'],
+    modulePathIgnorePatterns: ['dist', '.bob'],
     moduleNameMapper: pathsToModuleNameMapper(tsconfig.compilerOptions.paths, {
       prefix: `${ROOT_DIR}/`,
     }),
diff --git a/package.json b/package.json
@@ -12,65 +12,66 @@
     "prepare": "husky install",
     "postinstall": "patch-package",
     "ts:check": "tsc --project tsconfig.json --noEmit",
-    "ci:lint": "eslint \"packages/**/*.{js,jsx,ts,tsx}\" --output-file eslint_report.json --format json",
+    "ci:lint": "cross-env \"ESLINT_USE_FLAT_CONFIG=false\" eslint \"packages/**/*.{js,jsx,ts,tsx}\" --output-file eslint_report.json --format json",
     "build": "tsc --project tsconfig.json && bob build",
     "test": "jest --config jest.config.base.js",
     "prerelease": "yarn build",
     "release": "changeset publish",
     "format": "prettier --cache --ignore-path .gitignore --ignore-path .prettierignore --check --write \"{packages,website}/**/*.{js,jsx,json,css,md,mdx,ts,tsx}\"",
     "pr": "changeset",
-    "lint": "eslint \"packages/**/*.{js,jsx,ts,tsx}\"",
+    "lint": "cross-env \"ESLINT_USE_FLAT_CONFIG=false\" eslint \"packages/**/*.{js,jsx,ts,tsx}\"",
     "benchmark:basic": "NODE_ENV=production ts-node --project tsconfig.app.json benchmark/basic.case.ts",
     "deploy-website": "cd website && yarn && yarn build && mkdir graphql-modules && mv build/* graphql-modules && mv graphql-modules build"
   },
   "devDependencies": {
     "@apollo/federation": "0.38.1",
-    "@babel/core": "7.23.5",
-    "@babel/preset-env": "7.23.5",
-    "@babel/preset-typescript": "7.23.3",
-    "@babel/plugin-proposal-decorators": "7.23.5",
+    "@babel/core": "7.26.0",
+    "@babel/preset-env": "7.26.0",
+    "@babel/preset-typescript": "7.26.0",
+    "@babel/plugin-proposal-decorators": "7.25.9",
     "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@changesets/cli": "2.27.1",
+    "@changesets/cli": "2.27.11",
     "@changesets/changelog-github": "0.5.0",
     "@envelop/graphql-modules": "6.0.0",
-    "@graphql-tools/merge": "9.0.1",
+    "@graphql-tools/merge": "9.0.17",
     "@graphql-yoga/node": "3.9.1",
     "@types/benchmark": "2.1.5",
-    "graphql-jit": "0.8.4",
+    "graphql-jit": "0.8.7",
     "@types/express": "5.0.0",
-    "@types/jest": "29.5.11",
-    "@types/node": "22.8.2",
-    "@types/ramda": "0.29.9",
-    "@typescript-eslint/eslint-plugin": "8.12.0",
-    "@typescript-eslint/parser": "8.12.0",
+    "@types/jest": "29.5.14",
+    "@types/node": "22.10.7",
+    "@types/ramda": "0.30.2",
+    "@typescript-eslint/eslint-plugin": "8.20.0",
+    "@typescript-eslint/parser": "8.20.0",
     "apollo-server": "3.13.0",
     "apollo-server-express": "3.13.0",
     "apollo-datasource-rest": "3.7.0",
-    "artillery": "2.0.21",
+    "artillery": "2.0.22",
     "benchmark": "2.1.4",
     "babel-plugin-parameter-decorator": "1.0.16",
     "babel-plugin-transform-typescript-metadata": "0.3.2",
     "babel-jest": "29.7.0",
     "bob-the-bundler": "1.7.3",
     "chalk": "4.1.2",
-    "dataloader": "2.2.2",
-    "eslint": "9.13.0",
-    "express": "4.20.0",
+    "cross-env": "7.0.3",
+    "dataloader": "2.2.3",
+    "eslint": "9.18.0",
+    "express": "4.21.2",
     "express-graphql": "0.12.0",
-    "globby": "14.0.0",
-    "graphql": "16.8.1",
+    "globby": "14.0.2",
+    "graphql": "16.10.0",
     "graphql-subscriptions": "2.0.0",
-    "graphql-ws": "6.0.0",
-    "husky": "9.1.6",
+    "graphql-ws": "6.0.1",
+    "husky": "9.1.7",
     "jest": "29.7.0",
-    "lint-staged": "15.2.0",
+    "lint-staged": "15.4.1",
     "patch-package": "8.0.0",
-    "prettier": "3.1.0",
-    "reflect-metadata": "0.1.13",
-    "ts-jest": "29.1.1",
-    "ts-node": "10.9.1",
-    "typescript": "5.3.2",
-    "ws": "8.17.1"
+    "prettier": "3.4.2",
+    "reflect-metadata": "0.2.2",
+    "ts-jest": "29.2.5",
+    "ts-node": "10.9.2",
+    "typescript": "5.7.3",
+    "ws": "8.18.0"
   },
   "prettier": {
     "trailingComma": "es5",
@@ -88,7 +89,7 @@
     ]
   },
   "lint-staged": {
-    "*.ts": "eslint",
+    "*.ts": "cross-env \"ESLINT_USE_FLAT_CONFIG=false\" eslint",
     "*{js,json,css,md,ts,tsx}": "prettier --write"
   },
   "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
diff --git a/packages/graphql-modules/package.json b/packages/graphql-modules/package.json
@@ -40,7 +40,7 @@
     "@graphql-tools/schema": "^10.0.0",
     "@graphql-tools/wrap": "^10.0.0",
     "@graphql-typed-document-node/core": "^3.1.0",
-    "ramda": "^0.29.0"
+    "ramda": "^0.30.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/graphql-modules/src/shared/utils.ts b/packages/graphql-modules/src/shared/utils.ts
@@ -28,10 +28,13 @@ export function isAsyncIterable(obj: any): obj is AsyncIterableIterator<any> {
   return obj && typeof obj[Symbol.asyncIterator] === 'function';
 }
 
-export function tapAsyncIterator<T>(
-  iterable: AsyncIterable<T>,
+export function tapAsyncIterator<
+  T,
+  TAsyncIterableIterator extends AsyncIterableIterator<T>,
+>(
+  iterable: TAsyncIterableIterator,
   doneCallback: () => void
-): AsyncGenerator<T> {
+): TAsyncIterableIterator {
   const iteratorMethod = iterable[Symbol.asyncIterator];
   const iterator = iteratorMethod.call(iterable);
 
@@ -53,24 +56,24 @@ export function tapAsyncIterator<T>(
         throw error;
       }
     },
-    async return() {
+    async return(value: any) {
       try {
-        const result = await iterator.return!();
+        const result = await iterator.return!(value);
 
         return mapResult(result);
       } catch (error) {
         doneCallback();
         throw error;
       }
     },
-    async throw(error) {
+    throw(error) {
       doneCallback();
       return iterator.throw!(error);
     },
     [Symbol.asyncIterator]() {
       return this;
     },
-  };
+  } as TAsyncIterableIterator;
 }
 
 export function once(cb: () => void) {
diff --git a/packages/graphql-modules/tests/subscription.spec.ts b/packages/graphql-modules/tests/subscription.spec.ts
@@ -8,6 +8,7 @@ import {
 } from '../src';
 import { PubSub } from 'graphql-subscriptions';
 import { ExecutionResult } from 'graphql';
+import { isAsyncIterable } from '../src/shared/utils';
 
 test('Operation-Scope provider instantiated on every subscription', async () => {
   const spies = {
@@ -124,11 +125,11 @@ test('Operation-Scope provider instantiated on every subscription', async () =>
   const execute = app.createExecution();
   const subscribe = app.createSubscription();
 
-  const sub = (await subscribe({
+  const sub = await subscribe({
     schema: app.schema,
     contextValue: createContext(),
     document: subscription,
-  })) as AsyncIterableIterator<ExecutionResult>;
+  });
 
   await execute({
     schema: app.schema,
@@ -150,6 +151,9 @@ test('Operation-Scope provider instantiated on every subscription', async () =>
 
   let receivedEvents: ExecutionResult[] = [];
 
+  if (!isAsyncIterable(sub)) {
+    throw new Error('Subscription is not async iterable');
+  }
   for await (let event of sub) {
     receivedEvents.push(event);
     if (receivedEvents.length === 2) {
diff --git a/website/.gitignore b/website/.gitignore
@@ -1,2 +1,3 @@
 public/sitemap.xml
-public/_redirects
+public/_redirects
+out
diff --git a/website/next-env.d.ts b/website/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
diff --git a/website/package.json b/website/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@theguild/components": "^6.5.3",
-    "next": "15.1.2",
+    "next": "15.1.5",
     "next-sitemap": "4.2.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
@@ -29,10 +29,13 @@
     ]
   },
   "devDependencies": {
-    "@theguild/tailwind-config": "0.4.0",
-    "@types/node": "22.8.2",
-    "@types/react": "18.2.42",
+    "@theguild/tailwind-config": "0.6.2",
+    "@types/node": "22.10.7",
+    "@types/react": "18.3.18",
     "cross-env": "7.0.3",
-    "typescript": "5.3.2"
+    "postcss-import": "16.1.0",
+    "postcss-lightningcss": "1.0.1",
+    "tailwindcss": "3.4.17",
+    "typescript": "5.7.3"
   }
 }
diff --git a/website/postcss.config.cjs b/website/postcss.config.cjs
diff --git a/website/postcss.config.mjs b/website/postcss.config.mjs
@@ -0,0 +1 @@
+export { default } from '@theguild/tailwind-config/postcss.config';
diff --git a/website/tsconfig.json b/website/tsconfig.json
@@ -1,15 +1,15 @@
 {
   "compilerOptions": {
-    "target": "es2019",
-    "module": "commonjs",
+    "target": "ESNext",
+    "module": "ESNext",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "noEmit": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`save-exact=true`
	`2`	`+ignore-engines=true`