Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions config/patches/@tanstack__react-start@1.168.60.patch

This file was deleted.

29 changes: 29 additions & 0 deletions config/patches/@tanstack__react-start@1.169.2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
diff --git a/dist/default-entry/esm/server.js b/dist/default-entry/esm/server.js
index 45144532c12100a13775ecc9970e4f6ff0256aab..97a617f9e2c1b608d672c4e178f54454aa6d3faa 100644
--- a/dist/default-entry/esm/server.js
+++ b/dist/default-entry/esm/server.js
@@ -1,7 +1,21 @@
-import { createServerEntry as createServerEntry$1, createStartHandler, defaultStreamHandler } from "@tanstack/react-start/server";
//#region src/default-entry/server.ts
-var fetch = createStartHandler(defaultStreamHandler);
-var createServerEntry = createServerEntry$1;
+var defaultHandlerPromise;
+function getDefaultHandler() {
+ if (!defaultHandlerPromise) defaultHandlerPromise = import("@tanstack/react-start/server").then((mod) => mod.createStartHandler(mod.defaultStreamHandler));
+ return defaultHandlerPromise;
+}
+var fetch = async (...args) => {
+ const handler = await getDefaultHandler();
+ return await handler(...args);
+};
+function createServerEntry(entry) {
+ var serverEntryPromise;
+ return { async fetch(...args) {
+ if (!serverEntryPromise) serverEntryPromise = import("@tanstack/react-start/server").then((mod) => mod.createServerEntry(entry));
+ const serverEntry = await serverEntryPromise;
+ return await serverEntry.fetch(...args);
+ } };
+}
var server_default = createServerEntry({ fetch });
//#endregion
export { createServerEntry, server_default as default };
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
"@emoji-mart/data": "1.2.1",
"@hono/zod-validator": "^0.8.0",
"@tanstack/react-query": "^5.100.10",
"@tanstack/react-router": "1.170.41",
"@tanstack/react-start": "1.168.60",
"@tanstack/router-plugin": "1.168.42",
"@tanstack/react-router": "1.170.44",
"@tanstack/react-start": "1.169.2",
"@tanstack/router-plugin": "1.168.46",
"accounts": "^0.15.2",
"chat": "4.27.0",
"hono": "4.13.11",
"hono": "4.13.13",
"kysely": "0.28.17",
"nanoid": "^5.1.16",
"ox": "0.14.20",
Expand All @@ -50,7 +50,7 @@
},
"devDependencies": {
"@cloudflare/vite-plugin": "1.37.0",
"@cloudflare/vitest-plugin": "1.4.0",
"@cloudflare/vitest-plugin": "1.4.2",
"@iconify/json": "2.2.467",
"@playwright/test": "1.59.1",
"@slack/web-api": "7.15.2",
Expand Down
1,609 changes: 722 additions & 887 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

21 changes: 10 additions & 11 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ allowBuilds:
workerd@1.20260507.1: true
workerd@1.20260511.1: true
workerd@1.20261006.1: true
workerd@1.20261012.1: true
auditConfig:
ignoreGhsas:
# Fixed locally by config/patches/image-size@2.0.2.patch; no upstream release yet.
Expand All @@ -26,9 +27,9 @@ auditConfig:
blockExoticSubdeps: true
catalog:
# Vite+ dependency aliases.
vite: npm:@voidzero-dev/vite-plus-core@1.1.0
vite-plus: 1.1.0
vitest: 5.0.3
vite: npm:@voidzero-dev/vite-plus-core@1.3.0
vite-plus: 1.3.0
vitest: 5.0.5
dangerouslyAllowAllBuilds: false
enableGlobalVirtualStore: true
linkWorkspacePackages: false
Expand All @@ -39,14 +40,12 @@ minimumReleaseAgeExclude:
- tapimo
- tmp
- viem
- '@babel/core@7.29.6'
- axios@1.20.0
- shell-quote@1.10.0
- '@grpc/grpc-js@1.14.5'
- esbuild@0.28.1
- protobufjs@7.6.5
- form-data@4.0.6
- vite-plus@1.1.0
- launch-editor@2.14.2
- ip-address@10.7.1
- nanoid@3.3.18
Expand All @@ -59,7 +58,7 @@ minimumReleaseAgeExclude:
- ws@8.21.0
minimumReleaseAgeStrict: true
overrides:
'@modelcontextprotocol/sdk': 1.32.0
'@modelcontextprotocol/sdk': 1.32.1
'@vue/compiler-core': 3.5.42
'@vue/compiler-dom': 3.5.42
'@vue/compiler-sfc': 3.5.42
Expand All @@ -71,10 +70,10 @@ overrides:
'@vue/shared': 3.5.42
vue: 3.5.42
proxy-addr: 2.0.8
seroval: 1.6.7
seroval: 1.6.9
source-map-js: 1.2.2
tinypool: 2.1.2
'@babel/core': 7.29.6
'@babel/core': 7.29.7
'@grpc/grpc-js': 1.14.5
axios: 1.20.0
'@hono/node-server@<2.0.5': 2.0.10
Expand Down Expand Up @@ -105,7 +104,7 @@ overrides:
undici: 7.29.1
uuid: 11.1.1
vite: 'catalog:'
vite-plus: 1.1.0
vite-plus: 1.3.0
vitest: 'catalog:'
ws: 8.21.0
packageExtensions:
Expand All @@ -117,7 +116,7 @@ packageExtensions:
'@svgr/plugin-jsx': 8.1.0
'@voidzero-dev/vite-plus-core@*':
dependencies:
vite-plus: 1.1.0
vite-plus: 1.3.0
local-pkg@*:
dependencies:
'@svgr/core': 8.1.0
Expand All @@ -126,7 +125,7 @@ patchedDependencies:
'@slack/web-api@7.15.2': config/patches/@slack__web-api@7.15.2.patch
# TODO: Remove when TanStack Start server entry no longer eagerly resolves virtual router modules during Worker test startup.
# Related: https://github.com/cloudflare/workers-sdk/issues/11100
'@tanstack/react-start@1.168.60': config/patches/@tanstack__react-start@1.168.60.patch
'@tanstack/react-start@1.169.2': config/patches/@tanstack__react-start@1.169.2.patch
emulate@0.5.0: config/patches/emulate@0.5.0.patch
image-size@2.0.2: config/patches/image-size@2.0.2.patch
prool@0.2.4: config/patches/prool@0.2.4.patch
Expand Down
2 changes: 1 addition & 1 deletion src/function/dash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const getDashboardData = createServerFn({ method: 'GET' }).handler(async
})

export const disconnectDashboardAccount = createServerFn({ method: 'POST' })
.inputValidator(z.object({ identityId: z.string().check(z.minLength(1)) }))
.validator(z.object({ identityId: z.string().check(z.minLength(1)) }))
.handler(async ({ data }) => {
const session = await auth.getSession(getRequest())
if (!session) throw new Error('Connect your wallet to manage connected accounts.')
Expand Down
2 changes: 1 addition & 1 deletion src/routes/confirm/$token.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ function ConfirmPanel(props: {
}

const getConfirmData = createServerFn({ method: 'GET' })
.inputValidator(z.string().check(z.minLength(1)))
.validator(z.string().check(z.minLength(1)))
.handler(async ({ data }) => {
const endpoint = rpc.api.confirm[':token']
const response = await api.fetch(new Request(endpoint.$url({ param: { token: data } })), env)
Expand Down
2 changes: 1 addition & 1 deletion src/routes/connect/$token.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ function ConnectPanel(props: {
}

const getConnectData = createServerFn({ method: 'GET' })
.inputValidator(z.string().check(z.minLength(1)))
.validator(z.string().check(z.minLength(1)))
.handler(async ({ data }) => {
const endpoint = rpc.api.account.link[':token']
const response = await api.fetch(new Request(endpoint.$url({ param: { token: data } })), env)
Expand Down
3 changes: 3 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ export default defineConfig({
}),
test: {
fileParallelism: false,
// TODO: Remove when @cloudflare/vitest-plugin is upgraded to 1.4.3, which supports Vitest's filesystem module cache.
// https://github.com/cloudflare/workers-sdk/pull/16163
fsModuleCache: false,
include: ['src/**/*.workers.test.ts'],
name: 'workers',
globalSetup: ['test/workers.global.setup.ts'],
Expand Down
Loading