From f84525d86b8f03bef9975cd6187a421950c268fa Mon Sep 17 00:00:00 2001 From: Cody Olsen Date: Thu, 12 Dec 2024 12:50:26 +0100 Subject: [PATCH] allow hybrid render --- .gitignore | 2 + astro/astro.config.mjs | 6 +- astro/package.json | 1 + pnpm-lock.yaml | 153 ++++++++++++++++++++++++++++++++++++----- 4 files changed, 142 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index c6bba59..cf2dc73 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,5 @@ dist .yarn/build-state.yml .yarn/install-state.gz .pnp.* + +.vercel diff --git a/astro/astro.config.mjs b/astro/astro.config.mjs index bcc2201..8f1c76c 100644 --- a/astro/astro.config.mjs +++ b/astro/astro.config.mjs @@ -1,5 +1,9 @@ // @ts-check import {defineConfig} from 'astro/config' +import vercel from '@astrojs/vercel'; + // https://astro.build/config -export default defineConfig({}) +export default defineConfig({ + adapter: vercel() +}) \ No newline at end of file diff --git a/astro/package.json b/astro/package.json index fec2ad5..73198a7 100644 --- a/astro/package.json +++ b/astro/package.json @@ -9,6 +9,7 @@ "preview": "astro preview" }, "dependencies": { + "@astrojs/vercel": "^8.0.0", "astro": "^5.0.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7cd10d0..d80dddf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,6 +64,9 @@ importers: astro: dependencies: + '@astrojs/vercel': + specifier: ^8.0.0 + version: 8.0.0(@sveltejs/kit@2.10.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(astro@5.0.5(@types/node@22.10.2)(jiti@2.4.0)(rollup@4.28.1)(terser@5.36.0)(tsx@4.19.2)(typescript@5.7.2)(yaml@2.6.1))(next@15.1.0(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)(svelte@5.11.2)(vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2)) astro: specifier: ^5.0.2 version: 5.0.5(@types/node@22.10.2)(jiti@2.4.0)(rollup@4.28.1)(terser@5.36.0)(tsx@4.19.2)(typescript@5.7.2)(yaml@2.6.1) @@ -78,7 +81,7 @@ importers: version: 3.67.1 next: specifier: 13.5.7 - version: 13.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 13.5.7(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18 version: 18.3.1 @@ -124,7 +127,7 @@ importers: version: 3.67.1 next: specifier: 14.2.20 - version: 14.2.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 14.2.20(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18 version: 18.3.1 @@ -170,7 +173,7 @@ importers: version: 3.67.1 next: specifier: 15.1.0 - version: 15.1.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + version: 15.1.0(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react: specifier: ^19.0.0 version: 19.0.0 @@ -216,7 +219,7 @@ importers: version: 3.67.1 next: specifier: canary - version: 15.1.1-canary.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + version: 15.1.1-canary.1(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react: specifier: ^19.0.0 version: 19.0.0 @@ -262,7 +265,7 @@ importers: version: 3.67.1 next: specifier: 15.1.0 - version: 15.1.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + version: 15.1.0(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react: specifier: ^19.0.0 version: 19.0.0 @@ -517,6 +520,11 @@ packages: resolution: {integrity: sha512-wxhSKRfKugLwLlr4OFfcqovk+LIFtKwLyGPqMsv+9/ibqqnW3Gv7tBhtKEb0gAyUAC4G9BTVQeQahqnQAhd6IQ==} engines: {node: ^18.17.1 || ^20.3.0 || >=22.0.0} + '@astrojs/vercel@8.0.0': + resolution: {integrity: sha512-JEVt/J9NJ0unMCLh2fCOvr9M6Mugph3SoNSzaRLR88hA6ckakHabSAMyd8fTFy4pogPH/puyQkiKak7nsHyM6g==} + peerDependencies: + astro: ^5.0.0 + '@babel/code-frame@7.26.2': resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} engines: {node: '>=6.9.0'} @@ -3307,6 +3315,35 @@ packages: peerDependencies: vue: '>=2.7 || >=3' + '@vercel/analytics@1.4.1': + resolution: {integrity: sha512-ekpL4ReX2TH3LnrRZTUKjHHNpNy9S1I7QmS+g/RQXoSUQ8ienzosuX7T9djZ/s8zPhBx1mpHP/Rw5875N+zQIQ==} + peerDependencies: + '@remix-run/react': ^2 + '@sveltejs/kit': ^1 || ^2 + next: '>= 13' + react: ^18 || ^19 || ^19.0.0-rc + svelte: '>= 4' + vue: ^3 + vue-router: ^4 + peerDependenciesMeta: + '@remix-run/react': + optional: true + '@sveltejs/kit': + optional: true + next: + optional: true + react: + optional: true + svelte: + optional: true + vue: + optional: true + vue-router: + optional: true + + '@vercel/edge@1.1.3': + resolution: {integrity: sha512-2KKMJcDtyq5z9KYI8pWDQYEI74gHf1m3afYxRx5X9QSGTO15u6WgA/lG2hv2BpcFZvgh2YAwKUaOWAyRTUp13A==} + '@vercel/nft@0.27.6': resolution: {integrity: sha512-mwuyUxskdcV8dd7N7JnxBgvFEz1D9UOePI/WyLLzktv6HSCwgPNQGit/UJ2IykAWGlypKw4pBQjOKWvIbXITSg==} engines: {node: '>=16'} @@ -9052,6 +9089,26 @@ snapshots: transitivePeerDependencies: - supports-color + '@astrojs/vercel@8.0.0(@sveltejs/kit@2.10.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(astro@5.0.5(@types/node@22.10.2)(jiti@2.4.0)(rollup@4.28.1)(terser@5.36.0)(tsx@4.19.2)(typescript@5.7.2)(yaml@2.6.1))(next@15.1.0(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)(svelte@5.11.2)(vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))': + dependencies: + '@astrojs/internal-helpers': 0.4.2 + '@vercel/analytics': 1.4.1(@sveltejs/kit@2.10.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(next@15.1.0(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)(svelte@5.11.2)(vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2)) + '@vercel/edge': 1.1.3 + '@vercel/nft': 0.27.6 + astro: 5.0.5(@types/node@22.10.2)(jiti@2.4.0)(rollup@4.28.1)(terser@5.36.0)(tsx@4.19.2)(typescript@5.7.2)(yaml@2.6.1) + esbuild: 0.24.0 + fast-glob: 3.3.2 + transitivePeerDependencies: + - '@remix-run/react' + - '@sveltejs/kit' + - encoding + - next + - react + - supports-color + - svelte + - vue + - vue-router + '@babel/code-frame@7.26.2': dependencies: '@babel/helper-validator-identifier': 7.25.9 @@ -10950,7 +11007,7 @@ snapshots: '@polka/url@1.0.0-next.28': {} - '@portabletext/editor@1.15.3(@sanity/block-tools@3.67.1(debug@4.4.0))(@sanity/schema@3.67.1(debug@4.4.0))(@sanity/types@3.67.1(debug@4.4.0))(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(rxjs@7.8.1)(styled-components@6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0))': + '@portabletext/editor@1.15.3(@sanity/block-tools@3.67.1)(@sanity/schema@3.67.1)(@sanity/types@3.67.1(debug@4.4.0))(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(rxjs@7.8.1)(styled-components@6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0))': dependencies: '@portabletext/patches': 1.1.0 '@sanity/block-tools': 3.67.1(debug@4.4.0) @@ -11381,7 +11438,7 @@ snapshots: '@sanity/comlink': 2.0.1 '@sanity/icons': 3.5.2(react@19.0.0) '@sanity/logos': 2.1.13(@sanity/color@3.0.6)(react@19.0.0) - '@sanity/preview-url-secret': 2.0.5(@sanity/client@6.24.1(debug@4.4.0)) + '@sanity/preview-url-secret': 2.0.5(@sanity/client@6.24.1) '@sanity/ui': 2.10.9(@emotion/is-prop-valid@1.2.2)(react-dom@19.0.0(react@19.0.0))(react-is@18.3.1)(react@19.0.0)(styled-components@6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0)) '@sanity/uuid': 3.0.2 fast-deep-equal: 3.1.3 @@ -11408,7 +11465,7 @@ snapshots: prettier: 3.4.2 prettier-plugin-packagejson: 2.5.5(prettier@3.4.2) - '@sanity/preview-url-secret@2.0.5(@sanity/client@6.24.1(debug@4.4.0))': + '@sanity/preview-url-secret@2.0.5(@sanity/client@6.24.1)': dependencies: '@sanity/client': 6.24.1(debug@4.4.0) '@sanity/uuid': 3.0.2 @@ -11612,6 +11669,25 @@ snapshots: tiny-glob: 0.2.9 vite: 5.4.11(@types/node@22.10.2)(terser@5.36.0) + '@sveltejs/kit@2.10.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1))': + dependencies: + '@sveltejs/vite-plugin-svelte': 4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)) + '@types/cookie': 0.6.0 + cookie: 0.6.0 + devalue: 5.1.1 + esm-env: 1.2.1 + import-meta-resolve: 4.1.0 + kleur: 4.1.5 + magic-string: 0.30.15 + mrmime: 2.0.0 + sade: 1.8.1 + set-cookie-parser: 2.7.1 + sirv: 3.0.0 + svelte: 5.11.2 + tiny-glob: 0.2.9 + vite: 6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1) + optional: true + '@sveltejs/vite-plugin-svelte-inspector@3.0.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@5.4.11(@types/node@22.10.2)(terser@5.36.0)))(svelte@5.11.2)(vite@5.4.11(@types/node@22.10.2)(terser@5.36.0))': dependencies: '@sveltejs/vite-plugin-svelte': 4.0.2(svelte@5.11.2)(vite@5.4.11(@types/node@22.10.2)(terser@5.36.0)) @@ -11621,6 +11697,16 @@ snapshots: transitivePeerDependencies: - supports-color + '@sveltejs/vite-plugin-svelte-inspector@3.0.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1))': + dependencies: + '@sveltejs/vite-plugin-svelte': 4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)) + debug: 4.4.0(supports-color@9.4.0) + svelte: 5.11.2 + vite: 6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1) + transitivePeerDependencies: + - supports-color + optional: true + '@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@5.4.11(@types/node@22.10.2)(terser@5.36.0))': dependencies: '@sveltejs/vite-plugin-svelte-inspector': 3.0.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@5.4.11(@types/node@22.10.2)(terser@5.36.0)))(svelte@5.11.2)(vite@5.4.11(@types/node@22.10.2)(terser@5.36.0)) @@ -11634,6 +11720,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1))': + dependencies: + '@sveltejs/vite-plugin-svelte-inspector': 3.0.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)) + debug: 4.4.0(supports-color@9.4.0) + deepmerge: 4.3.1 + kleur: 4.1.5 + magic-string: 0.30.15 + svelte: 5.11.2 + vite: 6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1) + vitefu: 1.0.4(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)) + transitivePeerDependencies: + - supports-color + optional: true + '@swc/counter@0.1.3': {} '@swc/helpers@0.5.15': @@ -12260,6 +12360,17 @@ snapshots: unhead: 1.11.11 vue: 3.5.13(typescript@5.7.2) + '@vercel/analytics@1.4.1(@sveltejs/kit@2.10.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(next@15.1.0(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0)(svelte@5.11.2)(vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))': + optionalDependencies: + '@sveltejs/kit': 2.10.1(@sveltejs/vite-plugin-svelte@4.0.2(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)))(svelte@5.11.2)(vite@6.0.3(@types/node@22.10.2)(jiti@2.4.0)(terser@5.36.0)(tsx@4.19.2)(yaml@2.6.1)) + next: 15.1.0(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + svelte: 5.11.2 + vue: 3.5.13(typescript@5.7.2) + vue-router: 4.5.0(vue@3.5.13(typescript@5.7.2)) + + '@vercel/edge@1.1.3': {} + '@vercel/nft@0.27.6': dependencies: '@mapbox/node-pre-gyp': 1.0.11 @@ -16214,7 +16325,7 @@ snapshots: neotraverse@0.6.18: {} - next@13.5.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + next@13.5.7(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@next/env': 13.5.7 '@swc/helpers': 0.5.2 @@ -16223,7 +16334,7 @@ snapshots: postcss: 8.4.31 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - styled-jsx: 5.1.1(react@18.3.1) + styled-jsx: 5.1.1(@babel/core@7.26.0)(react@18.3.1) watchpack: 2.4.0 optionalDependencies: '@next/swc-darwin-arm64': 13.5.7 @@ -16239,7 +16350,7 @@ snapshots: - '@babel/core' - babel-plugin-macros - next@14.2.20(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + next@14.2.20(@babel/core@7.26.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@next/env': 14.2.20 '@swc/helpers': 0.5.5 @@ -16249,7 +16360,7 @@ snapshots: postcss: 8.4.31 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - styled-jsx: 5.1.1(react@18.3.1) + styled-jsx: 5.1.1(@babel/core@7.26.0)(react@18.3.1) optionalDependencies: '@next/swc-darwin-arm64': 14.2.20 '@next/swc-darwin-x64': 14.2.20 @@ -16264,7 +16375,7 @@ snapshots: - '@babel/core' - babel-plugin-macros - next@15.1.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + next@15.1.0(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@next/env': 15.1.0 '@swc/counter': 0.1.3 @@ -16274,7 +16385,7 @@ snapshots: postcss: 8.4.31 react: 19.0.0 react-dom: 19.0.0(react@19.0.0) - styled-jsx: 5.1.6(react@19.0.0) + styled-jsx: 5.1.6(@babel/core@7.26.0)(react@19.0.0) optionalDependencies: '@next/swc-darwin-arm64': 15.1.0 '@next/swc-darwin-x64': 15.1.0 @@ -16289,7 +16400,7 @@ snapshots: - '@babel/core' - babel-plugin-macros - next@15.1.1-canary.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + next@15.1.1-canary.1(@babel/core@7.26.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@next/env': 15.1.1-canary.1 '@swc/counter': 0.1.3 @@ -16299,7 +16410,7 @@ snapshots: postcss: 8.4.31 react: 19.0.0 react-dom: 19.0.0(react@19.0.0) - styled-jsx: 5.1.6(react@19.0.0) + styled-jsx: 5.1.6(@babel/core@7.26.0)(react@19.0.0) optionalDependencies: '@next/swc-darwin-arm64': 15.1.1-canary.1 '@next/swc-darwin-x64': 15.1.1-canary.1 @@ -17703,7 +17814,7 @@ snapshots: '@dnd-kit/sortable': 7.0.2(@dnd-kit/core@6.3.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(react@19.0.0) '@dnd-kit/utilities': 3.2.2(react@19.0.0) '@juggle/resize-observer': 3.4.0 - '@portabletext/editor': 1.15.3(@sanity/block-tools@3.67.1(debug@4.4.0))(@sanity/schema@3.67.1(debug@4.4.0))(@sanity/types@3.67.1(debug@4.4.0))(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(rxjs@7.8.1)(styled-components@6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0)) + '@portabletext/editor': 1.15.3(@sanity/block-tools@3.67.1)(@sanity/schema@3.67.1)(@sanity/types@3.67.1(debug@4.4.0))(@types/react@19.0.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(rxjs@7.8.1)(styled-components@6.1.13(react-dom@19.0.0(react@19.0.0))(react@19.0.0)) '@portabletext/react': 3.2.0(react@19.0.0) '@rexxars/react-json-inspector': 8.0.1(react@19.0.0) '@sanity/asset-utils': 2.2.1 @@ -18247,15 +18358,19 @@ snapshots: stylis: 4.3.2 tslib: 2.6.2 - styled-jsx@5.1.1(react@18.3.1): + styled-jsx@5.1.1(@babel/core@7.26.0)(react@18.3.1): dependencies: client-only: 0.0.1 react: 18.3.1 + optionalDependencies: + '@babel/core': 7.26.0 - styled-jsx@5.1.6(react@19.0.0): + styled-jsx@5.1.6(@babel/core@7.26.0)(react@19.0.0): dependencies: client-only: 0.0.1 react: 19.0.0 + optionalDependencies: + '@babel/core': 7.26.0 stylehacks@7.0.4(postcss@8.4.49): dependencies: