Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
388363b
first draft of server routing manifest
dummdidumm Jan 24, 2025
70d1a8f
_app/routes/... endpoint
dummdidumm Jan 24, 2025
b0ecbeb
WIP client integration
dummdidumm Jan 24, 2025
72782d8
do this via ssrmanifest instead (previous approach does not work beca…
dummdidumm Jan 24, 2025
a107444
add option
dummdidumm Jan 25, 2025
63808a9
integrate option
dummdidumm Jan 25, 2025
e8528f5
oops
dummdidumm Jan 25, 2025
e14b473
silence vite warning
dummdidumm Jan 25, 2025
f65ceb3
obsolete
dummdidumm Jan 25, 2025
0bc5cd8
oops
dummdidumm Jan 25, 2025
3be38e4
fix
dummdidumm Jan 25, 2025
b05f960
see what happens if everything runs with server routing
dummdidumm Jan 25, 2025
5fd674f
fixes
dummdidumm Jan 27, 2025
56f7b71
temporarily adjust test
dummdidumm Jan 27, 2025
678cd28
adjust tests
dummdidumm Jan 27, 2025
98f10eb
fix
dummdidumm Jan 27, 2025
3e7211b
disallow adapter-static with resolution=server
dummdidumm Jan 27, 2025
733445d
adjust order of token updates; they need to happen before the first a…
dummdidumm Jan 27, 2025
8e53116
fix
dummdidumm Jan 27, 2025
bd29ba5
oops
dummdidumm Jan 27, 2025
b0653e0
prerender route resolution requests
dummdidumm Jan 27, 2025
a082fc2
create client routes for server as part of manifest already. This sav…
dummdidumm Jan 28, 2025
ef74189
run all of apps/basics in a separate github action with router.resol…
dummdidumm Jan 28, 2025
46507b1
lint
dummdidumm Jan 28, 2025
21cf0ce
feedback
dummdidumm Jan 28, 2025
1af6c1a
oops
dummdidumm Jan 28, 2025
fe0f25f
make server routing base path aware
dummdidumm Jan 28, 2025
38b14eb
here instead
dummdidumm Jan 28, 2025
7288023
simplify
dummdidumm Jan 28, 2025
453aa2a
make imports relative
dummdidumm Jan 28, 2025
5bced02
fix
dummdidumm Jan 28, 2025
42df818
lint
dummdidumm Jan 28, 2025
89aa78b
run options test suite in server routing mode, too
dummdidumm Jan 28, 2025
c6941e4
fix
dummdidumm Jan 28, 2025
24b8cd6
fix artifact upload
dummdidumm Jan 28, 2025
ec8b7fa
vercel adapter (hope this works)
dummdidumm Jan 28, 2025
7c2a23e
fix
dummdidumm Jan 28, 2025
f38a6d2
generate symlink before running server routing tests
dummdidumm Jan 28, 2025
24ff293
take base path into account
dummdidumm Jan 28, 2025
df5efb4
remove unnecessary validation, make sure route resolution is also sav…
dummdidumm Jan 28, 2025
8ffb62d
harmonize pathname endings before sending to resolution endpoint
dummdidumm Jan 28, 2025
c99a78b
take assets path into account when creating import paths during serve…
dummdidumm Jan 29, 2025
1528dfa
obsolete
dummdidumm Jan 29, 2025
2f53412
nomenclature
dummdidumm Jan 29, 2025
9e408f6
changeset
dummdidumm Jan 29, 2025
1bb22a1
Apply suggestions from code review
dummdidumm Jan 29, 2025
0337eed
don't include root error/layout if no routes
dummdidumm Jan 29, 2025
b458c81
regenerate types
dummdidumm Jan 29, 2025
7cf48b2
prettier
dummdidumm Jan 29, 2025
6a0ab67
Apply suggestions from code review
dummdidumm Jan 29, 2025
0342bb7
type generation
elliott-with-the-longest-name-on-github Jan 30, 2025
cfe0477
omit base path from route resolution endpoint
dummdidumm Jan 29, 2025
c9734fb
tidier output
dummdidumm Jan 29, 2025
5521417
make server route / route in hydrate clearer
dummdidumm Jan 29, 2025
56bd377
comment
dummdidumm Jan 29, 2025
d8362a7
Merge remote-tracking branch 'origin/main' into server-side-routing
dummdidumm Jan 30, 2025
ccb0f67
exclude default options from route resolution function
Rich-Harris Feb 1, 2025
88db9e6
Merge branch 'server-side-routing' of github.com:sveltejs/kit into se…
Rich-Harris Feb 1, 2025
a520b30
'routes' -> 'route', more consistent with endpoint naming conventions…
Rich-Harris Feb 1, 2025
6964355
use same naming convention as verb_data_suffix — prevents the need fo…
Rich-Harris Feb 1, 2025
bf3676a
make add_resolution_prefix operate on strings, tweak implementation
Rich-Harris Feb 1, 2025
6e74c74
simplify function signatures by making app_dir globally available
Rich-Harris Feb 1, 2025
3383fae
remove now-unused options.app_dir
Rich-Harris Feb 1, 2025
9cc37b4
pass pathname into resolution helpers, for parity with similar __data…
Rich-Harris Feb 1, 2025
c03c47a
move pathname manipulation functions into their own module
Rich-Harris Feb 1, 2025
4ce9070
move more stuff into pathname.js, DRY out
Rich-Harris Feb 1, 2025
24b6d13
simplify
Rich-Harris Feb 1, 2025
3f366cf
assets is always absolute, config validation will fail otherwise
Rich-Harris Feb 1, 2025
cec8994
lint
Rich-Harris Feb 1, 2025
3181914
unused
Rich-Harris Feb 1, 2025
b0bfc3c
lint
Rich-Harris Feb 1, 2025
b88fc3a
stricter interface
Rich-Harris Feb 1, 2025
b9156e7
use generate terminology in line with generate_manifest, which is a s…
Rich-Harris Feb 1, 2025
8b36c85
cosmetic change, to make route modules more readable
Rich-Harris Feb 1, 2025
27a8243
save a few bytes
Rich-Harris Feb 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/adapter-static/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ export default function (options) {
name: '@sveltejs/adapter-static',

async adapt(builder) {
if (builder.config.kit.router?.resolution === 'server' && options?.fallback) {
throw new Error(
'adapter-static with a fallback page cannot be used with `router.resolution: "server"`, ' +
'as this combination of configs requires a server to handle dynamic route resolution requests'
);
}

if (!options?.fallback && builder.config.kit.router?.type !== 'hash') {
const dynamic_routes = builder.routes.filter((route) => route.prerender !== true);
if (dynamic_routes.length > 0 && options?.strict !== false) {
Expand Down
3 changes: 2 additions & 1 deletion packages/kit/src/core/config/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ const get_defaults = (prefix = '') => ({
output: { preloadStrategy: 'modulepreload', bundleStrategy: 'split' },
outDir: join(prefix, '.svelte-kit'),
router: {
type: 'pathname'
type: 'pathname',
resolution: 'server'
},
serviceWorker: {
register: true
Expand Down
Loading
Loading