Merge remote-tracking branch 'origin/main' into alpha

# Conflicts:
#	src/config/schema.ts
#	test/unit/should_honor_resolverInterfaces_config/codegen.config.ts

Author: danadajian

.github/workflows/ci.yml

@@ -14,7 +14,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version-file: package.json
 
       - name: Install Dependencies
         run: bun install

.github/workflows/docs.yml

@@ -6,6 +6,7 @@ on:
       - main
     paths:
       - "docs/**"
+      - "src/config/schema.ts"
       - ".github/workflows/docs.yml"
   workflow_dispatch:
 
@@ -26,7 +27,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version-file: package.json
 
       - name: Install Dependencies
         run: bun install

.github/workflows/publish.yml

@@ -15,7 +15,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version-file: package.json
 
       - name: Setup Node
         uses: actions/setup-node@v4

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/

build.gradle.kts

@@ -5,14 +5,14 @@ repositories {
 }
 
 plugins {
-    kotlin("jvm") version "2.0.0"
-    id("com.expediagroup.graphql") version "7.1.1"
+    kotlin("jvm") version "2.1.21"
+    id("com.expediagroup.graphql") version "8.8.0"
 }
 
 dependencies {
-    implementation("com.expediagroup", "graphql-kotlin-schema-generator", "7.1.1")
-    implementation("com.expediagroup", "graphql-kotlin-server", "7.1.1")
-    implementation("com.expediagroup", "graphql-kotlin-federation", "7.1.1")
+    implementation("com.expediagroup", "graphql-kotlin-schema-generator", "8.8.0")
+    implementation("com.expediagroup", "graphql-kotlin-server", "8.8.0")
+    implementation("com.expediagroup", "graphql-kotlin-federation", "8.8.0")
 }
 
 sourceSets {

bun.lock

@@ -46,8 +46,6 @@ bun add -d @expediagroup/graphql-kotlin-codegen
 </TabItem>
 </Tabs>
 
-The configuration is a superset of the [existing configuration](https://the-guild.dev/graphql/codegen/docs/config-reference/codegen-config#configuration-options) in graphql-codegen.
-
 ## Usage
 
 Example `codegen.yml`:
@@ -58,7 +56,7 @@ schema:
 generates:
   output/Types.kt:
     plugins:
-      - /@expediagroup/graphql-kotlin-codegen:
+      - "@expediagroup/graphql-kotlin-codegen":
           namingConvention: "keep" # graphql-codegen config
           packageName: "com.example" # graphql-kotlin-codegen config
 ```

bun.lockb

@@ -98,6 +98,8 @@ open class MyType {
 Source code:
 
 ```kotlin
+import com.expediagroup.graphql.server.operations.Query
+import com.types.generated.Query as QueryInterface
 import com.types.generated.MyType as MyTypeInterface
 
 class MyQuery : Query, QueryInterface() {

docs/docs/getting-started.mdx

@@ -7,18 +7,18 @@
     "start": "docusaurus start"
   },
   "devDependencies": {
-    "@docusaurus/core": "3.4.0",
-    "@docusaurus/module-type-aliases": "3.4.0",
-    "@docusaurus/preset-classic": "3.4.0",
-    "@docusaurus/tsconfig": "3.4.0",
-    "@docusaurus/types": "3.4.0",
-    "@mdx-js/react": "3.0.1",
-    "ajv": "8.16.0",
+    "@docusaurus/core": "3.8.1",
+    "@docusaurus/module-type-aliases": "3.8.1",
+    "@docusaurus/preset-classic": "3.8.1",
+    "@docusaurus/tsconfig": "3.8.1",
+    "@docusaurus/types": "3.8.1",
+    "@mdx-js/react": "3.1.0",
+    "ajv": "8.17.1",
     "clsx": "2.1.1",
-    "jsdoc-to-markdown": "8.0.1",
-    "prism-react-renderer": "2.3.1",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
+    "jsdoc-to-markdown": "9.1.1",
+    "prism-react-renderer": "2.4.1",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
     "react-loadable": "5.5.0"
   }
 }