Skip to content

Commit

Permalink
fix: @astrojs/vercel bug fixes (#3000)
Browse files Browse the repository at this point in the history
* Fixed outDir

* Updated server out

* changeset

* Renamed out to tmp
  • Loading branch information
JuanM04 committed Apr 6, 2022
1 parent e8aaedc commit b5ed099
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .changeset/sweet-ways-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/vercel': patch
---

Fixed build directory and clean-up
30 changes: 24 additions & 6 deletions packages/integrations/vercel/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default function vercel(): AstroIntegration {
name: '@astrojs/vercel',
hooks: {
'astro:config:setup': ({ config }) => {
config.outDir = new URL('./.output/', config.outDir);
config.outDir = new URL('./.output/', config.root);
config.build.format = 'directory';
},
'astro:config:done': ({ setAdapter, config }) => {
Expand All @@ -33,21 +33,39 @@ export default function vercel(): AstroIntegration {
'astro:build:start': async ({ buildConfig }) => {
buildConfig.serverEntry = `${ENTRYFILE}.mjs`;
buildConfig.client = new URL('./static/', _config.outDir);
buildConfig.server = new URL('./server/pages/', _config.outDir);
buildConfig.server = new URL('./server/tmp/', _config.outDir);
},
'astro:build:done': async ({ dir, routes }) => {
const pagesDir = new URL('./server/pages/', dir);
/*
Why do we need two folders? Why don't we just generate all inside `server/pages/`?
When the app builds, it throws some metadata inside a `chunks/` folder.
./server/
pages/
__astro_entry.mjs
chunks/
(lots of js files)
Those chunks will count as serverless functions (which cost money), so we
need to bundle as much as possible in one file. Hence, the following code
*/

const tmpDir = new URL('./server/tmp/', dir);
const bundleDir = new URL('./server/pages/', dir);

await fs.mkdir(bundleDir, { recursive: true });

// Convert server entry to CommonJS
await esbuild.build({
entryPoints: [fileURLToPath(new URL(`./${ENTRYFILE}.mjs`, pagesDir))],
outfile: fileURLToPath(new URL(`./${ENTRYFILE}.js`, pagesDir)),
entryPoints: [fileURLToPath(new URL(`./${ENTRYFILE}.mjs`, tmpDir))],
outfile: fileURLToPath(new URL(`./${ENTRYFILE}.js`, bundleDir)),
bundle: true,
format: 'cjs',
platform: 'node',
target: 'node14',
});
await fs.rm(new URL(`./${ENTRYFILE}.mjs`, pagesDir));

await fs.rm(tmpDir, { recursive: true });

// Routes Manifest
// https://vercel.com/docs/file-system-api#configuration/routes
Expand Down

0 comments on commit b5ed099

Please sign in to comment.