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

[fix] encode if root layout has server load #6352

Merged
merged 4 commits into from Aug 29, 2022

Conversation

dummdidumm
Copy link
Member

@dummdidumm dummdidumm commented Aug 28, 2022

Fixes #6349
Fixes #6336

While fixing it I thought of ways to make the manifest shorter. I did that in a second commit so it can be reverted if not appropriate.

No test, I can't think of a way to test this without creating another test app, which I wanted to avoid - but can do so if we feel it's necessary.

Please don't delete this checklist! Before submitting the PR, please make sure you do the following:

  • 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
  • This message body should clearly illustrate what problems it solves.
  • 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. All changesets should be patch until SvelteKit 1.0

@changeset-bot
Copy link

changeset-bot bot commented Aug 28, 2022

🦋 Changeset detected

Latest commit: fecdac7

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 Patch

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


// only include non-root layout/error nodes if they exist
if (layouts.length > 0 || errors.length > 0) array.push(`[${layouts.join(',')}]`);
array.push(`[${layouts.join(',')}]`);
Copy link
Member Author

Choose a reason for hiding this comment

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

Just realized, with the manifest adjustment the if that was there before can be reinstated

@Rich-Harris Rich-Harris merged commit d0b30f4 into master Aug 29, 2022
@Rich-Harris Rich-Harris deleted the fix-has-server-load-logic branch August 29, 2022 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

+layout.server.ts load doesn't run after invalidate() Layout data is cleared when url is used in +layout.ts
3 participants