diff --git a/.changeset/young-icons-peel.md b/.changeset/young-icons-peel.md new file mode 100644 index 000000000..13b955d69 --- /dev/null +++ b/.changeset/young-icons-peel.md @@ -0,0 +1,5 @@ +--- +"@solidjs/start": patch +--- + +GET server functions, response returns, cache to use GET diff --git a/examples/basic/package.json b/examples/basic/package.json index 0477ac1b8..4b318b6be 100644 --- a/examples/basic/package.json +++ b/examples/basic/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@solidjs/meta": "^0.29.2", - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "solid-js": "^1.8.11", "vinxi": "^0.1.4" diff --git a/examples/experiments/package.json b/examples/experiments/package.json index e5ca53a9f..00b3935bb 100644 --- a/examples/experiments/package.json +++ b/examples/experiments/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@solidjs/meta": "^0.29.2", - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "solid-js": "^1.8.11", "vinxi": "^0.1.4" diff --git a/examples/experiments/src/routes/index.tsx b/examples/experiments/src/routes/index.tsx index 03ccc6c02..7374ddaff 100644 --- a/examples/experiments/src/routes/index.tsx +++ b/examples/experiments/src/routes/index.tsx @@ -1,15 +1,22 @@ import { Title } from "@solidjs/meta"; -import { clientOnly } from "@solidjs/start"; +import { json } from "@solidjs/router"; +import { clientOnly, GET } from "@solidjs/start"; import Counter from "~/components/Counter"; const BreaksOnServer = clientOnly(() => import("~/components/BreaksOnServer")); async function hello(name: string) { "use server"; - return "hello " + name; + return json( + { hello: new Promise(r => setTimeout(() => r(name), 1000)) }, + { headers: { "cache-control": "max-age=60" } } + ); } export default function Home() { - hello("John").then(console.log); + GET(hello, "John").then(async v => { + console.log(v); + console.log(await v.hello); + }); return (
Hello World diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 02f83ec50..7d9315edc 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -7,7 +7,7 @@ "start": "vinxi start" }, "dependencies": { - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "solid-js": "^1.8.11", "vinxi": "^0.1.4" diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json index 59d32e630..fe67764a1 100644 --- a/examples/todomvc/package.json +++ b/examples/todomvc/package.json @@ -7,7 +7,7 @@ "start": "vinxi start" }, "dependencies": { - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "solid-js": "^1.8.11", "unstorage": "1.10.1", diff --git a/examples/with-auth/package.json b/examples/with-auth/package.json index 3af747868..1b19606b8 100644 --- a/examples/with-auth/package.json +++ b/examples/with-auth/package.json @@ -10,7 +10,7 @@ "@types/node": "^20.10.1" }, "dependencies": { - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "solid-js": "^1.8.11", "unstorage": "1.10.1", diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index c52251d92..598674f2a 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@mdx-js/mdx": "^2.3.0", - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "@vinxi/plugin-mdx": "^3.6.7", "solid-js": "^1.8.11", diff --git a/examples/with-prisma/package.json b/examples/with-prisma/package.json index 2e5c12022..f51f90ead 100644 --- a/examples/with-prisma/package.json +++ b/examples/with-prisma/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@prisma/client": "^5.7.0", - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "prisma": "^5.7.0", "solid-js": "^1.8.11", diff --git a/examples/with-solid-styled/package.json b/examples/with-solid-styled/package.json index 3b0a68175..923ad7b2f 100644 --- a/examples/with-solid-styled/package.json +++ b/examples/with-solid-styled/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@solidjs/meta": "^0.29.2", - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "solid-js": "^1.8.11", "solid-styled": "^0.8.2", diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index fb0afadc1..c07b9a54f 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -7,7 +7,7 @@ "start": "vinxi start" }, "dependencies": { - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "autoprefixer": "^10.4.14", "postcss": "^8.4.26", diff --git a/examples/with-trpc/package.json b/examples/with-trpc/package.json index 82e63f19b..4cf057d40 100644 --- a/examples/with-trpc/package.json +++ b/examples/with-trpc/package.json @@ -11,7 +11,7 @@ "@trpc/client": "^10.44.1", "@trpc/server": "^10.44.1", "@solidjs/meta": "^0.29.2", - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "solid-js": "^1.8.11", "valibot": "^0.23.0", diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 1c44d9307..90215d5dc 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -12,7 +12,7 @@ "type": "module", "devDependencies": { "@solidjs/meta": "^0.29.3", - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "^0.4.10", "@solidjs/testing-library": "^0.8.5", "@testing-library/jest-dom": "^6.1.5", diff --git a/package.json b/package.json index f7ef8569a..a5e3d0f1e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.1.0", "@solidjs/meta": "^0.29.0", - "@solidjs/router": "^0.10.9", + "@solidjs/router": "^0.10.10", "@solidjs/start": "workspace:*", "@tailwindcss/typography": "^0.5.9", "@trpc/client": "^9.27.4", diff --git a/packages/start/config/server-handler.js b/packages/start/config/server-handler.js index a2376209d..a3b244638 100644 --- a/packages/start/config/server-handler.js +++ b/packages/start/config/server-handler.js @@ -111,12 +111,33 @@ async function handleServerFunction(h3Event) { } } try { - const result = await provideRequestEvent(event, () => { + let result = await provideRequestEvent(event, () => { /* @ts-ignore */ sharedConfig.context = { event }; return action(...parsed); }); + // handle responses + if (result instanceof Response) { + if (result.status === 302) { + return new Response(null, { + status: instance ? 204 : 302, + headers: { + Location: result.headers.get("Location") + } + }); + } + // forward headers + if (result.headers) { + for (const [key, value] of result.headers.entries()) { + setHeader(h3Event, key, value); + } + } + if (result.customBody) { + result = await result.customBody(); + } else if (result.body == undefined) result = undefined; + } + // handle no JS success case if (!instance) { const isError = result instanceof Error; @@ -142,13 +163,24 @@ async function handleServerFunction(h3Event) { setHeader(h3Event, "content-type", "text/javascript"); return serializeToStream(instance, result); } catch (x) { - if (x instanceof Response && x.status === 302) { - return new Response(null, { - status: instance ? 204 : 302, - headers: { - Location: x.headers.get("Location") + if (x instanceof Response) { + if (x.status === 302) { + return new Response(null, { + status: instance ? 204 : 302, + headers: { + Location: x.headers.get("Location") + } + }); + } + // forward headers + if (x.headers) { + for (const [key, value] of x.headers.entries()) { + setHeader(h3Event, key, value); } - }); + } + if (x.customBody) { + x = await x.customBody(); + } else if (x.body == undefined) x = undefined; } return x; } diff --git a/packages/start/config/server-runtime.jsx b/packages/start/config/server-runtime.jsx index f88306a3a..c44b884e5 100644 --- a/packages/start/config/server-runtime.jsx +++ b/packages/start/config/server-runtime.jsx @@ -120,9 +120,8 @@ function createRequest(base, id, instance, body, contentType) { async function fetchServerFunction(base, id, method, args) { const instance = `server-fn:${INSTANCE++}`; const response = await (method === "GET" - ? fetch(base + `/?args=${JSON.stringify(args)}`, { + ? fetch(base + (args.length ? `&args=${JSON.stringify(args)}` : ""), { headers: { - "x-server-id": id, "x-server-instance": instance } }) @@ -184,7 +183,7 @@ export function createServerReference(fn, id, name) { return `${baseURL}/_server?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`; } if (prop === "GET") { - return (...args) => fetchServerFunction(`${baseURL}/_server`, `${id}#${name}`, "GET", args); + return (...args) => fetchServerFunction(`${baseURL}/_server/?id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}`, `${id}#${name}`, "GET", args); } }, apply(target, thisArg, args) { diff --git a/packages/start/shared/GET.ts b/packages/start/shared/GET.ts new file mode 100644 index 000000000..e42c66708 --- /dev/null +++ b/packages/start/shared/GET.ts @@ -0,0 +1,3 @@ +export function GET any>(fn: T, ...args: Parameters) { + return (fn as any).GET(...args) as ReturnType; +} \ No newline at end of file diff --git a/packages/start/shared/index.tsx b/packages/start/shared/index.tsx index c803075e5..54223e56b 100644 --- a/packages/start/shared/index.tsx +++ b/packages/start/shared/index.tsx @@ -1,5 +1,6 @@ -export { default as clientOnly } from "./clientOnly"; export { FileRoutes } from "./FileRoutes"; +export { GET } from "./GET"; export { HttpHeader } from "./HttpHeader"; export { HttpStatusCode } from "./HttpStatusCode"; +export { default as clientOnly } from "./clientOnly"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65b3d8317..184f08ed2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,8 +37,8 @@ importers: specifier: ^0.29.0 version: 0.29.3(solid-js@1.8.12) '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: workspace:* version: link:packages/start @@ -104,7 +104,7 @@ importers: version: 0.24.1 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) vite: specifier: ^4.4.6 version: 4.4.9 @@ -119,7 +119,7 @@ importers: version: 1.8.12 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) examples/basic: dependencies: @@ -127,8 +127,8 @@ importers: specifier: ^0.29.2 version: 0.29.3(solid-js@1.8.12) '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -137,7 +137,7 @@ importers: version: 1.8.12 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) examples/experiments: dependencies: @@ -145,8 +145,8 @@ importers: specifier: ^0.29.2 version: 0.29.3(solid-js@1.8.12) '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -155,13 +155,13 @@ importers: version: 1.8.12 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) examples/hackernews: dependencies: '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -170,13 +170,13 @@ importers: version: 1.8.12 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) examples/todomvc: dependencies: '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -188,13 +188,13 @@ importers: version: 1.10.1 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) examples/with-auth: dependencies: '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -206,7 +206,7 @@ importers: version: 1.10.1 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) devDependencies: '@types/node': specifier: ^20.10.1 @@ -218,8 +218,8 @@ importers: specifier: ^2.3.0 version: 2.3.0 '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -234,7 +234,7 @@ importers: version: 0.0.7(solid-js@1.8.12)(vite@4.5.0) vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) examples/with-prisma: dependencies: @@ -242,8 +242,8 @@ importers: specifier: ^5.7.0 version: 5.7.0(prisma@5.7.0) '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -255,7 +255,7 @@ importers: version: 1.8.12 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) devDependencies: '@types/node': specifier: ^20.10.1 @@ -267,8 +267,8 @@ importers: specifier: ^0.29.2 version: 0.29.3(solid-js@1.8.12) '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -280,7 +280,7 @@ importers: version: 0.8.2(@babel/core@7.22.9)(solid-js@1.8.12) vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) vite-plugin-solid-styled: specifier: ^0.8.3 version: 0.8.3(rollup@3.28.1)(solid-styled@0.8.2)(vite@4.5.0) @@ -288,8 +288,8 @@ importers: examples/with-tailwindcss: dependencies: '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -307,7 +307,7 @@ importers: version: 3.3.3 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) examples/with-trpc: dependencies: @@ -318,8 +318,8 @@ importers: specifier: ^0.29.2 version: 0.29.3(solid-js@1.8.12) '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start @@ -337,7 +337,7 @@ importers: version: 0.23.0 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) examples/with-vitest: devDependencies: @@ -345,14 +345,14 @@ importers: specifier: ^0.29.3 version: 0.29.3(solid-js@1.8.12) '@solidjs/router': - specifier: ^0.10.9 - version: 0.10.9(solid-js@1.8.12) + specifier: ^0.10.10 + version: 0.10.10(solid-js@1.8.12) '@solidjs/start': specifier: ^0.4.10 version: link:../../packages/start '@solidjs/testing-library': specifier: ^0.8.5 - version: 0.8.5(@solidjs/router@0.10.9)(solid-js@1.8.12) + version: 0.8.5(@solidjs/router@0.10.10)(solid-js@1.8.12) '@testing-library/jest-dom': specifier: ^6.1.5 version: 6.1.5(vitest@1.2.1) @@ -373,13 +373,13 @@ importers: version: 5.3.3 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@testing-library/jest-dom@6.1.5)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) vite: specifier: ^4.4.9 version: 4.4.9 vite-plugin-solid: - specifier: ^2.9.0 - version: 2.9.0(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.4.9) + specifier: ^2.9.1 + version: 2.9.1(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.4.9) vitest: specifier: ^1.2.1 version: 1.2.1(@vitest/ui@1.1.0)(jsdom@24.0.0) @@ -522,15 +522,15 @@ importers: specifier: ^0.7.33 version: 0.7.33(rollup@3.28.1)(vite@4.5.0) vite-plugin-solid: - specifier: ^2.9.0 - version: 2.9.0(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.5.0) + specifier: ^2.9.1 + version: 2.9.1(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.5.0) devDependencies: solid-js: specifier: ^1.8.11 version: 1.8.12 vinxi: specifier: ^0.1.4 - version: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + version: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) packages: @@ -2798,8 +2798,8 @@ packages: dependencies: solid-js: 1.8.12 - /@solidjs/router@0.10.9(solid-js@1.8.12): - resolution: {integrity: sha512-TmipgAI2cU7A94fBO1MOEx7j9OYoKtddoOonSFb2221w5I1xxdjLk9W4CZDdyOVdO5z80f70KGJvNq83WFX/Qg==} + /@solidjs/router@0.10.10(solid-js@1.8.12): + resolution: {integrity: sha512-nGl7gMgsojuaupI5MAK2cFtkndmWWSAPhill/8La3IjujY3vMBamcQFymBsA2ejzxEYJjkOlEQHYgp2jNFkwuQ==} peerDependencies: solid-js: ^1.8.6 dependencies: @@ -2812,14 +2812,14 @@ packages: dependencies: solid-js: 1.8.12 - /@solidjs/testing-library@0.8.5(@solidjs/router@0.10.9)(solid-js@1.8.12): + /@solidjs/testing-library@0.8.5(@solidjs/router@0.10.10)(solid-js@1.8.12): resolution: {integrity: sha512-L9TowCoqdRQGB8ikODh9uHXrYTjCUZseVUG0tIVa836//qeSqXP4m0BKG66v9Zp1y1wRxok5qUW97GwrtEBMcw==} engines: {node: '>= 14'} peerDependencies: '@solidjs/router': '>=0.6.0' solid-js: '>=1.0.0' dependencies: - '@solidjs/router': 0.10.9(solid-js@1.8.12) + '@solidjs/router': 0.10.10(solid-js@1.8.12) '@testing-library/dom': 9.3.4 solid-js: 1.8.12 dev: true @@ -3125,7 +3125,7 @@ packages: birpc: 0.2.14 solid-js: 1.8.12 vite-plugin-inspect: 0.7.42(rollup@3.28.1)(vite@4.5.0) - vite-plugin-solid: 2.9.0(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.5.0) + vite-plugin-solid: 2.9.1(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.5.0) ws: 8.16.0 transitivePeerDependencies: - '@babel/core' @@ -3174,7 +3174,7 @@ packages: magicast: 0.2.11 recast: 0.23.4 tslib: 2.6.2 - vinxi: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + vinxi: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) dev: false /@vinxi/plugin-mdx@3.6.7(@mdx-js/mdx@2.3.0): @@ -3200,7 +3200,7 @@ packages: astring: 1.8.6 magicast: 0.2.11 recast: 0.23.4 - vinxi: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + vinxi: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) dev: false /@vinxi/server-functions@0.1.2(vinxi@0.1.4): @@ -3215,7 +3215,7 @@ packages: astring: 1.8.6 magicast: 0.2.11 recast: 0.23.4 - vinxi: 0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) + vinxi: 0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1) dev: false /@vitest/expect@1.2.1: @@ -9633,7 +9633,87 @@ packages: unist-util-stringify-position: 3.0.3 vfile-message: 3.1.4 - /vinxi@0.1.4(@testing-library/jest-dom@6.1.5)(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1): + /vinxi@0.1.4(@testing-library/jest-dom@6.1.5)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1): + resolution: {integrity: sha512-zzruTAdUijdOH60+oU/DwZV+4QALAMErPLtqKZfsz3XKTw5xjOyKnFlwJuppniR71+UQzR+qJHI5/M38V8XYbg==} + hasBin: true + dependencies: + '@babel/core': 7.23.7 + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.7) + '@types/micromatch': 4.0.6 + '@types/serve-static': 1.15.5 + '@types/ws': 8.5.10 + '@vinxi/devtools': 0.1.1(@babel/core@7.23.7)(@testing-library/jest-dom@6.1.5)(preact@10.19.3)(rollup@3.28.1)(vite@4.5.0) + '@vinxi/listhen': 1.5.5 + boxen: 7.1.1 + c12: 1.6.1 + chokidar: 3.5.3 + citty: 0.1.5 + consola: 3.2.3 + defu: 6.1.4 + dts-buddy: 0.2.5 + es-module-lexer: 1.4.1 + esbuild: 0.18.20 + fast-glob: 3.3.2 + get-port: 6.1.2 + get-port-please: 3.1.1 + h3: 1.9.0 + hookable: 5.5.3 + http-proxy: 1.18.1(debug@4.3.4) + iron-webcrypto: 1.0.0 + micromatch: 4.0.5 + mri: 1.2.0 + nitropack: 2.8.1 + node-fetch-native: 1.6.1 + path-to-regexp: 6.2.1 + pathe: 1.1.1 + perfect-debounce: 1.0.0 + radix3: 1.1.0 + resolve: 1.22.8 + rollup-plugin-visualizer: 5.12.0(rollup@3.28.1) + serve-placeholder: 2.0.1 + serve-static: 1.15.0 + ufo: 1.3.2 + uncrypto: 0.1.3 + unenv: 1.9.0 + unimport: 3.7.1(rollup@3.28.1) + unstorage: 1.10.1 + vite: 4.5.0(@types/node@20.10.1) + ws: 8.16.0 + zod: 3.22.4 + transitivePeerDependencies: + - '@azure/app-configuration' + - '@azure/cosmos' + - '@azure/data-tables' + - '@azure/identity' + - '@azure/keyvault-secrets' + - '@azure/storage-blob' + - '@capacitor/preferences' + - '@netlify/blobs' + - '@nuxt/kit' + - '@planetscale/database' + - '@testing-library/jest-dom' + - '@types/node' + - '@upstash/redis' + - '@vercel/kv' + - bufferutil + - debug + - encoding + - idb-keyval + - less + - lightningcss + - preact + - rollup + - sass + - stylus + - sugarss + - supports-color + - terser + - utf-8-validate + - xml2js + dev: true + + /vinxi@0.1.4(@types/node@20.10.1)(debug@4.3.4)(preact@10.19.3)(rollup@3.28.1): resolution: {integrity: sha512-zzruTAdUijdOH60+oU/DwZV+4QALAMErPLtqKZfsz3XKTw5xjOyKnFlwJuppniR71+UQzR+qJHI5/M38V8XYbg==} hasBin: true dependencies: @@ -9790,12 +9870,15 @@ packages: - supports-color dev: false - /vite-plugin-solid@2.9.0(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.4.9): - resolution: {integrity: sha512-WinqEFB80AwsN7AZdpOxBryyUcXuEkUHerfz/jLS0Iv58BebmK83KYHVnImt+cLkgbt9YWSEZPps8IDeW9Issg==} + /vite-plugin-solid@2.9.1(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.4.9): + resolution: {integrity: sha512-RC4hj+lbvljw57BbMGDApvEOPEh14lwrr/GeXRLNQLcR1qnOdzOwwTSFy13Gj/6FNIZpBEl0bWPU+VYFawrqUw==} peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* solid-js: ^1.7.2 vite: ^3.0.0 || ^4.0.0 || ^5.0.0 + peerDependenciesMeta: + '@testing-library/jest-dom': + optional: true dependencies: '@babel/core': 7.23.7 '@testing-library/jest-dom': 6.1.5(vitest@1.2.1) @@ -9810,12 +9893,15 @@ packages: - supports-color dev: true - /vite-plugin-solid@2.9.0(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.5.0): - resolution: {integrity: sha512-WinqEFB80AwsN7AZdpOxBryyUcXuEkUHerfz/jLS0Iv58BebmK83KYHVnImt+cLkgbt9YWSEZPps8IDeW9Issg==} + /vite-plugin-solid@2.9.1(@testing-library/jest-dom@6.1.5)(solid-js@1.8.12)(vite@4.5.0): + resolution: {integrity: sha512-RC4hj+lbvljw57BbMGDApvEOPEh14lwrr/GeXRLNQLcR1qnOdzOwwTSFy13Gj/6FNIZpBEl0bWPU+VYFawrqUw==} peerDependencies: '@testing-library/jest-dom': ^5.16.6 || ^5.17.0 || ^6.* solid-js: ^1.7.2 vite: ^3.0.0 || ^4.0.0 || ^5.0.0 + peerDependenciesMeta: + '@testing-library/jest-dom': + optional: true dependencies: '@babel/core': 7.23.7 '@testing-library/jest-dom': 6.1.5(vitest@1.2.1)