Skip to content

Commit ff33e2b

Browse files
committed
Merge remote-tracking branch 'origin/main' into alpha
# Conflicts: # src/config/schema.ts # test/unit/should_honor_resolverInterfaces_config/codegen.config.ts
2 parents 2950564 + 0b8b6aa commit ff33e2b

File tree

62 files changed

+4403
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+4403
-137
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ jobs:
1414
uses: actions/checkout@v4
1515

1616
- name: Setup Bun
17-
uses: oven-sh/setup-bun@v1
17+
uses: oven-sh/setup-bun@v2
18+
with:
19+
bun-version-file: package.json
1820

1921
- name: Install Dependencies
2022
run: bun install

.github/workflows/docs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- main
77
paths:
88
- "docs/**"
9+
- "src/config/schema.ts"
910
- ".github/workflows/docs.yml"
1011
workflow_dispatch:
1112

@@ -26,7 +27,9 @@ jobs:
2627
uses: actions/checkout@v4
2728

2829
- name: Setup Bun
29-
uses: oven-sh/setup-bun@v1
30+
uses: oven-sh/setup-bun@v2
31+
with:
32+
bun-version-file: package.json
3033

3134
- name: Install Dependencies
3235
run: bun install

.github/workflows/publish.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- name: Setup Bun
18-
uses: oven-sh/setup-bun@v1
18+
uses: oven-sh/setup-bun@v2
19+
with:
20+
bun-version-file: package.json
1921

2022
- name: Setup Node
2123
uses: actions/setup-node@v4

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry=https://registry.npmjs.org/

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ repositories {
55
}
66

77
plugins {
8-
kotlin("jvm") version "2.0.0"
9-
id("com.expediagroup.graphql") version "7.1.1"
8+
kotlin("jvm") version "2.1.21"
9+
id("com.expediagroup.graphql") version "8.8.0"
1010
}
1111

1212
dependencies {
13-
implementation("com.expediagroup", "graphql-kotlin-schema-generator", "7.1.1")
14-
implementation("com.expediagroup", "graphql-kotlin-server", "7.1.1")
15-
implementation("com.expediagroup", "graphql-kotlin-federation", "7.1.1")
13+
implementation("com.expediagroup", "graphql-kotlin-schema-generator", "8.8.0")
14+
implementation("com.expediagroup", "graphql-kotlin-server", "8.8.0")
15+
implementation("com.expediagroup", "graphql-kotlin-federation", "8.8.0")
1616
}
1717

1818
sourceSets {

bun.lock

Lines changed: 3457 additions & 0 deletions
Large diffs are not rendered by default.

bun.lockb

-618 KB
Binary file not shown.

docs/docs/getting-started.mdx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ bun add -d @expediagroup/graphql-kotlin-codegen
4646
</TabItem>
4747
</Tabs>
4848

49-
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.
50-
5149
## Usage
5250

5351
Example `codegen.yml`:
@@ -58,7 +56,7 @@ schema:
5856
generates:
5957
output/Types.kt:
6058
plugins:
61-
- /@expediagroup/graphql-kotlin-codegen:
59+
- "@expediagroup/graphql-kotlin-codegen":
6260
namingConvention: "keep" # graphql-codegen config
6361
packageName: "com.example" # graphql-kotlin-codegen config
6462
```

docs/docs/recommended-usage.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ open class MyType {
9898
Source code:
9999

100100
```kotlin
101+
import com.expediagroup.graphql.server.operations.Query
102+
import com.types.generated.Query as QueryInterface
101103
import com.types.generated.MyType as MyTypeInterface
102104

103105
class MyQuery : Query, QueryInterface() {

docs/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
"start": "docusaurus start"
88
},
99
"devDependencies": {
10-
"@docusaurus/core": "3.4.0",
11-
"@docusaurus/module-type-aliases": "3.4.0",
12-
"@docusaurus/preset-classic": "3.4.0",
13-
"@docusaurus/tsconfig": "3.4.0",
14-
"@docusaurus/types": "3.4.0",
15-
"@mdx-js/react": "3.0.1",
16-
"ajv": "8.16.0",
10+
"@docusaurus/core": "3.8.1",
11+
"@docusaurus/module-type-aliases": "3.8.1",
12+
"@docusaurus/preset-classic": "3.8.1",
13+
"@docusaurus/tsconfig": "3.8.1",
14+
"@docusaurus/types": "3.8.1",
15+
"@mdx-js/react": "3.1.0",
16+
"ajv": "8.17.1",
1717
"clsx": "2.1.1",
18-
"jsdoc-to-markdown": "8.0.1",
19-
"prism-react-renderer": "2.3.1",
20-
"react": "18.3.1",
21-
"react-dom": "18.3.1",
18+
"jsdoc-to-markdown": "9.1.1",
19+
"prism-react-renderer": "2.4.1",
20+
"react": "19.1.0",
21+
"react-dom": "19.1.0",
2222
"react-loadable": "5.5.0"
2323
}
2424
}

0 commit comments

Comments
 (0)