Stuff

Author: Hugos68

.changeset/little-wolves-fry.md

@@ -0,0 +1,5 @@
+---
+'@skeletonlabs/skeleton-cli': patch
+---
+
+Bugfix (migrate/skeleton-3): Renaming components no longer includes a bug that could cause invalid components to be produced in bigger components

.changeset/quiet-rabbits-sniff.md

@@ -0,0 +1,5 @@
+---
+'@skeletonlabs/skeleton-cli': patch
+---
+
+Bugfix (migrate/skeleton-3): Empty strings no longer crash the `transformSvelte` function

packages/skeleton-cli/src/commands/migrate/migrations/skeleton-3/index.ts

@@ -2,7 +2,7 @@ import fg from 'fast-glob';
 import { transformTailwindConfig } from './transformers/transform-tailwind-config.js';
 import { transformPackage } from './transformers/transform-package.js';
 import type { MigrateOptions } from '../../index.js';
-import { isCancel, multiselect, spinner } from '@clack/prompts';
+import { isCancel, log, multiselect, spinner } from '@clack/prompts';
 import { cli } from '../../../../index.js';
 import { extname } from 'node:path';
 import { transformSvelte } from './transformers/transform-svelte.js';
@@ -62,7 +62,7 @@ export default async function (options: MigrateOptions) {
 		const skeletonSvelteVersion = await getLatestVersion('@skeletonlabs/skeleton-svelte', { version: '>=1.0.0-0 <2.0.0' });
 		const transformedPkg = transformPackage(pkgCode, skeletonVersion, skeletonSvelteVersion);
 		await writeFile(pkg.paths[0], transformedPkg.code);
-		packageSpinner.stop(`Successfully migrated ${pkg.matcher}`);
+		packageSpinner.stop(`Successfully migrated ${pkg.matcher}!`);
 	} catch (e) {
 		if (e instanceof Error) {
 			packageSpinner.stop(`Failed to migrate ${pkg.matcher}: ${e.message}`, 1);
@@ -81,7 +81,7 @@ export default async function (options: MigrateOptions) {
 		const transformedTailwind = transformTailwindConfig(tailwindCode);
 		theme = transformedTailwind.meta.themes.preset.at(0) ?? null;
 		await writeFile(tailwindConfig.paths[0], transformedTailwind.code);
-		tailwindSpinner.stop(`Successfully migrated ${tailwindConfig.matcher}`);
+		tailwindSpinner.stop(`Successfully migrated ${tailwindConfig.matcher}!`);
 	} catch (e) {
 		if (e instanceof Error) {
 			tailwindSpinner.stop(`Failed to migrate ${tailwindConfig.matcher}: ${e.message}`, 1);
@@ -97,7 +97,7 @@ export default async function (options: MigrateOptions) {
 		const appCode = await readFile(app.paths[0], 'utf-8');
 		const transformedApp = transformApp(appCode, theme ?? FALLBACK_THEME);
 		await writeFile(app.paths[0], transformedApp.code);
-		appSpinner.stop(`Successfully migrated ${app.matcher}`);
+		appSpinner.stop(`Successfully migrated ${app.matcher}!`);
 	} catch (e) {
 		if (e instanceof Error) {
 			appSpinner.stop(`Failed to migrate ${app.matcher}: ${e.message}`, 1);
@@ -128,7 +128,7 @@ export default async function (options: MigrateOptions) {
 				const transformedModule = transformModule(moduleCode);
 				await writeFile(sourceFile, transformedModule.code);
 			}
-			sourceFilesSpinner.message(`Successfully migrated ${sourceFile}`);
+			sourceFilesSpinner.message(`Successfully migrated ${sourceFile}!!`);
 		} catch (e) {
 			if (e instanceof Error) {
 				sourceFilesSpinner.stop(`Failed to migrate ${sourceFile}: ${e.message}`, 1);
@@ -138,20 +138,20 @@ export default async function (options: MigrateOptions) {
 			cli.error('Cancelled migration due to error');
 		}
 	}
-	sourceFilesSpinner.stop('Successfully migrated all source files');
+	sourceFilesSpinner.stop('Successfully migrated all source files!');
 
 	const installDependenciesSpinner = spinner();
 	installDependenciesSpinner.start('Installing dependencies...');
 	try {
 		await installDependencies(cwd);
-		installDependenciesSpinner.stop('Successfully installed dependencies');
+		installDependenciesSpinner.stop('Successfully installed dependencies!');
 	} catch (e) {
 		if (e instanceof Error) {
 			installDependenciesSpinner.stop(`Failed to install dependencies: ${e.message}`);
 		} else {
 			installDependenciesSpinner.stop('Failed to install dependencies', 1);
 		}
 		cli.error('Cancelled migration due to error');
-		
 	}
+	log.info('Migration complete! Visit https://next.skeleton.dev/ to learn more about all the new features in Skeleton V3.');
 }

packages/skeleton-cli/src/commands/migrate/migrations/skeleton-3/transformers/transform-svelte.ts

@@ -10,7 +10,7 @@ function renameComponent(s: MagicString, node: AST.Component, name: string) {
 	const adjustedStart = node.start + 1;
 	s.update(adjustedStart, adjustedStart + node.name.length, name);
 	const componentString = s.original.slice(node.start, node.end);
-	const indexOfNonSelfClosingTag = componentString.lastIndexOf('</', node.start);
+	const indexOfNonSelfClosingTag = componentString.lastIndexOf('</');
 	if (indexOfNonSelfClosingTag === -1 || node.start + indexOfNonSelfClosingTag > node.end) {
 		return;
 	}
@@ -46,7 +46,7 @@ function transformFragment(s: MagicString, fragment: AST.Fragment) {
 		{
 			Literal(node, ctx) {
 				const parent = ctx.path.at(-1);
-				if (typeof node.value === 'string' && !(parent && parent.type === 'ImportDeclaration') && hasRange(node)) {
+				if (typeof node.value === 'string' && node.value !== '' && !(parent && parent.type === 'ImportDeclaration') && hasRange(node)) {
 					// Add 1 to the start and subtract 1 from the end to exclude (and thus preserve) the quotes
 					s.update(node.start + 1, node.end - 1, transformClasses(node.value).code);
 				}

packages/skeleton-cli/src/utility/install-dependencies.ts

@@ -5,7 +5,7 @@ async function installDependencies(cwd = process.cwd()) {
 	const pm = await detect({
 		cwd: cwd
 	});
-	const resolvedCommand = resolveCommand(pm?.agent ?? 'npm', 'install', ['--force']);
+	const resolvedCommand = resolveCommand(pm?.agent ?? 'npm', 'install', []);
 	if (!resolvedCommand) {
 		throw new Error('Could not resolve package manager command.');
 	}