shadcn-svelte 0.7.0 → 0.8.1

package/LICENSE.md

@@ -1,7 +1,8 @@
 MIT License
 
+Copyright (c) 2023 Hunter Johnston <https://github.com/huntabyte>
+Copyright (c) 2023 CokaKoala <https://github.com/adriangonz97>
 Copyright (c) 2023 shadcn
-Copyright (c) 2023 huntabyte
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/index.js

@@ -5207,7 +5207,7 @@ var logger = {
     console.log(chalk.green(...args));
   },
   highlight(...args) {
-    return chalk.cyan(...args);
+    return chalk.bold(chalk.cyan(...args));
   }
 };
 
@@ -5258,13 +5258,9 @@ async function resolveConfigPaths(cwd, config) {
   const isSvelteKit = isUsingSvelteKit(cwd);
   if (isSvelteKit) {
     const packageManager = await getPackageManager(cwd);
-    await execa2(
-      packageManager === "npm" ? "npx" : packageManager,
-      ["svelte-kit", "sync"],
-      {
-        cwd
-      }
-    );
+    await execa2(packageManager === "npm" ? "npx" : packageManager, ["svelte-kit", "sync"], {
+      cwd
+    });
   }
   const tsconfigPath = await find(path8.resolve(cwd, "package.json"), { root: cwd });
   if (tsconfigPath === null) {
@@ -5313,9 +5309,7 @@ async function getRawConfig(cwd) {
     const config = JSON.parse(configResult);
     return rawConfigSchema.parse(config);
   } catch (error) {
-    throw new Error(
-      `Invalid configuration found in ${logger.highlight(configPath)}.`
-    );
+    throw new Error(`Invalid configuration found in ${logger.highlight(configPath)}.`);
   }
 }
 
@@ -5470,10 +5464,7 @@ async function getItemTargetPath(config, item2, override2) {
   if (!(parent in config.resolvedPaths)) {
     return null;
   }
-  return path9.join(
-    config.resolvedPaths[parent],
-    type
-  );
+  return path9.join(config.resolvedPaths[parent], type);
 }
 async function fetchRegistry(paths) {
   try {
@@ -5489,7 +5480,7 @@ async function fetchRegistry(paths) {
     );
     return results;
   } catch (error) {
-    console.log(error);
+    console.error(error);
     throw new Error(`Failed to fetch registry from ${baseUrl}.`);
   }
 }
@@ -6559,7 +6550,6 @@ var add = new Command().command("add").description("add components to your proje
   "the working directory. defaults to the current directory.",
   process.cwd()
 ).option("-p, --path <path>", "the path to add the component to.").action(async (components, opts) => {
-  const highlight = logger.highlight;
   try {
     const options = addOptionsSchema.parse({
       components,
@@ -6620,7 +6610,7 @@ var add = new Command().command("add").description("add components to your proje
       return;
     }
     logger.info(`Selected components:
-${highlight(selectedComponents)}`);
+${logger.highlight(selectedComponents)}`);
     if (!options.yes) {
       const { proceed } = await prompts2({
         type: "confirm",
@@ -6660,9 +6650,9 @@ ${highlight(selectedComponents)}`);
         if (selectedComponents.includes(item2.name)) {
           logger.warn(
             `
-Component ${highlight(
+Component ${logger.highlight(
               item2.name
-            )} already exists at ${highlight(
+            )} already exists at ${logger.highlight(
               componentPath
             )}. Use ${chalk3.green("--overwrite")} to overwrite.`
           );
@@ -6687,16 +6677,9 @@ Component ${highlight(
           continue;
         }
         const packageManager = await getPackageManager(cwd);
-        await execa3(
-          packageManager,
-          [
-            packageManager === "npm" ? "install" : "add",
-            ...item2.dependencies
-          ],
-          {
-            cwd
-          }
-        );
+        await execa3(packageManager, ["add", ...item2.dependencies], {
+          cwd
+        });
       }
       componentPaths.push(componentPath);
     }
@@ -6711,10 +6694,8 @@ Component ${highlight(
       );
     }
     spinner.succeed(`Done.`);
-    logger.info(
-      `Components installed at:
-- ${[...componentPaths].join("\n- ")}`
-    );
+    logger.info("Components installed at:");
+    logger.info(logger.highlight(componentPaths.map((path13) => `- ${path13}`).join("\n")));
   } catch (error) {
     handleError(error);
   }
@@ -6945,9 +6926,7 @@ var init2 = new Command2().command("init").description("Configure your SvelteKit
     logger.info("");
     logger.info(`${chalk4.green("Success!")} Project initialization completed.`);
     logger.info("");
-    logger.info(
-      "Don't forget to add the aliases you configured to your svelte.config.js!"
-    );
+    logger.info("Don't forget to add the aliases you configured to your svelte.config.js!");
     logger.info("");
   } catch (e) {
     handleError(e);
@@ -7084,11 +7063,7 @@ async function runInit(cwd, config) {
     await fs7.unlink(cjsConfig).catch((e) => e);
   const baseColor = await getRegistryBaseColor(config.tailwind.baseColor);
   if (baseColor) {
-    await fs7.writeFile(
-      config.resolvedPaths.tailwindCss,
-      baseColor.cssVarsTemplate,
-      "utf8"
-    );
+    await fs7.writeFile(config.resolvedPaths.tailwindCss, baseColor.cssVarsTemplate, "utf8");
   }
   const utilsPath = config.resolvedPaths.utils + (config.typescript ? ".ts" : ".js");
   const utilsTemplate = config.typescript ? UTILS : UTILS_JS;
@@ -7098,9 +7073,9 @@ async function runInit(cwd, config) {
   const packageManager = await getPackageManager(cwd);
   const deps = [
     ...PROJECT_DEPENDENCIES,
-    config.style === "new-york" ? "radix-icons-svelte" : "lucide-svelte"
+    config.style === "new-york" ? "svelte-radix" : "lucide-svelte"
   ];
-  await execa4(packageManager, [packageManager === "npm" ? "install" : "add", ...deps], {
+  await execa4(packageManager, ["add", ...deps], {
     cwd
   });
   dependenciesSpinner?.succeed();
@@ -7163,9 +7138,7 @@ var update = new Command3().command("update").description("update components in
     });
     for (const file of files) {
       if (file.isDirectory()) {
-        const component = registryIndex.find(
-          (comp) => comp.name === file.name
-        );
+        const component = registryIndex.find((comp) => comp.name === file.name);
         if (component) {
           existingComponents.push(component);
         }
@@ -7205,9 +7178,7 @@ var update = new Command3().command("update").description("update components in
       const extension = config.typescript ? ".ts" : ".js";
       const utilsPath = config.resolvedPaths.utils + extension;
       if (!existsSync4(utilsPath)) {
-        spinner.fail(
-          `utils at ${logger.highlight(utilsPath)} does not exist.`
-        );
+        spinner.fail(`utils at ${logger.highlight(utilsPath)} does not exist.`);
         process.exitCode = 1;
         return;
       }
@@ -7217,9 +7188,12 @@ var update = new Command3().command("update").description("update components in
       registryIndex,
       selectedComponents.map((com) => com.name)
     );
-    const payload = await fetchTree(config, tree);
-    for (const item2 of payload) {
-      spinner.text = `Updating ${item2.name}...`;
+    const payload = (await fetchTree(config, tree)).sort(
+      (a, b) => a.name.localeCompare(b.name)
+    );
+    const componentsToRemove = {};
+    for (const [index, item2] of payload.entries()) {
+      spinner.text = `Updating ${logger.highlight(item2.name)} (${index + 1}/${payload.length})...`;
       const targetDir = await getItemTargetPath(config, item2);
       if (!targetDir) {
         continue;
@@ -7227,30 +7201,43 @@ var update = new Command3().command("update").description("update components in
       if (!existsSync4(targetDir)) {
         await fs8.mkdir(targetDir, { recursive: true });
       }
+      const componentDir2 = path12.resolve(targetDir, item2.name);
+      if (!existsSync4(componentDir2)) {
+        await fs8.mkdir(componentDir2, { recursive: true });
+      }
       for (const file of item2.files) {
-        const componentDir2 = path12.resolve(targetDir, item2.name);
-        let filePath = path12.resolve(targetDir, item2.name, file.name);
+        const filePath = path12.resolve(targetDir, item2.name, file.name);
         const content = transformImports(file.content, config);
-        if (!existsSync4(componentDir2)) {
-          await fs8.mkdir(componentDir2, { recursive: true });
-        }
         await fs8.writeFile(filePath, content);
       }
+      const installedFiles = await fs8.readdir(componentDir2);
+      const remoteFiles = item2.files.map((file) => file.name);
+      const filesToDelete = installedFiles.filter((file) => !remoteFiles.includes(file)).map((file) => path12.resolve(targetDir, item2.name, file));
+      if (filesToDelete.length > 0) {
+        componentsToRemove[item2.name] = filesToDelete;
+      }
       if (item2.dependencies?.length) {
         const packageManager = await getPackageManager(cwd);
-        await execa5(
-          packageManager,
-          [
-            packageManager === "npm" ? "install" : "add",
-            ...item2.dependencies
-          ],
-          {
-            cwd
-          }
-        );
+        await execa5(packageManager, ["add", ...item2.dependencies], {
+          cwd
+        });
       }
     }
-    spinner.succeed(`Done.`);
+    spinner.succeed("Done.");
+    for (const [component, files2] of Object.entries(componentsToRemove)) {
+      logger.warn(
+        `
+The ${logger.highlight(
+          component
+        )} component does not use the following files:`
+      );
+      logger.warn(
+        files2.map((file) => chalk5.white(`- ${path12.relative(cwd, file)}`)).join("\n")
+      );
+    }
+    if (Object.keys(componentsToRemove)) {
+      logger.warn("\nYou may want to remove them.");
+    }
   } catch (e) {
     handleError(e);
   }
@@ -7275,11 +7262,7 @@ process.on("SIGINT", () => process.exit(0));
 process.on("SIGTERM", () => process.exit(0));
 async function main2() {
   const packageInfo = getPackageInfo();
-  const program = new Command4().name("shadcn-svelte").description("Add shadcn-svelte components to your project").version(
-    packageInfo.version || "1.0.0",
-    "-v, --version",
-    "display the version number"
-  );
+  const program = new Command4().name("shadcn-svelte").description("Add shadcn-svelte components to your project").version(packageInfo.version || "1.0.0", "-v, --version", "display the version number");
   program.addCommand(init2).addCommand(add).addCommand(update);
   program.parse();
 }