Skip to content

Commit 65012e0

Browse files
committed
[breaking] do a single bundling with Vite removing esbuild
1 parent c75dcde commit 65012e0

File tree

36 files changed

+156
-316
lines changed

36 files changed

+156
-316
lines changed

.changeset/tidy-pets-tan.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
'@sveltejs/adapter-cloudflare': patch
3+
'@sveltejs/adapter-cloudflare-workers': patch
4+
'@sveltejs/adapter-netlify': patch
5+
'@sveltejs/adapter-node': patch
6+
'@sveltejs/adapter-vercel': patch
7+
'@sveltejs/kit': patch
8+
---
9+
10+
[breaking] do a single bundling with Vite making esbuild optional

documentation/docs/10-adapters.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export default function (options) {
7474
/** @type {import('@sveltejs/kit').Adapter} */
7575
return {
7676
name: 'adapter-package-name',
77+
serverEntryPoint: 'adapter-package-name/entry',
7778
async adapt({ utils, config }) {
7879
// adapter implementation
7980
}

documentation/docs/14-configuration.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const config = {
4747
onError: 'fail'
4848
},
4949
router: true,
50+
serverEntryPoint: null,
5051
serviceWorker: {
5152
files: (filepath) => !/\.DS_STORE/.test(filepath)
5253
},
@@ -195,6 +196,10 @@ See [Prerendering](#ssr-and-javascript-prerender). An object containing zero or
195196

196197
Enables or disables the client-side [router](#ssr-and-javascript-router) app-wide.
197198

199+
### serverEntryPoint
200+
201+
A file path to a custom entry point for the server. Passed to `vite.build.rollupOptions.input`. See [the Rollup docs](https://rollupjs.org/guide/en/#input) for more info.
202+
198203
### serviceWorker
199204

200205
An object containing zero or more of the following values:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import netlify from '@sveltejs/adapter-netlify';
1+
import adapter from '@sveltejs/adapter-netlify';
22

33
export default {
44
kit: {
5-
adapter: netlify(),
5+
adapter: adapter(),
66
target: '#svelte'
77
}
88
};

packages/adapter-cloudflare-workers/files/entry.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
// TODO hardcoding the relative location makes this brittle
2-
import { init, render } from '../output/server/app.js';
1+
// $server-build doesn't exist until the app is built
2+
// @ts-expect-error
3+
import { init, render } from '$server-build';
34
import { getAssetFromKV, NotFoundError } from '@cloudflare/kv-asset-handler';
45

56
init();

packages/adapter-cloudflare-workers/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { fileURLToPath } from 'url';
1212
export default function (options) {
1313
return {
1414
name: '@sveltejs/adapter-cloudflare-workers',
15+
serverEntryPoint: '@sveltejs/adapter-cloudflare-workers/entry',
1516

1617
async adapt({ utils }) {
1718
const { site } = validate_config(utils);

packages/adapter-cloudflare-workers/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
".": {
1313
"import": "./index.js"
1414
},
15+
"./entry": {
16+
"import": "./files/entry.js"
17+
},
1518
"./package.json": "./package.json"
1619
},
1720
"main": "index.js",

packages/adapter-cloudflare/files/worker.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* global ASSETS */
2-
import { init, render } from '../output/server/app.js';
2+
// $server-build doesn't exist until the app is built
3+
// @ts-expect-error
4+
import { init, render } from '$server-build';
35

46
init();
57

packages/adapter-cloudflare/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import * as esbuild from 'esbuild';
99
export default function (options = {}) {
1010
return {
1111
name: '@sveltejs/adapter-cloudflare',
12+
serverEntryPoint: '@sveltejs/adapter-cloudflare/entry',
1213
async adapt({ utils, config }) {
1314
const files = fileURLToPath(new URL('./files', import.meta.url));
1415
const target_dir = join(process.cwd(), '.svelte-kit', 'cloudflare');

packages/adapter-cloudflare/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
".": {
1313
"import": "./index.js"
1414
},
15+
"./entry": {
16+
"import": "./files/worker.js"
17+
},
1518
"./package.json": "./package.json"
1619
},
1720
"types": "index.d.ts",

0 commit comments

Comments
 (0)