Skip to content

fix: ensure inserted code is preserved during migration #13617

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

Merged
merged 3 commits into from
Oct 16, 2024

Conversation

paoloricciuti
Copy link
Member

Svelte 5 rewrite

Closes #13615

Not super happy with this but didn't find a better way. The problem is that the code assumes that we will remove one character in case of \n or 2 in case of \r\n. However based on how MagicString works if we inserted a character at that position before removing at that position will also remove the inserted character.

To fix this i snip the already transformed string to take a look at what we are removing and i trim it...any character left is added to the remove starting point.

I don't think we can find a situation where we have a character after the carriage so this should work.

Please note that the Svelte codebase is currently being rewritten for Svelte 5. Changes should target Svelte 5, which lives on the default branch (main).

If your PR concerns Svelte 4 (including updates to svelte.dev.docs), please ensure the base branch is svelte-4 and not main.

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
  • Prefix your PR title with feat:, fix:, chore:, or docs:.
  • This message body should clearly illustrate what problems it solves.
  • Ideally, include a test that fails without this PR but passes with it.

Tests and linting

  • Run the tests with pnpm test and lint the project with pnpm lint

Copy link

changeset-bot bot commented Oct 15, 2024

🦋 Changeset detected

Latest commit: 9282397

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

This PR includes changesets to release 1 package
Name Type
svelte 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

@dummdidumm
Copy link
Member

If this is about append/prepend stuff being removed, use update(start, end, '') instead, which preserves those

@paoloricciuti
Copy link
Member Author

If this is about append/prepend stuff being removed, use update(start, end, '') instead, which preserves those

Uh interesting let me try

@paoloricciuti
Copy link
Member Author

If this is about append/prepend stuff being removed, use update(start, end, '') instead, which preserves those

Flawless...thanks.

@paoloricciuti paoloricciuti changed the title fix: moving deriveds during migration deletes part of the inserted code fix: ensure inserted code is preserved during migration Oct 16, 2024
@paoloricciuti paoloricciuti merged commit 48f0bfc into main Oct 16, 2024
9 checks passed
@paoloricciuti paoloricciuti deleted the fix-moving-deriveds-delete-code branch October 16, 2024 09:44
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.

Malformed JS created by Svelte 5 migration in specific case
2 participants