From 4ea7275ef88417d4b43cef9258d72a7e6dd2caf9 Mon Sep 17 00:00:00 2001
From: codecalm <codecalm@gmail.com>
Date: Sat, 17 Feb 2024 20:31:53 +0100
Subject: [PATCH] build fixes

---
 .build/update-icons-version.mjs | 45 ---------------------------------
 .build/validate-icons.mjs       | 12 ++++++---
 .build/zip-files.mjs            |  6 +----
 package.json                    |  2 +-
 4 files changed, 11 insertions(+), 54 deletions(-)
 delete mode 100644 .build/update-icons-version.mjs

diff --git a/.build/update-icons-version.mjs b/.build/update-icons-version.mjs
deleted file mode 100644
index e04637ec4..000000000
--- a/.build/update-icons-version.mjs
+++ /dev/null
@@ -1,45 +0,0 @@
-import cp from 'child_process'
-import fs from 'fs'
-import path from 'path'
-import { getArgvs, getPackageJson, ICONS_SRC_DIR } from './helpers.mjs'
-
-const p = getPackageJson()
-
-
-
-const setVersions = function(version, files) {
-  for (const i in files) {
-    const file = files[i],
-        filePath = path.join(ICONS_SRC_DIR, `${file}.svg`)
-
-    if (fs.existsSync(filePath)) {
-      let svgFile = fs.readFileSync(filePath).toString()
-
-      if (!svgFile.match(/version: ([0-9.]+)/i)) {
-        svgFile = svgFile.replace(/-->\n<svg/i, function(m) {
-          return `version: "${version}"\n${m}`
-        })
-
-        fs.writeFileSync(filePath, svgFile)
-      } else {
-        console.log(`File ${file} already has version`)
-      }
-    } else {
-      console.log(`File ${file} doesn't exists`)
-    }
-  }
-}
-
-if (version) {
-  cp.exec(`grep -RiL "version: " ${ICONS_SRC_DIR}/**/*.svg`, function(err, ret) {
-    let newIcons = []
-
-    ret.replace(/src\/_icons\/([a-z0-9-]+)\.svg/g, function(m, fileName) {
-      newIcons.push(fileName)
-    })
-
-    if (newIcons.length) {
-      setVersions(newVersion.replace(/\.0$/, ''), newIcons)
-    }
-  })
-}
diff --git a/.build/validate-icons.mjs b/.build/validate-icons.mjs
index 9f436a02d..742d890f2 100644
--- a/.build/validate-icons.mjs
+++ b/.build/validate-icons.mjs
@@ -1,13 +1,14 @@
 import { globSync } from 'glob'
 import fs from 'fs'
 import { basename } from 'path'
-import { ICONS_SRC_DIR, iconTemplate, parseMatter, types } from './helpers.mjs'
+import { ICONS_SRC_DIR, iconTemplate, parseMatter, types, getArgvs } from './helpers.mjs'
 import { join } from 'path'
 
 let error = false
 
 const outlineIconsNames = globSync(join(ICONS_SRC_DIR, 'outline/*.svg')).map(i => basename(i, '.svg')),
-  filledIconsNames = globSync(join(ICONS_SRC_DIR, 'filled/*.svg')).map(i => basename(i, '.svg'));
+  filledIconsNames = globSync(join(ICONS_SRC_DIR, 'filled/*.svg')).map(i => basename(i, '.svg')),
+  argvs = getArgvs();
 
 let unicodes = []
 
@@ -52,10 +53,15 @@ types.forEach(type => {
         }
 
         unicodes.push(data.unicode)
-      } else {
+      } else if (argvs.hard) {
         console.log(`Icon ${icon} has no unicode`)
         error = true
       }
+
+      if (argvs.hard && !data.version) {
+        console.log(`Icon ${icon} has no version`)
+        error = true
+      }
     } catch (e) {
       console.log(`Icon ${icon} has invalid metadata`)
       error = true
diff --git a/.build/zip-files.mjs b/.build/zip-files.mjs
index fe7a5711b..1ed821124 100644
--- a/.build/zip-files.mjs
+++ b/.build/zip-files.mjs
@@ -11,10 +11,6 @@ zip.addLocalFolder(resolve(HOME_DIR, `packages/icons/icons/`), 'svg')
 zip.addLocalFolder(resolve(HOME_DIR, `packages/icons-png/icons/`), 'png')
 zip.addLocalFolder(resolve(HOME_DIR, `packages/icons-pdf/icons/`), 'pdf')
 zip.addLocalFolder(resolve(HOME_DIR, `packages/icons-eps/icons/`), 'eps')
-zip.addLocalFolder(resolve(HOME_DIR, `packages/icons-webfont/fonts`), 'webfont/fonts')
-zip.addLocalFile(resolve(HOME_DIR, `packages/icons-webfont/tabler-icons.html`), 'webfont')
-zip.addLocalFile(resolve(HOME_DIR, `packages/icons-webfont/tabler-icons.scss`), 'webfont')
-zip.addLocalFile(resolve(HOME_DIR, `packages/icons-webfont/tabler-icons.css`), 'webfont')
-zip.addLocalFile(resolve(HOME_DIR, `packages/icons-webfont/tabler-icons.min.css`), 'webfont')
+zip.addLocalFolder(resolve(HOME_DIR, `packages/icons-webfont/dist`), 'webfont')
 
 zip.writeZip(resolve(HOME_DIR, `packages-zip/tabler-icons-${p.version}.zip`));
diff --git a/package.json b/package.json
index e10ea93f2..b41ea298d 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "scripts": {
     "dev": "eleventy --serve --watch",
     "preview": "pnpm run validate && pnpm run build:preview",
-    "build": "pnpm run update && pnpm run validate && pnpm run optimize && pnpm run build:packages && pnpm run preview && pnpm run changelog-image && pnpm run zip && pnpm run update-readme",
+    "build": "pnpm run update && pnpm run validate --hard && pnpm run optimize && pnpm run build:packages && pnpm run preview && pnpm run changelog-image && pnpm run zip && pnpm run update-readme",
     "clean": "turbo run clean",
     "test": "turbo run test",
     "changelog": "node ./.build/changelog.mjs",