chore: move version checks to constants

Author: charles4221

src/components/__tests__/FontAwesomeIcon.test.tsx

@@ -8,7 +8,7 @@ import semver from 'semver'
 import {
   ICON_PACKS_STARTING_VERSION,
   SVG_CORE_VERSION,
-} from '../../utils/get-class-list-from-props'
+} from '../../utils/constants'
 import {
   coreHasFeature,
   REFERENCE_ICON_USING_STRING,

src/utils/__tests__/get-class-list-from-props.test.ts

@@ -6,11 +6,8 @@ import {
 import semver from 'semver'
 
 import { FontAwesomeIconProps } from '../../types/icon-props'
-import {
-  getClassListFromProps,
-  ICON_PACKS_STARTING_VERSION,
-  SVG_CORE_VERSION,
-} from '../get-class-list-from-props'
+import { ICON_PACKS_STARTING_VERSION, SVG_CORE_VERSION } from '../constants'
+import { getClassListFromProps } from '../get-class-list-from-props'
 
 describe('get class list', () => {
   const props = {

src/utils/constants.ts

@@ -3,6 +3,20 @@ import {
   RotateProp,
   SizeProp,
 } from '@fortawesome/fontawesome-svg-core'
+import { version as SVGCorePackageVersion } from '@fortawesome/fontawesome-svg-core/package.json'
+import semver from 'semver'
+
+export const ICON_PACKS_STARTING_VERSION = '7.0.0-alpha1'
+
+// Try to get version from installed package first, fallback to env var, then default
+export const SVG_CORE_VERSION =
+  SVGCorePackageVersion || process.env.FA_VERSION || '7.0.0-alpha8'
+
+// Cache the version check result since it never changes during runtime
+export const IS_VERSION_7_OR_LATER = semver.gte(
+  SVG_CORE_VERSION,
+  ICON_PACKS_STARTING_VERSION,
+)
 
 export const ANIMATION_CLASSES = {
   beat: 'fa-beat',

src/utils/get-class-list-from-props.ts

@@ -1,27 +1,13 @@
-import { version as SVGCorePackageVersion } from '@fortawesome/fontawesome-svg-core/package.json'
-import semver from 'semver'
-
 import {
   ANIMATION_CLASSES,
+  IS_VERSION_7_OR_LATER,
   PULL_CLASSES,
   ROTATE_CLASSES,
   SIZE_CLASSES,
   STYLE_CLASSES,
 } from './constants'
 import { FontAwesomeIconProps } from '../types/icon-props'
 
-export const ICON_PACKS_STARTING_VERSION = '7.0.0-alpha1'
-
-// Try to get version from installed package first, fallback to env var, then default
-export const SVG_CORE_VERSION =
-  SVGCorePackageVersion || process.env.FA_VERSION || '7.0.0-alpha8'
-
-// Cache the version check result since it never changes during runtime
-const IS_VERSION_7_OR_LATER = semver.gte(
-  SVG_CORE_VERSION,
-  ICON_PACKS_STARTING_VERSION,
-)
-
 /**
  * Get CSS class list from a props object.
  * This function maps our React props to the corresponding CSS class names from Font Awesome.

src/utils/normalize-icon-args.ts

@@ -23,38 +23,9 @@ export function normalizeIconArgs(
     return undefined
   }
 
-  switch (true) {
-    // If we already have an `IconDefinition` object, which means it was probably
-    // imported directly from an icon svg package, return it immediately since
-    // it already has everything that it needs to be rendered
-    case isIconDefinition(icon): {
-      return icon
-    }
-    // If the `parse.icon` function is available from svg-core, use it to parse the icon.
-    // This should be the final case since the function is available since around 2020.
-    // Any cases after this are fallbacks for people using old versions of svg-core.
-    case !!faParse.icon: {
-      return faParse.icon(icon)
-    }
-    // If we have an icon name and a prefix, return it as an `IconLookup` object
-    case typeof icon === 'object' &&
-      'prefix' in icon &&
-      'iconName' in icon &&
-      !!icon.prefix &&
-      !!icon.iconName: {
-      return icon
-    }
-    // If it's an array with length of two, use the first item as prefix, second as icon name
-    case Array.isArray(icon) && icon.length === 2: {
-      return { prefix: icon[0], iconName: icon[1] }
-    }
-    // If the icon is a string, we assume it's an icon name and return it as an `IconLookup`
-    case typeof icon === 'string': {
-      return { prefix: 'fas', iconName: icon }
-    }
-    // If none of the above cases match, we return undefined
-    default: {
-      return undefined
-    }
+  if (isIconDefinition(icon)) {
+    return icon
   }
+
+  return faParse.icon(icon)
 }