From eeda063ade10edac8ac64dda446c8b8e512afa6f Mon Sep 17 00:00:00 2001 From: kazuya kawaguchi Date: Sat, 15 Nov 2025 03:04:52 +0900 Subject: [PATCH] fix: bump intlify/utils v1 --- packages/h3/package.json | 2 +- packages/h3/src/index.test.ts | 14 ++++++++++++++ packages/h3/src/index.ts | 5 +++-- packages/hono/package.json | 2 +- packages/hono/src/index.test.ts | 18 +++++++++++++++--- packages/hono/src/index.ts | 4 ++-- pnpm-lock.yaml | 25 +++++++++++-------------- pnpm-workspace.yaml | 1 + 8 files changed, 48 insertions(+), 23 deletions(-) diff --git a/packages/h3/package.json b/packages/h3/package.json index 70c9708..da6a6b6 100644 --- a/packages/h3/package.json +++ b/packages/h3/package.json @@ -64,7 +64,7 @@ }, "dependencies": { "@intlify/core": "^11.1.12", - "@intlify/utils": "^0.13.0" + "@intlify/utils": "catalog:" }, "devDependencies": { "@types/node": "catalog:", diff --git a/packages/h3/src/index.test.ts b/packages/h3/src/index.test.ts index cb686e1..759e531 100644 --- a/packages/h3/src/index.test.ts +++ b/packages/h3/src/index.test.ts @@ -12,6 +12,13 @@ import type { H3Event } from 'h3' test('detectLocaleFromAcceptLanguageHeader', () => { const eventMock = { + web: { + request: { + headers: { + get: _name => (_name === 'accept-language' ? 'en-US,en;q=0.9,ja;q=0.8' : '') + } + } + }, node: { req: { method: 'GET', @@ -57,6 +64,13 @@ describe('useTranslation', () => { } }) const eventMock = { + web: { + request: { + headers: { + get: _name => (_name === 'accept-language' ? 'ja;q=0.9,en;q=0.8' : '') + } + } + }, node: { req: { method: 'GET', diff --git a/packages/h3/src/index.ts b/packages/h3/src/index.ts index 2128bf5..3791314 100644 --- a/packages/h3/src/index.ts +++ b/packages/h3/src/index.ts @@ -16,7 +16,8 @@ import { // @ts-expect-error -- NOTE(kazupon): internal function parseTranslateArgs } from '@intlify/core' -import { getHeaderLocale } from '@intlify/utils/h3' +import { getHeaderLocale } from '@intlify/utils' +import { toWebRequest } from 'h3' export * from '@intlify/utils/h3' @@ -172,7 +173,7 @@ export function defineI18nMiddleware< * @returns A locale string, which will be detected of **first** from `Accept-Language` header */ export const detectLocaleFromAcceptLanguageHeader = (event: H3Event): Locale => - getHeaderLocale(event).toString() + getHeaderLocale(toWebRequest(event)).toString() /** * The type definition of Locale Message for `@intlify/h3` package diff --git a/packages/hono/package.json b/packages/hono/package.json index 11d42ef..d2e29a9 100644 --- a/packages/hono/package.json +++ b/packages/hono/package.json @@ -63,7 +63,7 @@ }, "dependencies": { "@intlify/core": "^9.6.0", - "@intlify/utils": "^0.11.1" + "@intlify/utils": "catalog:" }, "devDependencies": { "@cloudflare/workers-types": "^4.20231016.0", diff --git a/packages/hono/src/index.test.ts b/packages/hono/src/index.test.ts index 902bfe0..17c121e 100644 --- a/packages/hono/src/index.test.ts +++ b/packages/hono/src/index.test.ts @@ -14,7 +14,11 @@ import { test('detectLocaleFromAcceptLanguageHeader', () => { const mockContext = { req: { - header: _name => (_name === 'accept-language' ? 'en-US,en;q=0.9,ja;q=0.8' : '') + raw: { + headers: { + get: _name => (_name === 'accept-language' ? 'en-US,en;q=0.9,ja;q=0.8' : '') + } + } } } as Context @@ -54,7 +58,11 @@ describe('useTranslation', () => { }) const mockContext = { req: { - header: _name => (_name === 'accept-language' ? 'ja;q=0.9,en;q=0.8' : '') + raw: { + headers: { + get: _name => (_name === 'accept-language' ? 'ja;q=0.9,en;q=0.8' : '') + } + } }, get: (_key: string) => context } as Context @@ -71,7 +79,11 @@ describe('useTranslation', () => { test('not initialize context', () => { const mockContext = { req: { - header: _name => 'ja,en' + raw: { + headers: { + get: _name => 'ja,en' + } + } }, get: (_key: string) => {} } as Context diff --git a/packages/hono/src/index.ts b/packages/hono/src/index.ts index 21e3d4b..f6a3120 100644 --- a/packages/hono/src/index.ts +++ b/packages/hono/src/index.ts @@ -10,7 +10,7 @@ */ import { translate as _translate, createCoreContext, NOT_REOSLVED } from '@intlify/core' -import { getHeaderLocale } from '@intlify/utils/hono' +import { getHeaderLocale } from '@intlify/utils' export * from '@intlify/utils/hono' @@ -172,7 +172,7 @@ export function defineI18nMiddleware< * ``` */ export const detectLocaleFromAcceptLanguageHeader = (ctx: Context): Locale => - getHeaderLocale(ctx).toString() + getHeaderLocale(ctx.req.raw).toString() type ResolveResourceKeys< Schema extends Record = {}, // eslint-disable-line @typescript-eslint/no-explicit-any -- NOTE(kazupon): generic type diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ecf9ee1..0ea0511 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,9 @@ settings: catalogs: default: + '@intlify/utils': + specifier: ^1.0.1 + version: 1.0.1 '@types/node': specifier: ^24.10.0 version: 24.10.1 @@ -126,8 +129,8 @@ importers: specifier: ^11.1.12 version: 11.1.12 '@intlify/utils': - specifier: ^0.13.0 - version: 0.13.0 + specifier: 'catalog:' + version: 1.0.1 devDependencies: '@types/node': specifier: 'catalog:' @@ -163,8 +166,8 @@ importers: specifier: ^9.6.0 version: 9.14.5 '@intlify/utils': - specifier: ^0.11.1 - version: 0.11.1 + specifier: 'catalog:' + version: 1.0.1 devDependencies: '@cloudflare/workers-types': specifier: ^4.20231016.0 @@ -842,13 +845,9 @@ packages: resolution: {integrity: sha512-9gB+E53BYuAEMhbCAxVgG38EZrk59sxBtv3jSizNL2hEWlgjBjAw1AwpLHtNaeda12pe6W20OGEa0TwuMSRbyQ==} engines: {node: '>= 16'} - '@intlify/utils@0.11.1': - resolution: {integrity: sha512-nP3EjYFcTXfbBws8FJHcYQ7JdgIvpmEd99MlfTaTnqM8GSrRQUZh2sn5awhbnjcd0xQ8vWGX/OLNDumvd7sjDg==} - engines: {node: '>= 18'} - - '@intlify/utils@0.13.0': - resolution: {integrity: sha512-8i3uRdAxCGzuHwfmHcVjeLQBtysQB2aXl/ojoagDut5/gY5lvWCQ2+cnl2TiqE/fXj/D8EhWG/SLKA7qz4a3QA==} - engines: {node: '>= 18'} + '@intlify/utils@1.0.1': + resolution: {integrity: sha512-1ErRU0yOK0f6aZnIg4I5/O6BqWYf9r3uA5KNEkwvmCi9TCPgtOmiz1EwcAijl8UYB60Rkgcc7pErfoFGEZoyeQ==} + engines: {node: '>= 20'} '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} @@ -4802,9 +4801,7 @@ snapshots: '@intlify/shared@9.14.5': {} - '@intlify/utils@0.11.1': {} - - '@intlify/utils@0.13.0': {} + '@intlify/utils@1.0.1': {} '@isaacs/cliui@8.0.2': dependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5de426d..29e4c0d 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -8,6 +8,7 @@ catalog: typescript: ^5.9.3 tsdown: ^0.16.4 publint: ^0.3.15 + '@intlify/utils': ^1.0.1 minimumReleaseAge: 1440