Cherrypick #76 into 4.x

pom.xml

@@ -9,7 +9,7 @@
     <description>Iconset based on FontAwesome</description>
 
     <properties>
-        <vaadin.version>23.1.10</vaadin.version>
+        <vaadin.version>23.3.11</vaadin.version>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <jetty.version>9.4.36.v20210114</jetty.version>
@@ -30,7 +30,7 @@
         <codegen.skipDownload>false</codegen.skipDownload>
         <codegen.embedded>false</codegen.embedded>
         <npm.package>@flowingcode/font-awesome-iron-iconset</npm.package>
-        <npm.version>4.2.0</npm.version>
+        <npm.version>4.2.1</npm.version>
     </properties>
 
 	<scm>

src/codegen/aliases.xslt

@@ -13,15 +13,15 @@
 
 		<xsl:variable name="result"> 
 			<xsl:for-each select="fn:distinct-values($filtered//fn:array[@key='styles']/*)">
-				<xsl:variable name="brand">
+				<xsl:variable name="family">
 					<xsl:value-of select="."/>
 				</xsl:variable>
 				<xsl:element name="style">
 					<xsl:attribute name="name">
-						<xsl:value-of select="$brand"/>
+						<xsl:value-of select="$family"/>
 					</xsl:attribute>
 					<xsl:element name="map" namespace="http://www.w3.org/2005/xpath-functions">
-						<xsl:for-each select="$filtered/fn:map/fn:map[fn:array[@key='styles']/fn:string/text()=$brand]">
+						<xsl:for-each select="$filtered/fn:map/fn:map[fn:array[@key='styles']/fn:string/text()=$family]">
 							<xsl:variable name="key">
 								<xsl:value-of select="@key"/>
 							</xsl:variable>
@@ -34,6 +34,9 @@
 								</xsl:element>					
 							</xsl:for-each>
 						</xsl:for-each>
+						<xsl:if test="$family='brands'">
+							<xsl:call-template name="vaadin-icon"/>
+						</xsl:if>
 					</xsl:element>
 				</xsl:element>
 			</xsl:for-each>
@@ -44,6 +47,15 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template name="vaadin-icon">
+		<xsl:element name="string" namespace="http://www.w3.org/2005/xpath-functions">
+			<xsl:attribute name="key">
+				<xsl:text>vaadin</xsl:text>
+			</xsl:attribute>
+			<xsl:text>vaadin-icon</xsl:text>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="/fn:map/fn:map" priority="0"/>
 	<xsl:template match="/fn:map/fn:map[fn:map[@key='aliases']/*]">
 		<xsl:copy>

src/codegen/sprites.xslt

@@ -48,14 +48,20 @@
 
   <xsl:template match="/svg:svg/svg:symbol">
   	<xsl:element name="g">
-  		<xsl:copy-of select="@id"/>
+  		<xsl:apply-templates select="@id"/>
   		<xsl:element name="svg">
   			<xsl:copy-of select="@viewBox"/>
 	  		<xsl:apply-templates/>
   		</xsl:element>
   	</xsl:element>
   </xsl:template>
 
+  <xsl:template match="//svg:symbol[@id='vaadin']/@id">
+  	<xsl:attribute name="id">
+  	  <xsl:text>vaadin-icon</xsl:text>
+  	</xsl:attribute>
+  </xsl:template>
+
   <xsl:template match="@*|node()">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>

src/main/generated/com/flowingcode/vaadin/addons/fontawesome/FontAwesome.java

@@ -1118,7 +1118,7 @@ public Icon create(ComponentEventListener<ClickEvent<com.vaadin.flow.component.i
          * Server side component for {@code Regular}
          */
         @JsModule("./font-awesome-iron-iconset/far.js")
-        @NpmPackage(value = "@flowingcode/font-awesome-iron-iconset", version = "4.2.0")
+        @NpmPackage(value = "@flowingcode/font-awesome-iron-iconset", version = "4.2.1")
         @SuppressWarnings("serial")
         public static final class Icon extends com.vaadin.flow.component.icon.Icon implements ClickNotifier<com.vaadin.flow.component.icon.Icon> {
 
@@ -8987,7 +8987,7 @@ public Icon create(ComponentEventListener<ClickEvent<com.vaadin.flow.component.i
          * Server side component for {@code Solid}
          */
         @JsModule("./font-awesome-iron-iconset/fas.js")
-        @NpmPackage(value = "@flowingcode/font-awesome-iron-iconset", version = "4.2.0")
+        @NpmPackage(value = "@flowingcode/font-awesome-iron-iconset", version = "4.2.1")
         @SuppressWarnings("serial")
         public static final class Icon extends com.vaadin.flow.component.icon.Icon implements ClickNotifier<com.vaadin.flow.component.icon.Icon> {
 
@@ -10815,6 +10815,10 @@ public enum Brands implements IconFactory {
          * The brands vaadin icon.See <a href='https://fontawesome.com/v6/icons/vaadin?s=brands'>example</a>
          */
         VAADIN,
+        /**
+         * The brands vaadin-icon icon.See <a href='https://fontawesome.com/v6/icons/vaadin-icon?s=brands'>example</a>
+         */
+        VAADIN_ICON,
         /**
          * The brands viacoin icon.See <a href='https://fontawesome.com/v6/icons/viacoin?s=brands'>example</a>
          */
@@ -11044,7 +11048,7 @@ public Icon create(ComponentEventListener<ClickEvent<com.vaadin.flow.component.i
          * Server side component for {@code Brands}
          */
         @JsModule("./font-awesome-iron-iconset/fab.js")
-        @NpmPackage(value = "@flowingcode/font-awesome-iron-iconset", version = "4.2.0")
+        @NpmPackage(value = "@flowingcode/font-awesome-iron-iconset", version = "4.2.1")
         @SuppressWarnings("serial")
         public static final class Icon extends com.vaadin.flow.component.icon.Icon implements ClickNotifier<com.vaadin.flow.component.icon.Icon> {
 

src/main/javascript/font-awesome-iron-iconset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowingcode/font-awesome-iron-iconset",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Vaadin iconset based on FontAwesome",
   "main": "index.js",
   "repository": {