diff --git a/icons/mic-signal.json b/icons/mic-signal.json index 5ef7b1ebe..045a0fab5 100644 --- a/icons/mic-signal.json +++ b/icons/mic-signal.json @@ -39,8 +39,7 @@ { "name": "podcast", "deprecated": true, - "deprecationReason": "alias.name", - "toBeRemovedInVersion": "v1.0" + "deprecationReason": "alias.name" } ] } diff --git a/scripts/rename/renameIcon.function.mts b/scripts/rename/renameIcon.function.mts index 77b56ff13..07be27a6f 100644 --- a/scripts/rename/renameIcon.function.mts +++ b/scripts/rename/renameIcon.function.mts @@ -52,7 +52,6 @@ export async function renameIcon(ICONS_DIR: string, oldName: string, newName: st name: oldName, deprecated: true, deprecationReason: 'alias.name', - toBeRemovedInVersion: 'v1.0', }, ]; fs.writeFileSync(newJsonPath, JSON.stringify(jsonData, null, 2)); diff --git a/tools/build-icons/building/aliases/generateAliasesFiles.ts b/tools/build-icons/building/aliases/generateAliasesFiles.ts index d15c90da0..781754c94 100644 --- a/tools/build-icons/building/aliases/generateAliasesFiles.ts +++ b/tools/build-icons/building/aliases/generateAliasesFiles.ts @@ -110,7 +110,6 @@ export default async function generateAliasesFiles({ ? deprecationReasonTemplate(alias.deprecationReason, { componentName: toPascalCase(iconName), iconName, - toBeRemovedInVersion: alias.toBeRemovedInVersion, }) : ''; diff --git a/tools/build-icons/building/generateIconFiles.ts b/tools/build-icons/building/generateIconFiles.ts index f020f4ef3..37932c45a 100644 --- a/tools/build-icons/building/generateIconFiles.ts +++ b/tools/build-icons/building/generateIconFiles.ts @@ -48,16 +48,11 @@ function generateIconFiles({ ]); const getSvg = () => readSvg(`${iconName}.svg`, iconsDir); - const { - deprecated = false, - toBeRemovedInVersion = undefined, - aliases = [], - } = iconMetaData[iconName]; + const { deprecated = false, aliases = [] } = iconMetaData[iconName]; const deprecationReason = deprecated ? deprecationReasonTemplate(iconMetaData[iconName].deprecationReason ?? '', { componentName, iconName, - toBeRemovedInVersion, }) : ''; diff --git a/tools/build-icons/types.ts b/tools/build-icons/types.ts index 1806eb346..63682140d 100644 --- a/tools/build-icons/types.ts +++ b/tools/build-icons/types.ts @@ -32,13 +32,11 @@ export type AliasDeprecation = { name: string; deprecated: true; deprecationReason: AliasDeprecationReason; - toBeRemovedInVersion?: string; }; export type IconDeprecationReason = 'icon.renamed' | ''; export type IconMetadataBase = { - toBeRemovedInVersion?: string; categories: string[]; aliases?: AliasDeprecation[]; tags: string[]; diff --git a/tools/build-icons/utils/deprecationReasonTemplate.ts b/tools/build-icons/utils/deprecationReasonTemplate.ts index a8c2c8e4e..223bfe5e2 100644 --- a/tools/build-icons/utils/deprecationReasonTemplate.ts +++ b/tools/build-icons/utils/deprecationReasonTemplate.ts @@ -4,25 +4,20 @@ export default function deprecationReasonTemplate( deprecationReason: AliasDeprecationReason | IconDeprecationReason, { componentName, - toBeRemovedInVersion, }: { componentName: string; iconName: string; - toBeRemovedInVersion?: string; }, ) { const resourceName = deprecationReason.startsWith('icon') ? 'icon' : 'alias'; - const removalNotice = toBeRemovedInVersion - ? ` This ${resourceName} will be removed in ${toBeRemovedInVersion}` - : ''; switch (deprecationReason) { case 'alias.typo': - return `Renamed because of typo, use {@link ${componentName}} instead.${removalNotice}`; + return `Renamed because of typo, use {@link ${componentName}} instead.`; case 'alias.duplicate': - return `The icon was combined with another icon that shares the same use case, use {@link ${componentName}} instead.${removalNotice}`; + return `The icon was combined with another icon that shares the same use case, use {@link ${componentName}} instead.`; case 'alias.name': - return `The name of this icon was changed because it didn't meet our guidelines anymore, use {@link ${componentName}} instead.${removalNotice}`; + return `The name of this icon was changed because it didn't meet our guidelines anymore, use {@link ${componentName}} instead.`; default: throw new Error(`Unknown deprecation reason: ${deprecationReason}`); }