Skip to content

Commit

Permalink
Merge branch 'semyenov:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
viapip authored Mar 13, 2024
2 parents b4d9ed7 + b097174 commit 347adb5
Show file tree
Hide file tree
Showing 7 changed files with 633 additions and 411 deletions.
324 changes: 162 additions & 162 deletions .yarn/releases/yarn-4.1.0.cjs → .yarn/releases/yarn-4.1.1.cjs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ nodeLinker: node-modules
plugins:
- checksum: ab1fb9e957fa4becd3787c784379934f25097957bb26201845b8aae48bc6229bba41a6df4316c475643585f2432541956a6e7f9697b10255182f36d354cac0af
path: .yarn/plugins/@yarnpkg/plugin-tsconfig-references.cjs
spec: 'https://github.com/Dcard/yarn-plugins/releases/latest/download/plugin-tsconfig-references.js'
spec: "https://github.com/Dcard/yarn-plugins/releases/latest/download/plugin-tsconfig-references.js"

preferInteractive: true

yarnPath: .yarn/releases/yarn-4.1.0.cjs
yarnPath: .yarn/releases/yarn-4.1.1.cjs
1 change: 1 addition & 0 deletions lib/ajv/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export async function createAjv() {

return {
addSchema: ajv.addSchema,
getSchema: ajv.getSchema,
validateSchema,
}
}
32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "@sozdev/typescript-template",
"type": "module",
"version": "0.0.9",
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"description": "Rollup build script",
"author": "Alexander Semyenov <[email protected]>",
"license": "MIT",
Expand Down Expand Up @@ -44,22 +44,22 @@
"release": "yarn npm publish",
"clean": "yarn exec rm -rf dist",
"lint": "yarn eslint --config eslint.config.js",
"server": "yarn esno --watch src/server",
"client": "yarn esno --watch src/client",
"workers": "yarn esno --watch src/workers",
"quicktype": "yarn esno scripts/quicktype.ts"
"server": "yarn tsx --watch src/server",
"client": "yarn tsx --watch src/client",
"workers": "yarn tsx --watch src/workers",
"quicktype": "yarn tsx scripts/quicktype.ts"
},
"dependencies": {
"@antfu/utils": "^0.7.7",
"@apidevtools/json-schema-ref-parser": "^11.1.0",
"@apidevtools/json-schema-ref-parser": "^11.5.4",
"@exodus/schemasafe": "^1.3.0",
"@msgpack/msgpack": "^3.0.0-beta2",
"@trpc/client": "^10.45.1",
"@trpc/server": "^10.45.1",
"@trpc/client": "^10.45.2",
"@trpc/server": "^10.45.2",
"ajv": "^8.12.0",
"ajv-i18n": "^4.2.0",
"bullmq": "^5.4.1",
"c12": "^1.9.0",
"bullmq": "^5.4.2",
"c12": "^1.10.0",
"consola": "^3.2.3",
"cross-env": "7.0.3",
"defu": "^6.1.4",
Expand All @@ -68,9 +68,12 @@
"h3": "^1.11.1",
"jose": "^5.2.3",
"listhen": "^1.7.2",
"mongodb": "^6.5.0",
"nanoid": "^5.0.6",
"radash": "^12.1.0",
"redis": "^4.6.13",
"ts-pattern": "^5.0.8",
"tsx": "^4.7.1",
"ws": "^8.16.0",
"zod": "^3.22.4"
},
Expand All @@ -79,13 +82,12 @@
"@sozdev/rollup-build": "^0.0.10",
"@types/ws": "^8.5.10",
"eslint": "^8.57.0",
"esno": "^4.0.0",
"json-schema-migrate": "^2.0.0",
"lint-staged": "^15.2.2",
"quicktype-core": "^23.0.105",
"rollup": "^4.12.0",
"simple-git-hooks": "^2.9.0",
"typescript": "^5.3.3",
"quicktype-core": "^23.0.106",
"rollup": "^4.13.0",
"simple-git-hooks": "^2.10.0",
"typescript": "^5.4.2",
"typescript-json-schema": "0.63.0"
},
"simple-git-hooks": {
Expand Down
32 changes: 16 additions & 16 deletions src/client/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ import type { ClientOptions } from 'ws'
const logger = consola.withTag('client/ws')

type BufferLike =
| string
| Buffer
| DataView
| number
| ArrayBufferView
| Uint8Array
| ArrayBuffer
| SharedArrayBuffer
| readonly any[]
| readonly number[]
| { valueOf(): ArrayBuffer }
| { valueOf(): SharedArrayBuffer }
| { valueOf(): Uint8Array }
| { valueOf(): readonly number[] }
| { valueOf(): string }
| { [Symbol.toPrimitive](hint: string): string }
| string
| Buffer
| DataView
| number
| ArrayBufferView
| Uint8Array
| ArrayBuffer
| SharedArrayBuffer
| readonly any[]
| readonly number[]
| { valueOf(): ArrayBuffer }
| { valueOf(): SharedArrayBuffer }
| { valueOf(): Uint8Array }
| { valueOf(): readonly number[] }
| { valueOf(): string }
| { [Symbol.toPrimitive](hint: string): string }

export class WebSocketProxy extends WebSocket {
constructor(
Expand Down
4 changes: 2 additions & 2 deletions src/workers/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import consola from 'consola'
const logger = consola.withTag('worker')

const worker = new Worker<
{ message: string },
{ status: number }
{ message: string },
{ status: number }
>('appQueue',
async (job) => {
logger.info('Job received', job.data)
Expand Down
Loading

0 comments on commit 347adb5

Please sign in to comment.