From 87c8cf6d88adbb62f2d4eaf19613a5ce58d34f2e Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Wed, 18 Sep 2024 20:34:01 +0200 Subject: [PATCH] fix --- packages/migrate/migrations/svelte-5/index.js | 6 ++++-- packages/migrate/migrations/svelte-5/migrate.js | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/migrate/migrations/svelte-5/index.js b/packages/migrate/migrations/svelte-5/index.js index 2184964e9904..d4453d595d7b 100644 --- a/packages/migrate/migrations/svelte-5/index.js +++ b/packages/migrate/migrations/svelte-5/index.js @@ -8,7 +8,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url'; import prompts from 'prompts'; import semver from 'semver'; import glob from 'tiny-glob/sync.js'; -import { bail, check_git, update_js_file } from '../../utils.js'; +import { bail, check_git, update_js_file, update_svelte_file } from '../../utils.js'; import { migrate as migrate_svelte_4 } from '../svelte-4/index.js'; import { transform_module_code, transform_svelte_code, update_pkg_json } from './migrate.js'; @@ -138,7 +138,9 @@ export async function migrate() { for (const file of files) { if (extensions.some((ext) => file.endsWith(ext))) { if (svelte_extensions.some((ext) => file.endsWith(ext))) { - update_js_file(file, (code) => transform_svelte_code(code, migrate)); + update_svelte_file(file, transform_module_code, (code) => + transform_svelte_code(code, migrate) + ); } else { update_js_file(file, transform_module_code); } diff --git a/packages/migrate/migrations/svelte-5/migrate.js b/packages/migrate/migrations/svelte-5/migrate.js index 86cbf8c67a6b..80e63779dffb 100644 --- a/packages/migrate/migrations/svelte-5/migrate.js +++ b/packages/migrate/migrations/svelte-5/migrate.js @@ -58,8 +58,7 @@ export function transform_module_code(code) { * @param {(source: code) => { code: string }} transform_code */ export function transform_svelte_code(code, transform_code) { - // reuse component instantiation migration from module code - return transform_module_code(transform_code(code).code); + return transform_code(code).code; } /**