chore: Resolve merge conflicts

honojs · Apr 20, 2024 · 83428b0 · 83428b0
2 parents 2c91344 + 3c351e1
commit 83428b0
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 10 deletions.
diff --git a/packages/clerk-auth/CHANGELOG.md b/packages/clerk-auth/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @hono/clerk-auth
 
+## 1.0.3
+
+### Patch Changes
+
+- [#463](https://github.com/honojs/middleware/pull/463) [`892ea7da85fb2c799eacc4d29651e1fa45a6aec0`](https://github.com/honojs/middleware/commit/892ea7da85fb2c799eacc4d29651e1fa45a6aec0) Thanks [@yudai-nkt](https://github.com/yudai-nkt)! - Update peer dependencies so that newer validators can be installed.
+
+## 1.0.2
+
+### Patch Changes
+
+- [#460](https://github.com/honojs/middleware/pull/460) [`6497f5772f84027a07ef2c728cb10b2f8a172dda`](https://github.com/honojs/middleware/commit/6497f5772f84027a07ef2c728cb10b2f8a172dda) Thanks [@hadeeb](https://github.com/hadeeb)! - fix: export esm
+
 ## 1.0.1
 
 ### Patch Changes

diff --git a/packages/clerk-auth/jest.config.js → packages/clerk-auth/jest.config.cjs b/packages/clerk-auth/jest.config.js → packages/clerk-auth/jest.config.cjs
diff --git a/packages/clerk-auth/package.json b/packages/clerk-auth/package.json
@@ -1,18 +1,32 @@
 {
   "name": "@hono/clerk-auth",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A third-party Clerk auth middleware for Hono",
-  "main": "dist/index.js",
+  "type": "module",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
     "test": "jest",
-    "build": "rimraf dist && tsc",
+    "build": "tsup ./src/index.ts --format esm,cjs --dts",
     "prerelease": "yarn build && yarn test",
     "release": "yarn publish"
   },
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    }
+  },
   "license": "MIT",
   "publishConfig": {
     "registry": "https://registry.npmjs.org",

diff --git a/packages/typebox-validator/CHANGELOG.md b/packages/typebox-validator/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @hono/typebox-validator
 
+## 0.2.3
+
+### Patch Changes
+
+- [#463](https://github.com/honojs/middleware/pull/463) [`892ea7da85fb2c799eacc4d29651e1fa45a6aec0`](https://github.com/honojs/middleware/commit/892ea7da85fb2c799eacc4d29651e1fa45a6aec0) Thanks [@yudai-nkt](https://github.com/yudai-nkt)! - Update peer dependencies so that newer validators can be installed.
+
 ## 0.2.2
 
 ### Patch Changes

diff --git a/packages/typebox-validator/package.json b/packages/typebox-validator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hono/typebox-validator",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Validator middleware using TypeBox",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/honojs/middleware",
   "peerDependencies": {
-    "@sinclair/typebox": "^0.31.15",
+    "@sinclair/typebox": ">=0.31.15 <1",
     "hono": ">=3.9.0"
   },
   "devDependencies": {

diff --git a/packages/valibot-validator/CHANGELOG.md b/packages/valibot-validator/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @hono/valibot-validator
 
+## 0.2.3
+
+### Patch Changes
+
+- [#463](https://github.com/honojs/middleware/pull/463) [`892ea7da85fb2c799eacc4d29651e1fa45a6aec0`](https://github.com/honojs/middleware/commit/892ea7da85fb2c799eacc4d29651e1fa45a6aec0) Thanks [@yudai-nkt](https://github.com/yudai-nkt)! - Update peer dependencies so that newer validators can be installed.
+
 ## 0.2.2
 
 ### Patch Changes

diff --git a/packages/valibot-validator/package.json b/packages/valibot-validator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hono/valibot-validator",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Validator middleware using Valibot",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -28,7 +28,7 @@
   "homepage": "https://github.com/honojs/middleware",
   "peerDependencies": {
     "hono": ">=3.9.0",
-    "valibot": "^0.13.1"
+    "valibot": ">=0.13.1 <1"
   },
   "devDependencies": {
     "hono": "^3.11.7",

diff --git a/yarn.lock b/yarn.lock
@@ -1818,7 +1818,7 @@ __metadata:
     jest: "npm:^29.7.0"
     node-fetch-native: "npm:^1.4.0"
     react: "npm:^18.2.0"
-    rimraf: "npm:^5.0.5"
+    tsup: "npm:^8.0.1"
   peerDependencies:
     "@clerk/backend": 1
     "@clerk/shared": 2
@@ -2087,7 +2087,7 @@ __metadata:
     jest: "npm:^29.7.0"
     rimraf: "npm:^5.0.5"
   peerDependencies:
-    "@sinclair/typebox": ^0.31.15
+    "@sinclair/typebox": ">=0.31.15 <1"
     hono: ">=3.9.0"
   languageName: unknown
   linkType: soft
@@ -2116,7 +2116,7 @@ __metadata:
     valibot: "npm:^0.24.1"
   peerDependencies:
     hono: ">=3.9.0"
-    valibot: ^0.13.1
+    valibot: ">=0.13.1 <1"
   languageName: unknown
   linkType: soft