Skip to content

Commit 38d0243

Browse files
committed
simplify vercel adapter
1 parent 9a86d48 commit 38d0243

File tree

8 files changed

+82
-48
lines changed

8 files changed

+82
-48
lines changed

packages/adapter-vercel/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
.DS_Store
2-
node_modules
3-
/files
2+
node_modules
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[
2+
{
3+
"handle": "filesystem"
4+
},
5+
{
6+
"src": "/.*",
7+
"dest": ".vercel/functions/render"
8+
}
9+
]

packages/adapter-vercel/index.js

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,46 @@
11
const { writeFileSync } = require('fs');
2-
const { resolve, join } = require('path');
2+
const { join } = require('path');
3+
const esbuild = require('esbuild');
34

45
module.exports = function () {
56
/** @type {import('@sveltejs/kit').Adapter} */
67
const adapter = {
78
name: '@sveltejs/adapter-vercel',
89

910
async adapt(utils) {
10-
const vercel_output_directory = resolve('.vercel_build_output');
11-
utils.rimraf(vercel_output_directory);
11+
const dir = '.vercel_build_output';
12+
utils.rimraf(dir);
1213

13-
const config_directory = join(vercel_output_directory, 'config');
14-
const static_directory = join(vercel_output_directory, 'static');
15-
const lambda_directory = join(vercel_output_directory, 'functions', 'node', 'render');
14+
const files = join(__dirname, 'files');
1615

17-
utils.copy(join(__dirname, 'src/entry.js'), '.svelte/vercel/entry.js');
16+
const dirs = {
17+
static: join(dir, 'static'),
18+
lambda: join(dir, 'functions/node/render')
19+
};
1820

19-
const esbuild = (await import('esbuild')).default;
21+
utils.log.minor('Generating serverless function...');
22+
utils.copy(join(files, 'entry.js'), '.svelte/vercel/entry.js');
2023

2124
await esbuild.build({
2225
entryPoints: ['.svelte/vercel/entry.js'],
23-
outfile: join(lambda_directory, 'index.js'),
26+
outfile: join(dirs.lambda, 'index.js'),
2427
bundle: true,
2528
platform: 'node'
2629
});
2730

28-
writeFileSync(join(lambda_directory, 'package.json'), JSON.stringify({ type: 'commonjs' }));
29-
30-
utils.log.minor('Writing client application...');
31-
utils.copy_static_files(static_directory);
32-
utils.copy_client_files(static_directory);
31+
writeFileSync(join(dirs.lambda, 'package.json'), JSON.stringify({ type: 'commonjs' }));
3332

3433
utils.log.minor('Prerendering static pages...');
3534
await utils.prerender({
36-
dest: static_directory
35+
dest: dirs.static
3736
});
3837

38+
utils.log.minor('Copying assets...');
39+
utils.copy_static_files(dirs.static);
40+
utils.copy_client_files(dirs.static);
41+
3942
utils.log.minor('Writing routes...');
40-
utils.mkdirp(config_directory);
41-
writeFileSync(
42-
join(config_directory, 'routes.json'),
43-
JSON.stringify([
44-
{
45-
handle: 'filesystem'
46-
},
47-
{
48-
src: '/.*',
49-
dest: '.vercel/functions/render'
50-
}
51-
])
52-
);
43+
utils.copy(join(files, 'routes.json'), join(dir, 'config/routes.json'));
5344
}
5445
};
5546

packages/adapter-vercel/package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,13 @@
66
"files"
77
],
88
"scripts": {
9-
"dev": "rollup -cw",
10-
"build": "rollup -c",
119
"lint": "eslint --ignore-path .gitignore \"**/*.{ts,js,svelte}\" && npm run check-format",
1210
"format": "prettier --write . --config ../../.prettierrc --ignore-path .gitignore",
13-
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore",
14-
"prepublishOnly": "npm run build"
11+
"check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore"
1512
},
1613
"devDependencies": {
1714
"@sveltejs/kit": "workspace:*",
1815
"esbuild": "^0.11.12",
19-
"rollup": "^2.41.1",
20-
"sirv": "^1.0.11",
2116
"typescript": "^4.2.3"
2217
}
2318
}

packages/adapter-vercel/src/index.cjs

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/create-svelte/templates/default/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"scripts": {
55
"dev": "svelte-kit dev",
6-
"build": "svelte-kit build",
6+
"build": "svelte-kit build --verbose",
77
"start": "svelte-kit start"
88
},
99
"devDependencies": {

pnpm-lock.yaml

Lines changed: 51 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)