Merge pull request #618 from atls/fix/icons-generator

fix(icons): generator template

Author: Amiditin

.yarnrc.yml

@@ -1,66 +1,66 @@
 compressionLevel: mixed
 
-defaultSemverRangePrefix: ""
+defaultSemverRangePrefix: ''
 
 enableGlobalCache: true
 
 globalFolder: ../.yarn/berry
 
-npmRegistryServer: "https://registry.npmjs.org"
+npmRegistryServer: 'https://registry.npmjs.org'
 
 npmScopes:
   atls:
-    npmRegistryServer: "https://registry.npmjs.org"
+    npmRegistryServer: 'https://registry.npmjs.org'
 
 packageExtensions:
-  "@emotion/utils@*":
+  '@emotion/utils@*':
     dependencies:
-      "@emotion/sheet": "*"
-  "@storybook/addon-webpack5-compiler-swc@*":
+      '@emotion/sheet': '*'
+  '@storybook/addon-webpack5-compiler-swc@*':
     dependencies:
-      semver: "*"
-  "@storybook/builder-webpack5@*":
+      semver: '*'
+  '@storybook/builder-webpack5@*':
     dependencies:
       file-system-cache: 2.3.0
-  "@storybook/node-logger@*":
+  '@storybook/node-logger@*':
     dependencies:
-      storybook: "*"
-  "@storybook/preset-react-webpack@*":
+      storybook: '*'
+  '@storybook/preset-react-webpack@*':
     dependencies:
       file-system-cache: 2.3.0
-  "@storybook/react@*":
+  '@storybook/react@*':
     dependencies:
-      "@storybook/test": "*"
-  "@storybook/types@*":
+      '@storybook/test': '*'
+  '@storybook/types@*':
     dependencies:
-      "@types/react": "*"
-  "@svgr/babel-plugin-transform-svg-component@*":
+      '@types/react': '*'
+  '@svgr/babel-plugin-transform-svg-component@*':
     dependencies:
-      "@babel/template": "*"
-      "@types/babel__template": "*"
-  "@svgr/core@*":
+      '@babel/template': '*'
+      '@types/babel__template': '*'
+  '@svgr/core@*':
     dependencies:
-      "@svgr/plugin-jsx": "*"
-      "@svgr/plugin-prettier": "*"
-      "@svgr/plugin-svgo": "*"
-      "@types/babel__core": "*"
-      prettier: "*"
-      svgo: "*"
-  "@types/react@*":
+      '@svgr/plugin-jsx': '*'
+      '@svgr/plugin-prettier': '*'
+      '@svgr/plugin-svgo': '*'
+      '@types/babel__core': '*'
+      prettier: '*'
+      svgo: '*'
+  '@types/react@*':
     dependencies:
       scheduler: 0.20.2
   framer-motion@*:
     dependencies:
-      "@emotion/is-prop-valid": "*"
+      '@emotion/is-prop-valid': '*'
   graphql-request@*:
     dependencies:
-      type-fest: "*"
+      type-fest: '*'
   react-datepicker@*:
     dependencies:
-      "@types/react-onclickoutside": "*"
+      '@types/react-onclickoutside': '*'
   swiper@*:
     dependencies:
-      "@types/react": "*"
+      '@types/react': '*'
 
 pnpEnableEsmLoader: true
 

generators/icons/src/svgr-utils/compile-icons.util.ts

@@ -48,7 +48,7 @@ export const compileIcons = async (
           replaceAttrValues: { ...replacements[icon.name] },
         },
         { componentName: icon.name.replace('50+', 'FiftyPlus') }
-      ),
+      ).then((value) => value.replace('...props', '...otherProps')),
       withReplacement: Boolean(replacements[icon.name]),
     }))
   )

ui-admin/icons/src/icons/bag.icon.tsx

@@ -22,7 +22,7 @@ export const BagIcon = (props: IconProps): ReactNode => {
       viewBox='0 0 25 28'
       className={clsx(className, String(otherProps.className || ''))}
       style={iconStyle}
-      {...props}
+      {...otherProps}
     >
       <path
         fill='#fff'

ui-admin/icons/src/icons/chart.icon.tsx

@@ -22,7 +22,7 @@ export const ChartIcon = (props: IconProps): ReactNode => {
       viewBox='0 0 29 28'
       className={clsx(className, String(otherProps.className || ''))}
       style={iconStyle}
-      {...props}
+      {...otherProps}
     >
       <path
         fill='#23B899'

ui-admin/icons/src/icons/check.icon.tsx

@@ -21,7 +21,7 @@ export const CheckIcon = (props: IconProps): ReactNode => {
       width='1em'
       height='1em'
       style={iconStyle}
-      {...props}
+      {...otherProps}
     >
       <path d='M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8' />
     </svg>

ui-admin/icons/src/icons/close.icon.tsx

@@ -22,7 +22,7 @@ export const CloseIcon = (props: IconProps): ReactNode => {
       className={clsx(className, String(otherProps.className || ''))}
       viewBox='0 0 24 24'
       style={iconStyle}
-      {...props}
+      {...otherProps}
     >
       <path fill='none' d='M0 0h24v24H0z' />
       <path d='m12 10.586 4.95-4.95 1.414 1.414-4.95 4.95 4.95 4.95-1.414 1.414-4.95-4.95-4.95 4.95-1.414-1.414 4.95-4.95-4.95-4.95L7.05 5.636z' />

ui-admin/icons/src/icons/drag.icon.tsx

@@ -22,7 +22,7 @@ export const DragIcon = (props: IconProps): ReactNode => {
       viewBox='0 0 16 12'
       className={clsx(className, String(otherProps.className || ''))}
       style={iconStyle}
-      {...props}
+      {...otherProps}
     >
       <path
         fill='currentColor'

ui-admin/icons/src/icons/loading.icon.tsx

@@ -21,7 +21,7 @@ export const LoadingIcon = (props: IconProps): ReactNode => {
       height='1em'
       className={clsx(className, String(otherProps.className || ''))}
       style={iconStyle}
-      {...props}
+      {...otherProps}
     >
       <path d='M988 548c-19.9 0-36-16.1-36-36 0-59.4-11.6-117-34.6-171.3a440.5 440.5 0 0 0-94.3-139.9 437.7 437.7 0 0 0-139.9-94.3C629 83.6 571.4 72 512 72c-19.9 0-36-16.1-36-36s16.1-36 36-36c69.1 0 136.2 13.5 199.3 40.3C772.3 66 827 103 874 150s83.9 101.8 109.7 162.7c26.7 63.1 40.2 130.2 40.2 199.3.1 19.9-16 36-35.9 36' />
     </svg>

ui-admin/icons/src/icons/logo.icon.tsx

@@ -22,7 +22,7 @@ export const LogoIcon = (props: IconProps): ReactNode => {
       viewBox='0 0 48 54'
       className={clsx(className, String(otherProps.className || ''))}
       style={iconStyle}
-      {...props}
+      {...otherProps}
     >
       <path
         fill='#387DFF'

ui-admin/icons/src/icons/pencil.icon.tsx

@@ -22,7 +22,7 @@ export const PencilIcon = (props: IconProps): ReactNode => {
       className={clsx(className, String(otherProps.className || ''))}
       viewBox='0 0 24 24'
       style={iconStyle}
-      {...props}
+      {...otherProps}
     >
       <path
         fill='none'