Merge remote-tracking branch 'upstream/main' into feature/typescript-eslint-type-checked

Author: yusukebe

packages/oauth-providers/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @hono/oauth-providers
 
+## 0.7.1
+
+### Patch Changes
+
+- [#1099](https://github.com/honojs/middleware/pull/1099) [`091b182a6ac1b7bb1129123d3cd0acca5e41b80d`](https://github.com/honojs/middleware/commit/091b182a6ac1b7bb1129123d3cd0acca5e41b80d) Thanks [@liquidleif](https://github.com/liquidleif)! - fix: Update twitter authorization url
+
 ## 0.7.0
 
 ### Minor Changes

packages/oauth-providers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/oauth-providers",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Social login for Hono JS, integrate authentication with facebook, github, google and linkedin to your projects.",
   "type": "module",
   "main": "dist/index.js",

packages/oauth-providers/src/providers/x/authFlow.ts

@@ -74,7 +74,7 @@ export class AuthFlow {
       code_challenge: this.code_challenge,
       code_challenge_method: 'S256',
     })
-    return `https://twitter.com/i/oauth2/authorize?${parsedOptions}`
+    return `https://x.com/i/oauth2/authorize?${parsedOptions}`
   }
 
   private async getTokenFromCode() {

packages/zod-openapi/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @hono/zod-openapi
 
+## 0.19.3
+
+### Patch Changes
+
+- [#1106](https://github.com/honojs/middleware/pull/1106) [`448a8fc687cca2bcab2353ea4237f1293706d5e2`](https://github.com/honojs/middleware/commit/448a8fc687cca2bcab2353ea4237f1293706d5e2) Thanks [@yusukebe](https://github.com/yusukebe)! - fix: infer Env correctly if the middleware is `[]`
+
 ## 0.19.2
 
 ### Patch Changes

packages/zod-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/zod-openapi",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "description": "A wrapper class of Hono which supports OpenAPI.",
   "type": "module",
   "module": "dist/index.js",

packages/zod-openapi/src/index.test-d.ts

@@ -337,4 +337,25 @@ describe('Middleware', () => {
       }
     )
   })
+
+  it('Should infer Env correctly when the middleware is empty', async () => {
+    const app = new OpenAPIHono<{ Variables: { foo: string } }>()
+    app.openapi(
+      createRoute({
+        method: 'get',
+        path: '/books',
+        middleware: [] as const, // empty
+        responses: {
+          200: {
+            description: 'response',
+          },
+        },
+      }),
+      (c) => {
+        const foo = c.get('foo')
+        type verify = Expect<Equal<typeof foo, string>>
+        return c.json({})
+      }
+    )
+  })
 })

packages/zod-openapi/src/index.ts

@@ -305,7 +305,7 @@ export type MiddlewareToHandlerType<M extends MiddlewareHandler<any, any, any>[]
     : never
   : M extends [infer Last]
   ? Last // Return the last remaining handler in the array
-  : never
+  : MiddlewareHandler<Env>
 
 type RouteMiddlewareParams<R extends RouteConfig> = OfHandlerType<
   MiddlewareToHandlerType<AsArray<R['middleware']>>

packages/zod-openapi/tsconfig.spec.json

@@ -2,13 +2,18 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc/packages/zod-openapi",
-    "types": ["vitest/globals"]
+    "types": [
+      "vitest/globals"
+    ]
   },
-
-  "include": ["**/*.test.ts", "**/*.test-d.ts", "vitest.config.ts"],
+  "include": [
+    "**/*.test.ts",
+    "**/*.test-d.ts",
+    "vitest.config.ts"
+  ],
   "references": [
     {
       "path": "./tsconfig.build.json"
     }
   ]
-}
+}