nobadfonts-cli 1.1.6 → 1.1.7

package/index.js

@@ -133,7 +133,10 @@ async function addFont(fontName) {
         }
 
         if (mainFileDownloaded) {
-            cssContent.push(`
+            // Only add main variant if "regular" is NOT present in variants to avoid duplicates
+            const hasRegular = font.font_variants && font.font_variants.some(v => v.variant_name.toLowerCase().includes('regular'));
+            if (!hasRegular) {
+                cssContent.push(`
 @font-face {
   font-family: '${font.name}';
   src: ${mainCssSrc.join(',\n       ')};
@@ -142,6 +145,7 @@ async function addFont(fontName) {
   font-display: swap;
 }
         `);
+            }
         }
 
         // Download Variants
@@ -160,12 +164,15 @@ async function addFont(fontName) {
                 let style = 'normal';
                 const nameLower = variant.variant_name.toLowerCase();
 
-                if (nameLower.includes('bold')) weight = 700;
-                if (nameLower.includes('light')) weight = 300;
-                if (nameLower.includes('medium')) weight = 500;
-                if (nameLower.includes('black')) weight = 900;
                 if (nameLower.includes('thin')) weight = 100;
-                if (nameLower.includes('extra')) weight = 800; // heuristic
+                else if (nameLower.includes('extra light') || nameLower.includes('extralight')) weight = 200;
+                else if (nameLower.includes('light')) weight = 300;
+                else if (nameLower.includes('regular')) weight = 400;
+                else if (nameLower.includes('medium')) weight = 500;
+                else if (nameLower.includes('semi bold') || nameLower.includes('semibold')) weight = 600;
+                else if (nameLower.includes('extra bold') || nameLower.includes('extrabold')) weight = 800;
+                else if (nameLower.includes('bold')) weight = 700;
+                else if (nameLower.includes('black')) weight = 900;
 
                 if (nameLower.includes('italic')) style = 'italic';
 
@@ -215,45 +222,13 @@ ${cssContent.join('\n')}
         if (!existingCss.includes(`Font: ${font.name}`)) {
             await fs.outputFile(outputCssPath, existingCss + newCssBlock);
             spinner.succeed(chalk.green(`Updated src/fonts.css with @font-face definitions.`));
+            console.log(chalk.blue(`\nSuccess! To use the font, add this to your CSS:`));
+            console.log(chalk.cyan(`font-family: '${font.name}', sans-serif;`));
+            console.log(chalk.gray(`(Make sure to import './fonts.css' in your main execution file)`));
         } else {
             spinner.info(chalk.yellow(`Font ${font.name} definitions already exist in src/fonts.css`));
         }
 
-        // Update src/index.css with @theme variable
-        const indexCssPath = path.join(process.cwd(), 'src', 'index.css');
-        if (await fs.pathExists(indexCssPath)) {
-            let indexCss = await fs.readFile(indexCssPath, 'utf8');
-            const variableName = `--font-${font.slug}`;
-            const variableValue = `"${font.name}", sans-serif;`;
-
-            if (indexCss.includes('@theme {')) {
-                if (!indexCss.includes(variableName)) {
-                    const themeStart = indexCss.indexOf('@theme {');
-                    const insertPos = themeStart + '@theme {'.length;
-                    const newEntry = `\n  ${variableName}: ${variableValue}`;
-                    indexCss = indexCss.slice(0, insertPos) + newEntry + indexCss.slice(insertPos);
-
-                    await fs.writeFile(indexCssPath, indexCss);
-                    spinner.succeed(chalk.green(`Added ${variableName} to src/index.css @theme block.`));
-                } else {
-                    spinner.info(chalk.yellow(`Variable ${variableName} already exists in src/index.css`));
-                }
-            } else {
-                const newThemeBlock = `
-@theme {
-  ${variableName}: ${variableValue}
-}
-`;
-                await fs.appendFile(indexCssPath, newThemeBlock);
-                spinner.succeed(chalk.green(`Created @theme block in src/index.css with ${variableName}.`));
-            }
-        }
-
-        console.log(chalk.blue(`\nSuccess! To use the font:`));
-        console.log(chalk.cyan(`1. In CSS: font-family: var(--font-${font.slug});`));
-        console.log(chalk.cyan(`2. In Tailwind: class="font-${font.slug}"`));
-        console.log(chalk.gray(`(Make sure to import './fonts.css' in your main execution file)`));
-
     } catch (error) {
         spinner.fail(chalk.red(`Error: ${error.message}`));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nobadfonts-cli",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "CLI tool to instantly install fonts from NoBadFonts",
   "files": [
     "index.js",