[pull] master from dotansimha:master

.github/workflows/release.yml

@@ -30,19 +30,15 @@ jobs:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
 
   release-stable:
-    if:
-      github.event_name == 'push' && github.event.pull_request.head.repo.full_name ==
-      github.repository
+    if: github.event_name == 'push'
     uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@f4eea983237a44bb0ca19c3348dacbfdfcdbec23 # main
     permissions:
       id-token: write # allows OIDC publishing
       pull-requests: write # allows creating Version Packages PR
       contents: write # allows modifying changeset files
     with:
       nodeVersion: 24
-      npmTag: alpha
       packageManager: pnpm
-      buildScript: build
       releaseScript: release
     secrets:
       githubToken: ${{ secrets.GITHUB_TOKEN }}

dev-test/general/.env

@@ -1 +1 @@
-SCHEMA_PATH=./dev-test/general/test-schema/schema.graphql
+SCHEMA_PATH=./test-schema/schema.graphql

dev-test/general/githunt/graphql-declared-modules.d.ts

@@ -1,12 +1,3 @@
-declare module '*/current-user.query.graphql' {
-  import { DocumentNode } from 'graphql';
-  const defaultDocument: DocumentNode;
-  export const CurrentUserForProfileFromOutsideDirectory: DocumentNode;
-  export const CurrentUserForProfile: DocumentNode;
-
-  export default defaultDocument;
-}
-
 declare module '*/comment-added.subscription.graphql' {
   import { DocumentNode } from 'graphql';
   const defaultDocument: DocumentNode;
@@ -31,6 +22,14 @@ declare module '*/comments-page-comment.fragment.graphql' {
   export default defaultDocument;
 }
 
+declare module '*/current-user.query.graphql' {
+  import { DocumentNode } from 'graphql';
+  const defaultDocument: DocumentNode;
+  export const CurrentUserForProfile: DocumentNode;
+
+  export default defaultDocument;
+}
+
 declare module '*/feed-entry.fragment.graphql' {
   import { DocumentNode } from 'graphql';
   const defaultDocument: DocumentNode;

dev-test/general/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "dev-test-general",
+  "version": "0.0.1",
+  "description": "Kitchen sink of various setups. For new dev-test, consider creating new project for better targetting",
+  "private": true,
+  "scripts": {
+    "generate": "pnpm generate:esm",
+    "generate:cjs": "node ../../packages/graphql-codegen-cli/dist/cjs/bin.js --require dotenv/config --config codegen.ts dotenv_config_path=.env",
+    "generate:esm": "node ../../packages/graphql-codegen-cli/dist/esm/bin.js --require dotenv/config --config codegen.ts dotenv_config_path=.env",
+    "watch": "pnpm watch:esm",
+    "watch:cjs": "pnpm generate:cjs --watch",
+    "watch:esm": "pnpm generate:esm --watch"
+  },
+  "devDependencies": {
+    "@graphql-codegen/add": "workspace:*",
+    "@graphql-codegen/cli": "workspace:*",
+    "@graphql-codegen/flow": "3.0.1",
+    "@graphql-codegen/flow-resolvers": "3.0.1",
+    "@graphql-codegen/graphql-modules-preset": "workspace:*",
+    "@graphql-codegen/typed-document-node": "workspace:*",
+    "@graphql-codegen/typescript": "workspace:*",
+    "@graphql-codegen/typescript-graphql-files-modules": "4.0.1",
+    "@graphql-codegen/typescript-operations": "workspace:*",
+    "@graphql-codegen/typescript-resolvers": "workspace:*"
+  }
+}

dev-test/general/test-schema/flow-types.flow.js

@@ -1,7 +1,8 @@
 // @flow
 
 import { type GraphQLResolveInfo } from 'graphql';
-export type $RequireFields<Origin, Keys> = $Diff<Origin, Keys> & $ObjMapi<Keys, <Key>(k: Key) => $NonMaybeType<$ElementType<Origin, Key>>>;
+export type $RequireFields<Origin, Keys> = $Diff<Origin, Keys> &
+  $ObjMapi<Keys, <Key>(k: Key) => $NonMaybeType<$ElementType<Origin, Key>>>;
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {|
   ID: string,
@@ -17,7 +18,6 @@ export type Query = {|
   userById?: ?User,
 |};
 
-
 export type QueryUserByIdArgs = {|
   id: $ElementType<Scalars, 'Int'>,
 |};
@@ -33,21 +33,21 @@ export type Resolver<Result, Parent = {}, Context = {}, Args = {}> = (
   parent: Parent,
   args: Args,
   context: Context,
-  info: GraphQLResolveInfo
+  info: GraphQLResolveInfo,
 ) => Promise<Result> | Result;
 
 export type SubscriptionSubscribeFn<Result, Parent, Context, Args> = (
   parent: Parent,
   args: Args,
   context: Context,
-  info: GraphQLResolveInfo
+  info: GraphQLResolveInfo,
 ) => AsyncIterator<Result> | Promise<AsyncIterator<Result>>;
 
 export type SubscriptionResolveFn<Result, Parent, Context, Args> = (
   parent: Parent,
   args: Args,
   context: Context,
-  info: GraphQLResolveInfo
+  info: GraphQLResolveInfo,
 ) => Result | Promise<Result>;
 
 export interface SubscriptionSubscriberObject<Result, Key: string, Parent, Context, Args> {
@@ -71,10 +71,14 @@ export type SubscriptionResolver<Result, Key: string, Parent = {}, Context = {},
 export type TypeResolveFn<Types, Parent = {}, Context = {}> = (
   parent: Parent,
   context: Context,
-  info: GraphQLResolveInfo
+  info: GraphQLResolveInfo,
 ) => ?Types | Promise<?Types>;
 
-export type IsTypeOfResolverFn<T = {}, Context = {}> = (obj: T, context: Context, info: GraphQLResolveInfo) => boolean | Promise<boolean>;
+export type IsTypeOfResolverFn<T = {}, Context = {}> = (
+  obj: T,
+  context: Context,
+  info: GraphQLResolveInfo,
+) => boolean | Promise<boolean>;
 
 export type NextResolverFn<T> = () => Promise<T>;
 
@@ -83,7 +87,7 @@ export type DirectiveResolverFn<Result = {}, Parent = {}, Args = {}, Context = {
   parent: Parent,
   args: Args,
   context: Context,
-  info: GraphQLResolveInfo
+  info: GraphQLResolveInfo,
 ) => Result | Promise<Result>;
 
 export type ResolverTypeWrapper<T> = Promise<T> | T;
@@ -106,12 +110,23 @@ export type ResolversParentTypes = {
   User: User,
 };
 
-export type QueryResolvers<ContextType = any, ParentType = $ElementType<ResolversParentTypes, 'Query'>> = {
+export type QueryResolvers<
+  ContextType = any,
+  ParentType = $ElementType<ResolversParentTypes, 'Query'>,
+> = {
   allUsers?: Resolver<Array<?$ElementType<ResolversTypes, 'User'>>, ParentType, ContextType>,
-  userById?: Resolver<?$ElementType<ResolversTypes, 'User'>, ParentType, ContextType, $RequireFields<QueryUserByIdArgs, { id: * }>>,
+  userById?: Resolver<
+    ?$ElementType<ResolversTypes, 'User'>,
+    ParentType,
+    ContextType,
+    $RequireFields<QueryUserByIdArgs, { id: * }>,
+  >,
 };
 
-export type UserResolvers<ContextType = any, ParentType = $ElementType<ResolversParentTypes, 'User'>> = {
+export type UserResolvers<
+  ContextType = any,
+  ParentType = $ElementType<ResolversParentTypes, 'User'>,
+> = {
   email?: Resolver<$ElementType<ResolversTypes, 'String'>, ParentType, ContextType>,
   id?: Resolver<$ElementType<ResolversTypes, 'Int'>, ParentType, ContextType>,
   name?: Resolver<$ElementType<ResolversTypes, 'String'>, ParentType, ContextType>,
@@ -122,4 +137,3 @@ export type Resolvers<ContextType = any> = {
   Query?: QueryResolvers<ContextType>,
   User?: UserResolvers<ContextType>,
 };
-

examples/persisted-documents/package.json

@@ -17,6 +17,7 @@
     "@babel/preset-env": "7.29.5",
     "@babel/preset-typescript": "7.28.5",
     "@graphql-codegen/cli": "workspace:*",
+    "@graphql-codegen/client-preset": "workspace:*",
     "@graphql-typed-document-node/core": "3.2.0"
   },
   "bob": false

examples/react/apollo-client-swc-plugin/package.json

@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@graphql-codegen/cli": "workspace:*",
-    "@graphql-codegen/client-preset-swc-plugin": "0.2.0",
+    "@graphql-codegen/client-preset-swc-plugin": "workspace:*",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
     "@vitejs/plugin-react-swc": "4.3.1",

examples/react/nextjs-swr/package.json

@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@graphql-codegen/cli": "workspace:*",
-    "@graphql-codegen/client-preset-swc-plugin": "0.2.0",
+    "@graphql-codegen/client-preset-swc-plugin": "workspace:*",
     "@graphql-codegen/schema-ast": "workspace:*",
     "@types/node": "24.12.4",
     "@types/react": "19.2.14",

package.json

@@ -11,12 +11,12 @@
     "build": "bob build",
     "postbuild": "pnpm fix-bins",
     "clean": "rimraf node_modules/",
-    "dev-test:generate": "pnpm dev-test:generate:esm",
-    "dev-test:generate:cjs": "node packages/graphql-codegen-cli/dist/cjs/bin.js --require dotenv/config --config ./dev-test/general/codegen.ts dotenv_config_path=dev-test/general/.env",
-    "dev-test:generate:esm": "node packages/graphql-codegen-cli/dist/esm/bin.js --require dotenv/config --config ./dev-test/general/codegen.ts dotenv_config_path=dev-test/general/.env",
-    "dev-test:watch": "pnpm dev-test:watch:esm",
-    "dev-test:watch:cjs": "node packages/graphql-codegen-cli/dist/cjs/bin.js --require dotenv/config --watch --config ./dev-test/general/codegen.ts dotenv_config_path=dev-test/general/.env",
-    "dev-test:watch:esm": "node packages/graphql-codegen-cli/dist/esm/bin.js --require dotenv/config --watch --config ./dev-test/general/codegen.ts dotenv_config_path=dev-test/general/.env",
+    "dev-test:generate": "pnpm --filter=\"dev-test*\" generate",
+    "dev-test:generate:cjs": "pnpm --filter=\"dev-test*\" generate:cjs",
+    "dev-test:generate:esm": "pnpm --filter=\"dev-test*\" generate:esm",
+    "dev-test:watch": "pnpm --filter=\"dev-test*\" watch",
+    "dev-test:watch:cjs": "pnpm --filter=\"dev-test*\" watch:cjs",
+    "dev-test:watch:esm": "pnpm --filter=\"dev-test*\" watch:esm",
     "examples:build": "set -o xtrace && eval $(node scripts/print-example-ci-command.js build)",
     "examples:codegen": "set -o xtrace && eval $(node scripts/print-example-ci-command.js codegen)",
     "examples:test:end2end": "set -o xtrace && eval $(node scripts/print-example-ci-command.js test:end2end)",
@@ -40,17 +40,6 @@
     "@changesets/cli": "2.31.0",
     "@eslint/eslintrc": "3.3.5",
     "@eslint/js": "10.0.1",
-    "@graphql-codegen/add": "workspace:*",
-    "@graphql-codegen/cli": "workspace:*",
-    "@graphql-codegen/client-preset": "workspace:*",
-    "@graphql-codegen/flow": "3.0.1",
-    "@graphql-codegen/flow-resolvers": "3.0.2",
-    "@graphql-codegen/graphql-modules-preset": "workspace:*",
-    "@graphql-codegen/typed-document-node": "workspace:*",
-    "@graphql-codegen/typescript": "workspace:*",
-    "@graphql-codegen/typescript-graphql-files-modules": "4.0.1",
-    "@graphql-codegen/typescript-operations": "workspace:*",
-    "@graphql-codegen/typescript-resolvers": "workspace:*",
     "@ianvs/prettier-plugin-sort-imports": "4.7.1",
     "@theguild/eslint-config": "0.13.4",
     "@theguild/prettier-config": "3.0.1",

packages/graphql-codegen-cli/CHANGELOG.md

@@ -1,5 +1,48 @@
 # @graphql-codegen/cli
 
+## 7.1.0
+
+### Minor Changes
+
+- [#10855](https://github.com/dotansimha/graphql-code-generator/pull/10855)
+  [`cfc4fc3`](https://github.com/dotansimha/graphql-code-generator/commit/cfc4fc3e659bf34df7e114c7f02eda583b2d0918)
+  Thanks [@eddeee888](https://github.com/eddeee888)! - Add
+  disableFederationDirectiveAndScalarInjection config to better support Federation v2
+
+### Patch Changes
+
+- Updated dependencies
+  [[`cbf9544`](https://github.com/dotansimha/graphql-code-generator/commit/cbf95443b41bda82852d0396f3ab15310e22e2ae)]:
+  - @graphql-codegen/core@6.1.0
+
+## 7.0.1
+
+### Patch Changes
+
+- [#10848](https://github.com/dotansimha/graphql-code-generator/pull/10848)
+  [`f3ce427`](https://github.com/dotansimha/graphql-code-generator/commit/f3ce427e251c45b87f462a4584381a76989c628d)
+  Thanks [@eddeee888](https://github.com/eddeee888)! - dependencies updates:
+  - Updated dependency
+    [`@graphql-codegen/client-preset@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-codegen/client-preset/v/workspace:^)
+    (from `^6.0.0`, in `dependencies`)
+
+- [#10849](https://github.com/dotansimha/graphql-code-generator/pull/10849)
+  [`55a4742`](https://github.com/dotansimha/graphql-code-generator/commit/55a47421273ac795c516a011c257c5af159880cb)
+  Thanks [@eddeee888](https://github.com/eddeee888)! - dependencies updates:
+  - Updated dependency
+    [`@graphql-codegen/core@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-codegen/core/v/workspace:^)
+    (from `^6.0.0`, in `dependencies`)
+  - Updated dependency
+    [`@graphql-codegen/plugin-helpers@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-codegen/plugin-helpers/v/workspace:^)
+    (from `^7.0.0`, in `dependencies`)
+- Updated dependencies
+  [[`f3ce427`](https://github.com/dotansimha/graphql-code-generator/commit/f3ce427e251c45b87f462a4584381a76989c628d),
+  [`55a4742`](https://github.com/dotansimha/graphql-code-generator/commit/55a47421273ac795c516a011c257c5af159880cb),
+  [`55a4742`](https://github.com/dotansimha/graphql-code-generator/commit/55a47421273ac795c516a011c257c5af159880cb),
+  [`f3ce427`](https://github.com/dotansimha/graphql-code-generator/commit/f3ce427e251c45b87f462a4584381a76989c628d)]:
+  - @graphql-codegen/client-preset@6.0.1
+  - @graphql-codegen/core@6.0.1
+
 ## 7.0.0
 
 ### Major Changes

packages/graphql-codegen-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "type": "module",
   "repository": {
     "type": "git",
@@ -78,8 +78,8 @@
     "@babel/template": "^7.18.10",
     "@babel/types": "^7.18.13",
     "@graphql-codegen/client-preset": "workspace:^",
-    "@graphql-codegen/core": "^6.0.0",
-    "@graphql-codegen/plugin-helpers": "^7.0.0",
+    "@graphql-codegen/core": "workspace:^",
+    "@graphql-codegen/plugin-helpers": "workspace:^",
     "@graphql-tools/apollo-engine-loader": "^8.0.28",
     "@graphql-tools/code-file-loader": "^8.1.28",
     "@graphql-tools/git-loader": "^8.0.32",
@@ -111,6 +111,15 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
+    "@graphql-codegen/add": "workspace:*",
+    "@graphql-codegen/flow": "3.0.1",
+    "@graphql-codegen/flow-resolvers": "3.0.1",
+    "@graphql-codegen/graphql-modules-preset": "workspace:*",
+    "@graphql-codegen/typed-document-node": "workspace:*",
+    "@graphql-codegen/typescript": "workspace:*",
+    "@graphql-codegen/typescript-graphql-files-modules": "4.0.1",
+    "@graphql-codegen/typescript-operations": "workspace:*",
+    "@graphql-codegen/typescript-resolvers": "workspace:*",
     "@inquirer/testing": "3.3.6",
     "@parcel/watcher": "^2.1.0",
     "@types/is-glob": "4.0.4",

packages/graphql-codegen-cli/src/codegen.ts

@@ -44,6 +44,8 @@ const makeDefaultLoader = (from: string) => {
            * as import.meta is unavailable in a CommonJS context
            * and furthermore unavailable in stable Node.js.
            **/
+          // FIXME(pnpm-update): this causes dev-test devDeps to be brought into CLI's package.json, which is not ideal.
+          // Note that `relativeRequire.resolve(mod)` seems to work correctly for ESM as well.
           mod
         : relativeRequire.resolve(mod)
     );