Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ updates:
- '@antfu/eslint-config'
- 'eslint-plugin-*'
- '@hey-api/*'
- json-schema-typed # inline
- compression # inline
update-types:
- minor
Expand Down
2 changes: 0 additions & 2 deletions packages/interop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ A compatibility layer that builds & re-exports upstream packages that don't yet

**Included packages:**

- [json-schema-typed](https://www.npmjs.com/package/json-schema-typed) to address issue [RemyRylan/json-schema-typed#116](https://github.com/RemyRylan/json-schema-typed/issues/116)

- [compression](https://www.npmjs.com/package/compression) for esm compatibility

## Sponsors
Expand Down
27 changes: 1 addition & 26 deletions packages/interop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,6 @@
],
"publishConfig": {
"exports": {
"./json-schema-typed": {
"types": "./dist/json-schema-typed/index.d.mts",
"import": "./dist/json-schema-typed/index.mjs",
"default": "./dist/json-schema-typed/index.mjs"
},
"./json-schema-typed/draft-07": {
"types": "./dist/json-schema-typed/draft-07.d.mts",
"import": "./dist/json-schema-typed/draft-07.mjs",
"default": "./dist/json-schema-typed/draft-07.mjs"
},
"./json-schema-typed/draft-2019-09": {
"types": "./dist/json-schema-typed/draft-2019-09.d.mts",
"import": "./dist/json-schema-typed/draft-2019-09.mjs",
"default": "./dist/json-schema-typed/draft-2019-09.mjs"
},
"./json-schema-typed/draft-2020-12": {
"types": "./dist/json-schema-typed/draft-2020-12.d.mts",
"import": "./dist/json-schema-typed/draft-2020-12.mjs",
"default": "./dist/json-schema-typed/draft-2020-12.mjs"
},
"./compression": {
"types": "./dist/compression/index.d.mts",
"import": "./dist/compression/index.mjs",
Expand All @@ -43,10 +23,6 @@
}
},
"exports": {
"./json-schema-typed": "./src/json-schema-typed/index.ts",
"./json-schema-typed/draft-07": "./src/json-schema-typed/draft-07.ts",
"./json-schema-typed/draft-2019-09": "./src/json-schema-typed/draft-2019-09.ts",
"./json-schema-typed/draft-2020-12": "./src/json-schema-typed/draft-2020-12.ts",
"./compression": "./src/compression/index.ts"
},
"files": [
Expand All @@ -59,7 +35,6 @@
},
"devDependencies": {
"@types/compression": "^1.8.1",
"compression": "^1.8.1",
"json-schema-typed": "^8.0.1"
"compression": "^1.8.1"
}
}
3 changes: 0 additions & 3 deletions packages/interop/src/json-schema-typed/draft-07.test.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/interop/src/json-schema-typed/draft-07.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/interop/src/json-schema-typed/draft-2019-09.test.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/interop/src/json-schema-typed/draft-2019-09.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/interop/src/json-schema-typed/draft-2020-12.test.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/interop/src/json-schema-typed/draft-2020-12.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/interop/src/json-schema-typed/index.test.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/interop/src/json-schema-typed/index.ts

This file was deleted.

3 changes: 2 additions & 1 deletion packages/json-schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"@orpc/interop": "workspace:*",
"@orpc/openapi": "workspace:*",
"@orpc/server": "workspace:*",
"@orpc/shared": "workspace:*"
"@orpc/shared": "workspace:*",
"json-schema-typed": "^8.0.2"
},
"devDependencies": {
"zod": "^4.1.12"
Expand Down
9 changes: 6 additions & 3 deletions packages/json-schema/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import type * as Draft07 from '@orpc/interop/json-schema-typed/draft-07'
import type * as Draft2019 from '@orpc/interop/json-schema-typed/draft-2019-09'
import type * as Draft2020 from '@orpc/interop/json-schema-typed/draft-2020-12'
// eslint-disable-next-line no-restricted-imports
import type * as Draft07 from 'json-schema-typed/draft-07'
// eslint-disable-next-line no-restricted-imports
import type * as Draft2019 from 'json-schema-typed/draft-2019-09'
// eslint-disable-next-line no-restricted-imports
import type * as Draft2020 from 'json-schema-typed/draft-2020-12'

export type JsonSchema
= | Draft2020.JSONSchema
Expand Down
1 change: 1 addition & 0 deletions packages/openapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"@orpc/server": "workspace:*",
"@orpc/shared": "workspace:*",
"@orpc/standard-server": "workspace:*",
"json-schema-typed": "^8.0.2",
"rou3": "^0.7.10"
},
"devDependencies": {
Expand Down
6 changes: 4 additions & 2 deletions packages/openapi/src/schema.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { JSONSchema, keywords } from '@orpc/interop/json-schema-typed/draft-2020-12'
import { ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from '@orpc/interop/json-schema-typed/draft-2020-12'
// eslint-disable-next-line no-restricted-imports
import type { JSONSchema, keywords } from 'json-schema-typed/draft-2020-12'
// eslint-disable-next-line no-restricted-imports
import { ContentEncoding as JSONSchemaContentEncoding, Format as JSONSchemaFormat, TypeName as JSONSchemaTypeName } from 'json-schema-typed/draft-2020-12'

export { JSONSchemaContentEncoding, JSONSchemaFormat, JSONSchemaTypeName }
export type { JSONSchema }
Expand Down
15 changes: 9 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading