Chore: Move old icons into legacy folder, make new folder for custom. #20990
+88
−58
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* eslint-disable local-rules/enforce-umbraco-external-imports */ | ||
| import { readFileSync, writeFile, mkdir, rmSync } from 'fs'; | ||
| import * as pathModule from 'path'; | ||
| import * as globModule from 'tiny-glob'; | ||
|
|
@@ -15,6 +15,7 @@ | |
|
|
||
| const lucideSvgDirectory = 'node_modules/lucide-static/icons'; | ||
| const simpleIconsSvgDirectory = 'node_modules/simple-icons/icons'; | ||
| const customSvgDirectory = `${moduleDirectory}/svgs/custom`; | ||
|
|
||
| const IS_GITHUB_ACTIONS = process.env.GITHUB_ACTIONS === 'true'; | ||
|
|
||
|
|
@@ -124,11 +125,39 @@ | |
| } | ||
| }); | ||
|
|
||
| // Custom: | ||
| if (fileJSON['custom']) { | ||
| fileJSON['custom'].forEach((iconDef) => { | ||
| if (iconDef.file && iconDef.name) { | ||
| const path = customSvgDirectory + '/' + iconDef.file; | ||
|
|
||
| try { | ||
| const rawData = readFileSync(path); | ||
| const svg = rawData.toString(); | ||
| const iconFileName = iconDef.name; | ||
|
|
||
| const icon = { | ||
| name: iconDef.name, | ||
| legacy: iconDef.legacy, | ||
| fileName: iconFileName, | ||
| svg, | ||
| output: `${iconsOutputDirectory}/${iconFileName}.ts`, | ||
| }; | ||
|
|
||
| icons.push(icon); | ||
| } catch { | ||
| errors.push(`[Custom] Could not load file: '${path}'`); | ||
| console.log(`[Custom] Could not load file: '${path}'`); | ||
|
Comment on lines
+148
to
+150
There was a problem hiding this comment. The catch block silently swallows errors without logging the actual error details. Consider capturing and logging the error parameter (e.g., |
||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
|
Check warning on line 155 in src/Umbraco.Web.UI.Client/devops/icons/index.js
|
||
| return icons; | ||
| }; | ||
|
|
||
| const collectDiskIcons = async (icons) => { | ||
| const iconPaths = await glob(`${umbracoSvgDirectory}/legacy/icon-*.svg`); | ||
|
|
||
| iconPaths.forEach((path) => { | ||
| const rawData = readFileSync(path); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use path joining utility instead of string concatenation. Consider using Node.js
path.join()for more robust cross-platform path handling.