Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update adapter-vercel to use new build output API #4663

Merged
merged 14 commits into from
Apr 20, 2022
Prev Previous commit
Next Next commit
WIP edge support
  • Loading branch information
Rich-Harris committed Apr 19, 2022
commit 5942d60dcd4fb252fcf4c1351d3f700c292a23bf
16 changes: 16 additions & 0 deletions packages/adapter-vercel/files/edge.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { Server } from 'SERVER';
import { manifest } from 'MANIFEST';

const server = new Server(manifest);

/**
* @param {Request} request
* @param {any} event
*/
export default (request, event) => {
return server.respond(request, {
getClientAddress() {
return request.headers.get('x-forwarded-for');
}
});
};
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import './shims';
import { installFetch } from '@sveltejs/kit/install-fetch';
import { getRequest, setResponse } from '@sveltejs/kit/node';
import { Server } from 'SERVER';
import { manifest } from 'MANIFEST';

installFetch();

const server = new Server(manifest);

/**
Expand Down
2 changes: 0 additions & 2 deletions packages/adapter-vercel/files/shims.js

This file was deleted.

43 changes: 40 additions & 3 deletions packages/adapter-vercel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ async function v3(builder, external, edge, split) {
const tmp = builder.getBuildDirectory(`vercel-tmp/${name}`);
const relativePath = posix.relative(tmp, builder.getServerDirectory());

builder.copy(files, tmp, {
builder.copy(`${files}/serverless.js`, `${tmp}/serverless.js`, {
replace: {
SERVER: `${relativePath}/index.js`,
MANIFEST: './manifest.js'
Expand All @@ -271,7 +271,7 @@ async function v3(builder, external, edge, split) {
);

await esbuild.build({
entryPoints: [`${tmp}/entry.js`],
entryPoints: [`${tmp}/serverless.js`],
outfile: `${dirs.functions}/${name}.func/index.js`,
target: 'node14',
bundle: true,
Expand All @@ -297,8 +297,45 @@ async function v3(builder, external, edge, split) {
/**
* @param {string} name
* @param {string} pattern
* @param {(options: { relativePath: string }) => string} generate_manifest
*/
async function generate_edge_function(name, pattern) {}
async function generate_edge_function(name, pattern, generate_manifest) {
const tmp = builder.getBuildDirectory(`vercel-tmp/${name}`);
const relativePath = posix.relative(tmp, builder.getServerDirectory());

builder.copy(`${files}/edge.js`, `${tmp}/edge.js`, {
replace: {
SERVER: `${relativePath}/index.js`,
MANIFEST: './manifest.js'
}
});

write(
`${tmp}/manifest.js`,
`export const manifest = ${generate_manifest({ relativePath })};\n`
);

await esbuild.build({
entryPoints: [`${tmp}/edge.js`],
outfile: `${dirs.functions}/${name}.func/index.js`,
target: 'node14',
bundle: true,
platform: 'node',
format: 'esm',
external
});

write(
`${dirs.functions}/${name}.func/.vc-config.json`,
JSON.stringify({
runtime: 'edge',
handler: 'index.js'
// TODO expose envVarsInUse
})
);

routes.push({ src: pattern, dest: name });
}

const generate_function = edge ? generate_edge_function : generate_serverless_function;

Expand Down