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.

Sign up for GitHub

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
Merged

fix: ensure inserted code is preserved during migration #13617

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2c2e3f
fix: moving deriveds during migration deletes part of the inserted code
paoloricciuti Oct 15, 2024
2dffe40
fix: use update instead of remove
paoloricciuti Oct 16, 2024
9282397
Update .changeset/cool-apes-confess.md
paoloricciuti Oct 16, 2024
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
5 changes: 5 additions & 0 deletions .changeset/cool-apes-confess.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: moving deriveds during migration deletes part of the inserted code
2 changes: 1 addition & 1 deletion packages/svelte/src/compiler/migrate/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ export function migrate(source, { filename } = {}) {
const { start, end } = get_node_range(source, node);
str.appendLeft(end, '\n');
str.move(start, end, /** @type {number} */ (parsed.instance?.content.end));
str.remove(start - (source[start - 2] === '\r' ? 2 : 1), start);
str.update(start - (source[start - 2] === '\r' ? 2 : 1), start, '');
}
}

Expand Down
12 changes: 12 additions & 0 deletions ...lte/tests/migrate/samples/reactive-statements-reorder-not-deleting-additions/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<script>
export let data
$: ({ foo } = data)

import { blah } from './blah.js'

let bar
$: {
bar = []
let baz
}
</script>
15 changes: 15 additions & 0 deletions ...te/tests/migrate/samples/reactive-statements-reorder-not-deleting-additions/output.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<script>
import { run } from 'svelte/legacy';


import { blah } from './blah.js'
/** @type {{data: any}} */
let { data } = $props();

let bar = $state()
let { foo } = $derived(data)
run(() => {
bar = []
let baz
});
</script>