Merge branch 'main' into 218-a11y-form-fields

Author: kjmitchelljr

.gitignore

@@ -48,4 +48,7 @@ build
 .cache
 
 # macOS
-.DS_Store
+.DS_Store
+
+# React Router
+.react-router/

api/package.json

@@ -14,7 +14,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@hono/zod-validator": "^0.7.3",
+    "@hono/zod-validator": "^0.7.5",
     "@interledger/open-payments": "^7.1.3",
     "@noble/ed25519": "^3.0.0",
     "@paralleldrive/cuid2": "^2.2.2",
@@ -24,14 +24,14 @@
     "hono": "^4.9.8",
     "http-message-signatures": "^1.0.4",
     "httpbis-digest-headers": "^1.0.0",
-    "zod": "^3.25.76"
+    "zod": "^4.1.13"
   },
   "types": "./src/types.ts",
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20251011.0",
     "@shared/defines": "workspace:^",
     "@shared/types": "workspace:^",
-    "typescript": "5.9.2",
+    "typescript": "5.9.3",
     "wrangler": "^4.40.0"
   }
 }

api/src/app.ts

@@ -46,7 +46,7 @@ app.onError((error, c) => {
       message: 'Validation failed',
       code: 'VALIDATION_ERROR',
       details: {
-        issues: error.errors.map((err) => ({
+        issues: error.issues.map((err) => ({
           path: err.path.join('.'),
           message: err.message,
           code: err.code

api/src/routes/get-config.ts

@@ -1,6 +1,6 @@
 import { zValidator } from '@hono/zod-validator'
 import { HTTPException } from 'hono/http-exception'
-import { z } from 'zod'
+import z from 'zod'
 import { ConfigStorageService } from '@shared/config-storage-service'
 import { AWS_PREFIX } from '@shared/defines'
 import { PRESET_IDS, TOOLS } from '@shared/types'
@@ -26,7 +26,7 @@ app.get(
   zValidator(
     'query',
     z.object({
-      wa: z.string().url(),
+      wa: z.url(),
       preset: z.enum(PRESET_IDS)
     })
   ),

api/src/routes/probabilistic-revshare.ts

@@ -1,6 +1,6 @@
 import { HTTPException } from 'hono/http-exception'
 import { zValidator } from '@hono/zod-validator'
-import { z } from 'zod'
+import z from 'zod'
 import type { ContentfulStatusCode } from 'hono/utils/http-status'
 import type { WalletAddress } from '@interledger/open-payments'
 import { decode, pickWeightedRandom } from '@shared/probabilistic-revenue-share'
@@ -14,7 +14,7 @@ app.get(
   zValidator(
     'param',
     z.object({
-      payload: z.string().base64url().max(50_000).min(20)
+      payload: z.base64url().max(50_000).min(20)
     })
   ),
   async ({ req, json }) => {

api/src/schemas/payment.ts

@@ -1,8 +1,8 @@
-import * as z from 'zod/v4'
+import z from 'zod'
 
 export const PaymentQuoteSchema = z.object({
-  senderWalletAddress: z.string().url('Invalid sender wallet address'),
-  receiverWalletAddress: z.string().url('Invalid receiver wallet address'),
+  senderWalletAddress: z.url('Invalid sender wallet address'),
+  receiverWalletAddress: z.url('Invalid receiver wallet address'),
   amount: z.number().positive('Amount must be positive'),
   note: z.string().optional()
 })
@@ -35,11 +35,11 @@ export const PaymentFinalizeSchema = z.object({
   walletAddress: WalletAddressSchema,
   pendingGrant: z.object({
     interact: z.object({
-      redirect: z.string().url(),
+      redirect: z.url(),
       finish: z.string()
     }),
     continue: z.object({
-      uri: z.string().url(),
+      uri: z.url(),
       access_token: z.object({
         value: z.string()
       }),
@@ -48,18 +48,18 @@ export const PaymentFinalizeSchema = z.object({
   }),
   quote: z.object({
     id: z.string(),
-    walletAddress: z.string().url('Invalid wallet address'),
-    receiver: z.string().url(),
+    walletAddress: z.url('Invalid wallet address'),
+    receiver: z.url(),
     receiveAmount: AmountSchema,
     debitAmount: AmountSchema,
     method: z.literal('ilp'),
-    createdAt: z.string().datetime(),
-    expiresAt: z.string().datetime().optional()
+    createdAt: z.iso.datetime(),
+    expiresAt: z.iso.datetime().optional()
   }),
   incomingPaymentGrant: z.object({
     access_token: z.object({
       value: z.string(),
-      manage: z.string().url(),
+      manage: z.url(),
       expires_in: z.number().int(),
       access: z.array(
         z.object({
@@ -73,7 +73,7 @@ export const PaymentFinalizeSchema = z.object({
       access_token: z.object({
         value: z.string()
       }),
-      uri: z.string().url(),
+      uri: z.url(),
       wait: z.number().int().optional()
     })
   }),

api/src/types.ts

@@ -4,7 +4,7 @@ import type {
   PaymentQuoteSchema,
   WalletAddressParamSchema
 } from './schemas/payment.js'
-import type { z } from 'zod/v4'
+import type z from 'zod'
 
 export type PaymentStatusSuccess = {
   paymentId: string

cdn/package.json

@@ -22,7 +22,7 @@
     "directory-tree": "^3.5.2",
     "esbuild": "0.25.10",
     "esbuild-plugin-copy": "^2.1.1",
-    "typescript": "^5.9.2",
+    "typescript": "^5.9.3",
     "wrangler": "^4.40.0"
   }
 }

components/package.json

@@ -13,10 +13,10 @@
     "lit": "^3.3.1"
   },
   "devDependencies": {
-    "@shared/types": "workspace:^",
     "@interledger/open-payments": "^7.1.3",
+    "@shared/types": "workspace:^",
     "publisher-tools-api": "workspace:^",
-    "typescript": "^5.9.2",
+    "typescript": "^5.9.3",
     "vite": "^5.4.20"
   },
   "scripts": {

eslint.config.js

@@ -16,6 +16,7 @@ export default [
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
   {
+    files: ['frontend/**/*.{ts,tsx}', 'components/**/*.{ts,tsx}'],
     ...pluginReact.configs.flat.recommended,
     settings: {
       react: {
@@ -40,6 +41,13 @@ export default [
     }
   },
   {
-    ignores: ['**/node_modules/', '**/dist/', '**/build/', '**/public/init.js']
+    ignores: [
+      '**/node_modules/',
+      '**/dist/',
+      '**/build/',
+      '**/public/init.js',
+      '**/.react-router/',
+      '**/.wrangler/'
+    ]
   }
 ]