[EuiIcon] Upgrade svgr/svgo dependencies to latest
#6843
There are no files selected for viewing
This file contains 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
This file contains 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,10 +1,9 @@ | ||
| const glob = require('glob'); | ||
| const svgr = require('@svgr/core').transform; | ||
|
There was a problem hiding this comment. |
||
| const path = require('path'); | ||
| const fs = require('fs'); | ||
| const license = | ||
| require('../.eslintrc.js').rules['local/require-license-header'][1].license; | ||
|
Comment on lines
+5
to
+6
There was a problem hiding this comment. This was Prettier autolinting this file on save |
||
|
|
||
| const rootDir = path.resolve(__dirname, '..'); | ||
| const srcDir = path.resolve(rootDir, 'src'); | ||
|
|
@@ -37,10 +36,15 @@ iconFiles.forEach((filePath) => { | |
| plugins: ['@svgr/plugin-svgo', '@svgr/plugin-jsx'], | ||
| svgoConfig: { | ||
| plugins: [ | ||
| { | ||
| name: 'preset-default', | ||
| params: { | ||
| overrides: { | ||
| removeViewBox: false, | ||
| removeUselessStrokeAndFill: false, | ||
| }, | ||
| }, | ||
| }, | ||
|
Comment on lines
37
to
+47
There was a problem hiding this comment. see https://github.com/svg/svgo/releases/tag/v2.0.0 config changes. Also see SVGO's default preset docs and their plugins table - |
||
| ], | ||
| }, | ||
| svgProps: { | ||
|
|
@@ -49,12 +53,11 @@ iconFiles.forEach((filePath) => { | |
| titleProp: true, | ||
| typescript: true, | ||
| template: ( | ||
| { imports, interfaces, componentName, props, jsx }, | ||
| { tpl } | ||
| ) => | ||
| hasIds | ||
| ? tpl` | ||
|
Comment on lines
55
to
+60
There was a problem hiding this comment. |
||
| ${imports} | ||
| import { htmlIdGenerator } from '../../../services'; | ||
| ${interfaces} | ||
|
|
@@ -66,7 +69,7 @@ const ${componentName} = (${props}) => { | |
| }; | ||
| export const icon = ${componentName}; | ||
| ` | ||
| : tpl` | ||
| ${imports} | ||
| ${interfaces} | ||
| const ${componentName} = (${props}) => ${jsx} | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -9,16 +9,16 @@ | |
| // THIS IS A GENERATED FILE. DO NOT MODIFY MANUALLY. @see scripts/compile-icons.js | ||
|
|
||
| import * as React from 'react'; | ||
| import type { SVGProps } from 'react'; | ||
| interface SVGRProps { | ||
| title?: string; | ||
| titleId?: string; | ||
| } | ||
|
There was a problem hiding this comment. Adding this note for my own edification - the newline removal actually doesn't have anything to do with this upgrade/PR or with the recent Node v18 upgrade. It occurred due to our recent babel upgrades, and is a known issue: gregberge/svgr#809 Since this doesn't affect any actual consumer or user experience due to it being generated code, I think we can safely ignore it for now. |
||
| const EuiIconAccessibility = ({ | ||
| title, | ||
| titleId, | ||
| ...props | ||
| }: SVGProps<SVGSVGElement> & SVGRProps) => ( | ||
| <svg | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| width={16} | ||
|
|
@@ -28,8 +28,7 @@ const EuiIconAccessibility = ({ | |
| {...props} | ||
| > | ||
| {title ? <title id={titleId}>{title}</title> : null} | ||
| <path d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Zm0 1a7 7 0 1 0 0 14A7 7 0 0 0 8 1Zm3.974 4.342a.5.5 0 0 1-.233.596l-.083.036L9 6.86v2.559l.974 2.923a.5.5 0 0 1-.233.596l-.083.036a.5.5 0 0 1-.596-.233l-.036-.083-1-3L8 9.5l-.026.158-1 3a.5.5 0 0 1-.97-.228l.022-.088L7 9.416V6.86l-2.658-.886a.5.5 0 0 1 .228-.97l.088.022L7.583 6h.833l2.926-.974a.5.5 0 0 1 .632.316ZM8 3a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z" /> | ||
| </svg> | ||
| ); | ||
| export const icon = EuiIconAccessibility; | ||
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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.
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.
The
@svgr/plugin-jsxdependency needs to be manually listed now as it's no longer bundled in@svgr/coreas of https://github.com/gregberge/svgr/releases/tag/v7.0.0