.github/workflows/tests.yml

@@ -185,8 +185,8 @@ jobs:
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Build Packages
         run: yarn build
-      - name: Test ESM
-        run: node scripts/test-esm.mjs
+      - name: Test ESM and CJS integrity
+        run: yarn bob check
   test_browser:
     name: Browser Test
     runs-on: ubuntu-latest

.prettierignore

@@ -21,6 +21,7 @@ packages/loaders/git/tests/test-files/type-defs-invalid.graphql
 packages/loaders/json-file/tests/test-files/failing/malformed.json
 website/.next
 website/out
+.bob
 CHANGELOG.md
 
 # temporarly ignore follow files because prettier-ignore comments don't work in mdx2

benchmark/federation/CHANGELOG.md

@@ -1,5 +1,20 @@
 # federation-benchmark
 
+## 0.0.41
+
+### Patch Changes
+
+- Updated dependencies [d76a299c]
+  - @graphql-tools/stitch@8.7.0
+  - @graphql-tools/stitching-directives@2.3.0
+
+## 0.0.40
+
+### Patch Changes
+
+- @graphql-tools/stitch@8.6.14
+- @graphql-tools/stitching-directives@2.2.19
+
 ## 0.0.39
 
 ### Patch Changes

benchmark/federation/index.js

@@ -2,8 +2,7 @@ const express = require('express');
 const runStitchingGateway = require('./stitching');
 const runApolloGateway = require('./federation');
 const makeMonolithSchema = require('./monolith');
-const { parse } = require('graphql');
-const { execute } = require('graphql-executor');
+const { parse, execute } = require('graphql');
 
 function memoize1(fn) {
   const memoize1cache = new Map();

benchmark/federation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "federation-benchmark",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "private": true,
   "scripts": {
     "start": "cross-env NODE_ENV=production node index.js",
@@ -9,13 +9,12 @@
     "loadtest:monolith": "k6 -e ENDPOINT=monolith run k6.js"
   },
   "dependencies": {
-    "@apollo/gateway": "2.0.4",
+    "@apollo/gateway": "2.0.5",
     "@apollo/federation": "0.36.1",
-    "@graphql-tools/stitch": "8.6.13",
-    "@graphql-tools/stitching-directives": "2.2.18",
+    "@graphql-tools/stitch": "8.7.0",
+    "@graphql-tools/stitching-directives": "2.3.0",
     "express": "4.18.1",
     "graphql": "16.5.0",
-    "graphql-executor": "0.0.23",
     "graphql-tag": "2.12.6",
     "wait-on": "6.0.1",
     "cross-env": "7.0.3"

jest.config.js

@@ -11,9 +11,10 @@ module.exports = {
   rootDir: ROOT_DIR,
   restoreMocks: true,
   reporters: ['default'],
-  modulePathIgnorePatterns: ['dist', 'test-assets', 'test-files', 'fixtures'],
+  modulePathIgnorePatterns: ['dist', 'test-assets', 'test-files', 'fixtures', '.bob'],
   moduleNameMapper: pathsToModuleNameMapper(tsconfig.compilerOptions.paths, { prefix: `${ROOT_DIR}/` }),
   collectCoverage: false,
   cacheDirectory: resolve(ROOT_DIR, `${CI ? '' : 'node_modules/'}.cache/jest`),
   transformIgnorePatterns: ['node_modules/(?!graphql)'],
+  resolver: 'bob-the-bundler/jest-resolver.js',
 };

package.json

@@ -7,9 +7,8 @@
     "predeploy:website": "yarn build:api-docs",
     "deploy:website": "cd website && yarn deploy",
     "ts:check": "tsc --noEmit",
-    "ts:transpile": "tsc --project tsconfig.build.json",
     "clean-dist": "rimraf \"packages/**/dist\" && rimraf \".bob\"",
-    "build": "yarn ts:transpile && bob build",
+    "build": "bob build",
     "build:api-docs": "ts-node --compiler-options='{\"module\":\"commonjs\"}' scripts/build-api-docs",
     "lint": "eslint --ext .ts .",
     "prettier": "prettier --ignore-path .prettierignore --write --list-different .",
@@ -39,62 +38,60 @@
   },
   "homepage": "https://github.com/ardatan/graphql-tools#readme",
   "devDependencies": {
-    "@babel/core": "7.18.2",
+    "@babel/core": "7.18.5",
     "@babel/plugin-proposal-class-properties": "7.17.12",
     "@babel/preset-env": "7.18.2",
     "@babel/preset-typescript": "7.17.12",
     "@changesets/cli": "2.21.1",
     "@types/debug": "4.1.7",
-    "@types/jest": "28.1.1",
-    "@types/node": "16.11.38",
-    "@typescript-eslint/eslint-plugin": "5.27.1",
-    "@typescript-eslint/parser": "5.27.1",
-    "babel-jest": "28.1.0",
-    "bob-the-bundler": "1.7.3",
+    "@types/jest": "28.1.3",
+    "@types/node": "16.11.41",
+    "@typescript-eslint/eslint-plugin": "5.29.0",
+    "@typescript-eslint/parser": "5.29.0",
+    "babel-jest": "28.1.1",
+    "bob-the-bundler": "2.0.0",
     "chalk": "4.1.2",
-    "concurrently": "7.2.1",
-    "eslint": "8.17.0",
+    "concurrently": "7.2.2",
+    "eslint": "8.18.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-config-standard": "17.0.0",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-n": "15.2.1",
+    "eslint-plugin-n": "15.2.3",
     "eslint-plugin-promise": "6.0.0",
     "eslint-plugin-standard": "5.0.0",
     "globby": "11.1.0",
     "graphql": "16.5.0",
     "graphql-subscriptions": "2.0.0",
     "husky": "8.0.1",
-    "jest": "28.1.0",
-    "lint-staged": "12.5.0",
+    "jest": "28.1.1",
+    "lint-staged": "13.0.3",
     "patch-package": "6.4.7",
-    "prettier": "2.6.2",
-    "ts-jest": "28.0.4",
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.5",
     "ts-node": "10.8.1",
     "typedoc": "0.22.15",
     "typedoc-plugin-markdown": "3.11.14",
-    "typescript": "4.7.3",
+    "typescript": "4.7.4",
     "weak-napi": "2.0.2"
   },
   "lint-staged": {
     "packages/**/src/**/*.{ts,tsx}": [
       "eslint --fix"
     ],
-    "**/*.{ts,tsx,graphql,yml}": [
+    "**/*.{ts,tsx,graphql,yml,md,mdx,json}": [
       "prettier --write"
     ]
   },
-  "workspaces": {
-    "packages": [
-      "./packages/*",
-      "./packages/loaders/*",
-      "./website",
-      "./benchmark/*"
-    ]
-  },
+  "workspaces": [
+    "./packages/*",
+    "./packages/loaders/*",
+    "./website",
+    "./benchmark/*"
+  ],
   "resolutions": {
     "graphql": "16.5.0",
     "esbuild": "^0.14.0",
-    "@changesets/apply-release-plan": "5.0.5"
+    "@changesets/apply-release-plan": "6.0.0"
   },
   "yarn": {
     "args": [

packages/batch-delegate/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @graphql-tools/batch-delegate
 
+## 8.3.0
+
+### Minor Changes
+
+- d76a299c: Support TypeScript module resolution.
+
+### Patch Changes
+
+- Updated dependencies [a0abbbcd]
+- Updated dependencies [d76a299c]
+  - @graphql-tools/utils@8.8.0
+  - @graphql-tools/delegate@8.8.0
+
+## 8.2.21
+
+### Patch Changes
+
+- Updated dependencies [6df204de]
+- Updated dependencies [4914970b]
+  - @graphql-tools/delegate@8.7.12
+  - @graphql-tools/utils@8.7.0
+
 ## 8.2.20
 
 ### Patch Changes

packages/batch-delegate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-delegate",
-  "version": "8.2.20",
+  "version": "8.3.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -9,21 +9,42 @@
   },
   "license": "MIT",
   "sideEffects": false,
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "main": "dist/cjs/index.js",
+  "module": "dist/esm/index.js",
   "exports": {
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "require": {
+        "types": "./dist/typings/index.d.ts",
+        "default": "./dist/cjs/index.js"
+      },
+      "import": {
+        "types": "./dist/typings/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "default": {
+        "types": "./dist/typings/index.d.ts",
+        "default": "./dist/esm/index.js"
+      }
     },
     "./*": {
-      "require": "./dist/*.js",
-      "import": "./dist/*.mjs"
-    }
+      "require": {
+        "types": "./dist/typings/*.d.ts",
+        "default": "./dist/cjs/*.js"
+      },
+      "import": {
+        "types": "./dist/typings/*.d.ts",
+        "default": "./dist/esm/*.js"
+      },
+      "default": {
+        "types": "./dist/typings/*.d.ts",
+        "default": "./dist/esm/*.js"
+      }
+    },
+    "./package.json": "./package.json"
   },
-  "typings": "dist/index.d.ts",
+  "typings": "dist/typings/index.d.ts",
   "typescript": {
-    "definition": "dist/index.d.ts"
+    "definition": "dist/typings/index.d.ts"
   },
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
@@ -32,17 +53,18 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "8.7.11",
-    "@graphql-tools/utils": "8.6.13",
+    "@graphql-tools/delegate": "8.8.0",
+    "@graphql-tools/utils": "8.8.0",
     "dataloader": "2.1.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@graphql-tools/schema": "8.3.14",
-    "@graphql-tools/stitch": "8.6.13"
+    "@graphql-tools/schema": "8.5.0",
+    "@graphql-tools/stitch": "8.7.0"
   },
   "publishConfig": {
-    "access": "public",
-    "directory": "dist"
-  }
+    "directory": "dist",
+    "access": "public"
+  },
+  "type": "module"
 }

packages/batch-delegate/src/batchDelegateToSchema.ts

@@ -1,6 +1,6 @@
-import { BatchDelegateOptions } from './types';
+import { BatchDelegateOptions } from './types.js';
 
-import { getLoader } from './getLoader';
+import { getLoader } from './getLoader.js';
 
 export function batchDelegateToSchema<TContext = any>(options: BatchDelegateOptions<TContext>): any {
   const key = options.key;

packages/batch-delegate/src/createBatchDelegateFn.ts

@@ -1,8 +1,8 @@
 import DataLoader from 'dataloader';
 
-import { CreateBatchDelegateFnOptions, BatchDelegateOptionsFn, BatchDelegateFn } from './types';
+import { CreateBatchDelegateFnOptions, BatchDelegateOptionsFn, BatchDelegateFn } from './types.js';
 
-import { getLoader } from './getLoader';
+import { getLoader } from './getLoader.js';
 
 export function createBatchDelegateFn<K = any, V = any, C = K>(
   optionsOrArgsFromKeys: CreateBatchDelegateFnOptions | ((keys: ReadonlyArray<K>) => Record<string, any>),

packages/batch-delegate/src/getLoader.ts

@@ -5,7 +5,7 @@ import DataLoader from 'dataloader';
 import { delegateToSchema, SubschemaConfig } from '@graphql-tools/delegate';
 import { memoize3, relocatedError } from '@graphql-tools/utils';
 
-import { BatchDelegateOptions } from './types';
+import { BatchDelegateOptions } from './types.js';
 
 function createBatchFn<K = any>(options: BatchDelegateOptions) {
   const argsFromKeys = options.argsFromKeys ?? ((keys: ReadonlyArray<K>) => ({ ids: keys }));

packages/batch-delegate/src/index.ts

@@ -1,4 +1,4 @@
-export * from './batchDelegateToSchema';
-export * from './createBatchDelegateFn';
+export * from './batchDelegateToSchema.js';
+export * from './createBatchDelegateFn.js';
 
-export * from './types';
+export * from './types.js';

packages/batch-execute/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @graphql-tools/batch-execute
 
+## 8.5.0
+
+### Minor Changes
+
+- d76a299c: Support TypeScript module resolution.
+
+### Patch Changes
+
+- Updated dependencies [a0abbbcd]
+- Updated dependencies [d76a299c]
+  - @graphql-tools/utils@8.8.0
+
+## 8.4.11
+
+### Patch Changes
+
+- Updated dependencies [4914970b]
+  - @graphql-tools/utils@8.7.0
+
 ## 8.4.10
 
 ### Patch Changes