Skip to content

Commit

Permalink
fix: solidjs integration for vercel edge build (adopting same mechani…
Browse files Browse the repository at this point in the history
…cs as cloudflare) (#6085)

* fix solidjs integration for vercel deployment

* downgrade change to patch

---------

Co-authored-by: AirBorne04 <>
  • Loading branch information
AirBorne04 authored Feb 1, 2023
1 parent a007dbc commit b236b5c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 8 deletions.
5 changes: 5 additions & 0 deletions .changeset/wild-seas-happen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/vercel': patch
---

Added second build step through esbuild, to allow framework defined build (vite build) and target defined bundling (esbuilt step)
24 changes: 16 additions & 8 deletions packages/integrations/vercel/src/edge/adapter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro';
import esbuild from 'esbuild';
import { relative as relativePath } from 'node:path';
import { fileURLToPath } from 'node:url';

Expand Down Expand Up @@ -74,18 +75,25 @@ export default function vercelEdge({ includeFiles = [] }: VercelEdgeConfig = {})
}
}

vite.ssr = {
target: 'webworker',
noExternal: true,
};

vite.build ||= {};
vite.build.minify = true;
vite.ssr ||= {};
vite.ssr.target ||= 'webworker';
}
},
'astro:build:done': async ({ routes }) => {
const entry = new URL(serverEntry, buildTempFolder);
const generatedFiles = await getFilesFromFolder(buildTempFolder);
const entryPath = fileURLToPath(entry);

await esbuild.build({
target: 'es2020',
platform: 'browser',
entryPoints: [entryPath],
outfile: entryPath,
allowOverwrite: true,
format: 'esm',
bundle: true,
minify: true,
});

// Copy entry and other server files
const commonAncestor = await copyFilesToFunction(
Expand All @@ -100,7 +108,7 @@ export default function vercelEdge({ includeFiles = [] }: VercelEdgeConfig = {})
// https://vercel.com/docs/build-output-api/v3#vercel-primitives/edge-functions/configuration
await writeJson(new URL(`./.vc-config.json`, functionFolder), {
runtime: 'edge',
entrypoint: relativePath(commonAncestor, fileURLToPath(entry)),
entrypoint: relativePath(commonAncestor, entryPath),
});

// Output configuration
Expand Down

0 comments on commit b236b5c

Please sign in to comment.