Skip to content

breaking: exclude directories without a +page or +server from RouteId - #16580

Merged
elliott-with-the-longest-name-on-github merged 7 commits into
sveltejs:version-3from
Nic-Polumeyv:fix-routeid-union
Jul 30, 2026
Merged

breaking: exclude directories without a +page or +server from RouteId#16580
elliott-with-the-longest-name-on-github merged 7 commits into
sveltejs:version-3from
Nic-Polumeyv:fix-routeid-union

Conversation

@Nic-Polumeyv

@Nic-Polumeyv Nic-Polumeyv commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Closes #14847. #15027 fixed the Path half of that issue; the RouteId union still lists every directory, so resolve('/a') type-checks when /a only holds child routes.

LayoutParams now keys off the generated layout map instead of RouteId, and a layout sitting in a directory that isn't a route stops claiming its own id in LayoutRouteId.

resolve('/') stops type-checking in an app whose root page lives in a group, since /(app) is the route that serves /. Write resolve('') instead.

#16588 covers the $app/manifest side. Also points #16588's routes filter at is_app_route so the two stay in sync, and rewords its changeset to cover the #5793 fix.

@pkg-svelte-dev

pkg-svelte-dev Bot commented Jul 30, 2026

Copy link
Copy Markdown

Install the latest version of @sveltejs/kit from 3c9ef02:

pnpm add https://pkg.svelte.dev/@sveltejs/kit/c/3c9ef02321988d78d10d352c8df83fd4c9677b00

Open in pkg.svelte.dev: https://pkg.svelte.dev/repos/kit/pr/16580

Note

This PR is from a fork. A maintainer must approve approve each commit before it can be built and installed.

@changeset-bot

changeset-bot Bot commented Jul 30, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 3c9ef02

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@sveltejs/kit Major

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@Nic-Polumeyv
Nic-Polumeyv marked this pull request as draft July 30, 2026 02:35

@Rich-Harris Rich-Harris left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, this makes sense. thank you!

@Rich-Harris

Copy link
Copy Markdown
Member

(it's still marked draft — is that intentional?)

@Nic-Polumeyv

Copy link
Copy Markdown
Contributor Author

I needed to review something I noticed last night, after I got some sleep. Will update in a couple min

@teemingc

teemingc commented Jul 30, 2026

Copy link
Copy Markdown
Member

Sorry, I thought this solved a different issue but #16588 might have solved the same issue. The type tests look like they're worth carrying over though (if the one I opened even works)

EDIT: the type stuff might solve something different though?

@Nic-Polumeyv

Nic-Polumeyv commented Jul 30, 2026

Copy link
Copy Markdown
Contributor Author

No worries! Yeah, layout-only directories survive #16588's filter, so they still land in RouteId. Trimmed this down to the types half.

@Nic-Polumeyv
Nic-Polumeyv marked this pull request as ready for review July 30, 2026 18:17
Rich-Harris pushed a commit that referenced this pull request Jul 30, 2026
alternative to #16580
closes #5793

We already implemented the feature but it has the bug mentioned in that
issue. This PR removes route data for directories with no route files
and items in `routes` that would likely return a 404 (no page, no
endpoint, etc.).

Some additional fixes are that `LayoutParams` only includes paths with
layout files. Also, the route data gets considerably smaller for larger
projects.

---

### Please don't delete this checklist! Before submitting the PR, please
make sure you do the following:
- [x] It's really useful if your PR references an issue where it is
discussed ahead of time. In many cases, features are absent for a
reason. For large changes, please create an RFC:
https://github.com/sveltejs/rfcs
- [x] This message body should clearly illustrate what problems it
solves.
- [x] Ideally, include a test that fails without this PR but passes with
it.

### Tests
- [ ] Run the tests with `pnpm test` and lint the project with `pnpm
lint` and `pnpm check`

### Changesets
- [ ] If your PR makes a change that should be noted in one or more
packages' changelogs, generate a changeset by running `pnpm changeset`
and following the prompts. Changesets that add features should be
`minor` and those that fix bugs should be `patch`. Please prefix
changeset messages with `feat:`, `fix:`, or `chore:`.

### Edits

- [ ] Please ensure that 'Allow edits from maintainers' is checked. PRs
without this option may be closed.
@elliott-with-the-longest-name-on-github
elliott-with-the-longest-name-on-github merged commit d8617b3 into sveltejs:version-3 Jul 30, 2026
39 of 41 checks passed
elliott-with-the-longest-name-on-github added a commit that referenced this pull request Aug 3, 2026
Based on #16580. Adds a few goodies:

- `PageRouteId` and `EndpointRouteId`, which combine to make up
`RouteId` — these make the internal types a bit cleaner and allow you to
discriminate between which routes do what if needed
- `page` and `endpoint` booleans on each entry in
`$app/manifest.routes`, allowing routes to be filtered by capability;
routes containing both `+page` and `+server` have both set to `true`
- A `ManifestRoute` discriminated union that narrows `id` to the
corresponding page-only, endpoint-only, or combined route IDs
- A private `LayoutParamsId` alias for the IDs accepted by
`LayoutParams`, which now correspond specifically to directories
containing layouts
- More accurate layout load types: a colocated endpoint-only route is no
longer included in a layout’s possible `event.route.id` values, since
endpoint requests do not execute layouts

Layouts only run for page routes, not endpoints. Previously, a directory
with both `+layout` and `+server` incorrectly included its endpoint-only
ID in the layout’s possible `event.route.id` type, even though that
value can never occur at runtime. The change restricts it to page IDs
that can actually execute the layout.

---------

Co-authored-by: Rich Harris <rich.harris@vercel.com>
@Nic-Polumeyv
Nic-Polumeyv deleted the fix-routeid-union branch August 4, 2026 03:22
Rich-Harris pushed a commit that referenced this pull request Aug 4, 2026
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to version-3, this PR
will be updated.

⚠️⚠️⚠️⚠️⚠️⚠️

`version-3` is currently in **pre mode** so this branch has prereleases
rather than normal releases. If you want to exit prereleases, run
`changeset pre exit` on `version-3`.

⚠️⚠️⚠️⚠️⚠️⚠️

# Releases
## @sveltejs/kit@3.0.0-next.14

### Major Changes

- breaking: refresh all load functions/queries when clicking a link to
the current URL ([#16572](#16572))

- breaking: only include routes with a `+page` or `+server` in `RouteId`
([#16580](#16580))

- breaking: require Node 22.17
([#16597](#16597))

- breaking: `preloadCode` now takes a route ID (e.g. `/blog/[slug]`)
instead of a pathname. Route IDs are not prefixed with `paths.base`
([#16576](#16576))

- breaking: remove deprecated `.run()` method from live queries
([#16573](#16573))

### Minor Changes

- feat: return the list of compressed files from `builder.compress`
([#16566](#16566))

- feat: add `page` and `endpoint` booleans to `$app/manifest`'s
`routes`, and export a `ManifestRoute` type
([#16594](#16594))

- feat: add `PageRouteId` and `EndpointRouteId` to `$app/types`
([#16594](#16594))

### Patch Changes

- fix: generate valid `Path` types for routes with optional or rest
params, several params in one segment, or escape sequences
([#16577](#16577))

- fix: decode all numeric character references, including above `ffff`,
when crawling prerendered pages
([#16611](#16611))

- chore: deduplicate request hashing for serialized fetch responses
([#16499](#16499))

- fix: don't treat `Object.prototype` members as param matchers during
validation ([#16612](#16612))

- fix: exclude routes without a page or endpoint from `routes` in
`$app/manifest`, and remove directories with no route files from
`LayoutParams` ([#16588](#16588))

- chore: reuse base64 and text decoding helpers
([#16608](#16608))

- fix: record the mime types of prerendered paths in the server manifest
([#16564](#16564))

- chore: only generate each route's resolution module once when
prerendering ([#16576](#16576))

- fix: expand `[x+nn]` and `[u+nnnn]` escape sequences when resolving a
route id to a pathname
([#16570](#16570))

- fix: allow routes to contain `[` and `]` via the `[x+5b]` and `[x+5d]`
escapes ([#16569](#16569))

- chore: remove the dead `SSRState.fallback` field and name the server
state fork semantics
([#16598](#16598))

- fix: import resolved peer dependencies as file URLs so
project-relative resolution works on Windows
([#16618](#16618))

- fix: write generated tsconfig to `node_modules/$app/tsconfig.json` so
that tools with simplified tsconfig resolution can find it
([#16589](#16589))

- fix: prerender and crawl pages whose `content-type` header carries a
`charset` parameter
([#16567](#16567))

- fix: stream promised `read` results lazily instead of eagerly
buffering them ([#16622](#16622))

- fix: correctly decode `[u+nnnn]` escape sequences above `ffff`
([#16611](#16611))
## @sveltejs/adapter-auto@8.0.0-next.2

### Patch Changes

- fix: convert resolved adapter path to a file URL before importing, so
builds work on Windows
([#16618](#16618))
- Updated dependencies
[[`c3f58bb`](c3f58bb),
[`b655dc7`](b655dc7),
[`a70cc4f`](a70cc4f),
[`b325afb`](b325afb),
[`e76b3d7`](e76b3d7),
[`58f47eb`](58f47eb),
[`fe9d8d9`](fe9d8d9),
[`0c7bbd7`](0c7bbd7),
[`08d7e2a`](08d7e2a),
[`f70f679`](f70f679),
[`0624b26`](0624b26),
[`0624b26`](0624b26),
[`f4222ad`](f4222ad),
[`089628b`](089628b),
[`d8617b3`](d8617b3),
[`c7369a1`](c7369a1),
[`5e5e592`](5e5e592),
[`60057c1`](60057c1),
[`f70f679`](f70f679),
[`38f1528`](38f1528),
[`40092f3`](40092f3),
[`ff4247e`](ff4247e),
[`79a5de5`](79a5de5),
[`a70cc4f`](a70cc4f)]:
  - @sveltejs/kit@3.0.0-next.14
## @sveltejs/adapter-cloudflare@8.0.0-next.4

### Patch Changes

- fix: avoid caching immutable asset 404s
([#16627](#16627))
- Updated dependencies
[[`c3f58bb`](c3f58bb),
[`b655dc7`](b655dc7),
[`a70cc4f`](a70cc4f),
[`b325afb`](b325afb),
[`e76b3d7`](e76b3d7),
[`58f47eb`](58f47eb),
[`fe9d8d9`](fe9d8d9),
[`0c7bbd7`](0c7bbd7),
[`08d7e2a`](08d7e2a),
[`f70f679`](f70f679),
[`0624b26`](0624b26),
[`0624b26`](0624b26),
[`f4222ad`](f4222ad),
[`089628b`](089628b),
[`d8617b3`](d8617b3),
[`c7369a1`](c7369a1),
[`5e5e592`](5e5e592),
[`60057c1`](60057c1),
[`f70f679`](f70f679),
[`38f1528`](38f1528),
[`40092f3`](40092f3),
[`ff4247e`](ff4247e),
[`79a5de5`](79a5de5),
[`a70cc4f`](a70cc4f)]:
  - @sveltejs/kit@3.0.0-next.14
## @sveltejs/adapter-node@6.0.0-next.7

### Patch Changes

- fix: serve static files with the Content-Type recorded in the manifest
([#16564](#16564))

- fix: don't send `Vary: Accept-Encoding` for assets that were never
precompressed ([#16566](#16566))
- Updated dependencies
[[`c3f58bb`](c3f58bb),
[`b655dc7`](b655dc7),
[`a70cc4f`](a70cc4f),
[`b325afb`](b325afb),
[`e76b3d7`](e76b3d7),
[`58f47eb`](58f47eb),
[`fe9d8d9`](fe9d8d9),
[`0c7bbd7`](0c7bbd7),
[`08d7e2a`](08d7e2a),
[`f70f679`](f70f679),
[`0624b26`](0624b26),
[`0624b26`](0624b26),
[`f4222ad`](f4222ad),
[`089628b`](089628b),
[`d8617b3`](d8617b3),
[`c7369a1`](c7369a1),
[`5e5e592`](5e5e592),
[`60057c1`](60057c1),
[`f70f679`](f70f679),
[`38f1528`](38f1528),
[`40092f3`](40092f3),
[`ff4247e`](ff4247e),
[`79a5de5`](79a5de5),
[`a70cc4f`](a70cc4f)]:
  - @sveltejs/kit@3.0.0-next.14
## @sveltejs/adapter-static@4.0.0-next.3

### Patch Changes

- fix: avoid caching immutable asset 404s when configuring for Vercel
([#16626](#16626))
- Updated dependencies
[[`c3f58bb`](c3f58bb),
[`b655dc7`](b655dc7),
[`a70cc4f`](a70cc4f),
[`b325afb`](b325afb),
[`e76b3d7`](e76b3d7),
[`58f47eb`](58f47eb),
[`fe9d8d9`](fe9d8d9),
[`0c7bbd7`](0c7bbd7),
[`08d7e2a`](08d7e2a),
[`f70f679`](f70f679),
[`0624b26`](0624b26),
[`0624b26`](0624b26),
[`f4222ad`](f4222ad),
[`089628b`](089628b),
[`d8617b3`](d8617b3),
[`c7369a1`](c7369a1),
[`5e5e592`](5e5e592),
[`60057c1`](60057c1),
[`f70f679`](f70f679),
[`38f1528`](38f1528),
[`40092f3`](40092f3),
[`ff4247e`](ff4247e),
[`79a5de5`](79a5de5),
[`a70cc4f`](a70cc4f)]:
  - @sveltejs/kit@3.0.0-next.14
## @sveltejs/enhanced-img@1.0.0-next.3

### Patch Changes

- chore: bump `vite-imagetools` to v11
([#16630](#16630))
## @sveltejs/package@3.0.0-next.4

### Patch Changes

- chore: remove dependency on sade
([#16619](#16619))

- fix: import resolved peer dependencies as file URLs so
project-relative resolution works on Windows
([#16618](#16618))

- fix: emit declarations when the tsconfig lives above the package root
([#16568](#16568))

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

resolve allows non-existing routes ($app/paths)

4 participants