diff --git a/.build/changelog-image.mjs b/.build/changelog-image.mjs index b6dc4a8c1..f03d6c5d7 100644 --- a/.build/changelog-image.mjs +++ b/.build/changelog-image.mjs @@ -1,23 +1,25 @@ -import { generateIconsPreview, getArgvs, getPackageJson, HOME_DIR } from './helpers.mjs' -import fs from 'fs' +import { generateIconsPreview, getAllIcons, getArgvs, getPackageJson, GITHUB_DIR } from './helpers.mjs' import path from 'path' const argv = getArgvs(), - p = getPackageJson() + p = getPackageJson() const version = argv['new-version'] || `${p.version}` if (version) { - const icons = JSON.parse(fs.readFileSync(`${HOME_DIR}/tags.json`)) + const icons = getAllIcons() - const newIcons = Object - .entries(icons) - .filter(([name, value]) => { - return `${value.version}.0` === version - }) - .map(([name, value]) => { - return `./icons/${name}.svg` - }) + let newIcons = [] + Object.entries(icons).forEach(([type, icons]) => { + icons.forEach(icon => { + if (icon.version) { + if (`${icon.version}.0` === version) { + console.log(`Add icon "${type}/${icon.name}" vith version "${icon.version}" to new icons list`) + newIcons.push(icon.path) + } + } + }) + }) if (newIcons.length > 0) { generateIconsPreview(newIcons, path.join(GITHUB_DIR, `tabler-icons-${version}.svg`), { diff --git a/.build/changelog.mjs b/.build/changelog.mjs index b087d5f30..fd8880bee 100644 --- a/.build/changelog.mjs +++ b/.build/changelog.mjs @@ -6,19 +6,19 @@ const p = getPackageJson(), version = argv['latest-version'] || `${p.version}` if (version) { - cp.exec(`git diff ${version} HEAD --name-status src/_icons`, function(err, ret) { + cp.exec(`git diff ${version} HEAD --name-status ./icons`, function(err, ret) { let newIcons = [], modifiedIcons = [], renamedIcons = [] - ret.replace(/A\s+src\/_icons\/([a-z0-9-]+)\.svg/g, function(m, fileName) { + ret.replace(/A\s+icons\/([a-z0-9-]+)\.svg/g, function(m, fileName) { newIcons.push(fileName) }) - ret.replace(/M\s+src\/_icons\/([a-z0-9-]+)\.svg/g, function(m, fileName) { + ret.replace(/M\s+icons\/([a-z0-9-]+)\.svg/g, function(m, fileName) { modifiedIcons.push(fileName) }) - ret.replace(/R[0-9]+\s+src\/_icons\/([a-z0-9-]+)\.svg\s+src\/_icons\/([a-z0-9-]+).svg/g, function(m, fileNameBefore, fileNameAfter) { + ret.replace(/R[0-9]+\s+icons\/([a-z0-9-]+)\.svg\s+icons\/([a-z0-9-]+).svg/g, function(m, fileNameBefore, fileNameAfter) { renamedIcons.push([fileNameBefore, fileNameAfter]) }) diff --git a/.github/tabler-icons-2.47.0.svg b/.github/tabler-icons-2.47.0.svg index f697ce408..359e84217 100644 --- a/.github/tabler-icons-2.47.0.svg +++ b/.github/tabler-icons-2.47.0.svg @@ -1,58 +1,76 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/package.json b/package.json index b41ea298d..5b5d37b56 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "changelog-commit": "git add . && node ./.build/changelog-commit.mjs", "changelog-image": "node ./.build/changelog-image.mjs", "update": "pnpm run update:icons", - "update:icons": "node ./.build/update-icons.mjs", + "update:icons": "node ./.build/update-icons.mjs --new-version ${npm_config_new-version}", "optimize": "node ./.build/optimize.mjs", "import": "node ./.build/import.mjs && pnpm run optimize", "import-tags": "node ./.build/import-tags.mjs",