feat: remove "svgAttributes" option

BREAKING CHANGE: `svgAttributes` has been removed, please use `svgProps` instead.

Closes #173

README.md

@@ -109,7 +109,6 @@ Options:
   --ref                              forward ref to SVG root element
   --no-dimensions                    remove width and height from root SVG tag
   --no-expand-props                  disable props expanding
-  --svg-attributes <property=value>  add attributes to the svg element (deprecated)
   --svg-props <property=value>       add props to the svg element
   --replace-attr-values <old=new>    replace an attribute value
   --template <file>                  specify a custom template to use

packages/cli/README.md

@@ -28,7 +28,6 @@ Options:
   --ref                              forward ref to SVG root element
   --no-dimensions                    remove width and height from root SVG tag
   --no-expand-props                  disable props expanding
-  --svg-attributes <property=value>  add attributes to the svg element (deprecated)
   --svg-props <property=value>       add props to the svg element
   --replace-attr-values <old=new>    replace an attribute value
   --template <file>                  specify a custom template to use

packages/cli/src/__snapshots__/index.test.js.snap

@@ -313,20 +313,6 @@ export default SvgFile
 "
 `;
 
-exports[`cli should support various args: --svg-attributes "focusable=false" 1`] = `
-"import React from 'react'
-
-const SvgFile = props => (
-  <svg focusable=\\"false\\" width={48} height={1} {...props}>
-    <path d=\\"M0 0h48v1H0z\\" fill=\\"#063855\\" fillRule=\\"evenodd\\" />
-  </svg>
-)
-
-export default SvgFile
-
-"
-`;
-
 exports[`cli should support various args: --svg-props "hidden={true}" 1`] = `
 "import React from 'react'
 

packages/cli/src/index.js

@@ -54,11 +54,6 @@ program
   .option('--ref', 'forward ref to SVG root element')
   .option('--no-dimensions', 'remove width and height from root SVG tag')
   .option('--no-expand-props', 'disable props expanding')
-  .option(
-    '--svg-attributes <property=value>',
-    'add attributes to the svg element (deprecated)',
-    parseObject,
-  )
   .option(
     '--svg-props <property=value>',
     'add props to the svg element',
@@ -146,15 +141,6 @@ async function run() {
     }
   }
 
-  // TODO remove in v3
-  if (program.outDir && program.svgAttributes) {
-    console.log(
-      chalk.yellow(
-        '--svg-attributes option is deprecated an will be removed in v3, please use --svg-props instead',
-      ),
-    )
-  }
-
   const command = program.outDir ? dirCommand : fileCommand
   await command(program, filenames, config)
 }

packages/cli/src/index.test.js

@@ -126,7 +126,6 @@ describe('cli', () => {
     ['--native --ref'],
     ['--ref'],
     ['--replace-attr-values "#063855=currentColor"'],
-    ['--svg-attributes "focusable=false"'],
     [`--svg-props "hidden={true}"`],
     ['--no-svgo'],
     ['--no-prettier'],

packages/core/src/__snapshots__/convert.test.js.snap

@@ -227,27 +227,6 @@ export default SvgComponent
 "
 `;
 
-exports[`convert config should support options { svgAttributes: { focusable: false } } 1`] = `
-"import React from 'react'
-
-const SvgComponent = props => (
-  <svg focusable=\\"false\\" width={88} height={88} {...props}>
-    <g
-      stroke=\\"#063855\\"
-      strokeWidth={2}
-      fill=\\"none\\"
-      fillRule=\\"evenodd\\"
-      strokeLinecap=\\"square\\"
-    >
-      <path d=\\"M51 37L37 51M51 51L37 37\\" />
-    </g>
-  </svg>
-)
-
-export default SvgComponent
-"
-`;
-
 exports[`convert config should support options { svgo: false } 1`] = `
 "import React from 'react'
 
@@ -310,19 +289,6 @@ export default SvgComponent
 "
 `;
 
-exports[`convert config svgAttribute 1`] = `
-"import React from 'react'
-
-const SvgComponent = props => (
-  <svg {...props}>
-    <path d=\\"M0 0h24v24H0z\\" fill=\\"none\\" />
-  </svg>
-)
-
-export default SvgComponent
-"
-`;
-
 exports[`convert config titleProp 1`] = `
 "import React from 'react'
 

packages/core/src/config.js

@@ -10,7 +10,6 @@ export const DEFAULT_CONFIG = {
   prettierConfig: null,
   ref: false,
   replaceAttrValues: null,
-  svgAttributes: null,
   svgProps: null,
   svgo: true,
   svgoConfig: null,

packages/core/src/config.test.js

@@ -49,7 +49,6 @@ Object {
   "ref": false,
   "replaceAttrValues": null,
   "runtimeConfig": true,
-  "svgAttributes": null,
   "svgProps": null,
   "svgo": true,
   "svgoConfig": null,
@@ -82,7 +81,6 @@ Object {
     ],
   ],
   "runtimeConfig": true,
-  "svgAttributes": null,
   "svgProps": null,
   "svgo": true,
   "svgoConfig": null,
@@ -115,7 +113,6 @@ Object {
     ],
   ],
   "runtimeConfig": true,
-  "svgAttributes": null,
   "svgProps": null,
   "svgo": true,
   "svgoConfig": null,
@@ -149,7 +146,6 @@ Object {
     ],
   ],
   "runtimeConfig": true,
-  "svgAttributes": null,
   "svgProps": null,
   "svgo": true,
   "svgoConfig": null,

packages/core/src/convert.test.js

@@ -220,7 +220,6 @@ describe('convert', () => {
       [{ native: true, ref: true }],
       [{ ref: true }],
       [{ replaceAttrValues: { none: 'black' } }],
-      [{ svgAttributes: { focusable: false } }],
       [{ svgo: false }],
       [{ prettier: false }],
       [{ template: () => 'nothing' }],
@@ -232,14 +231,6 @@ describe('convert', () => {
       expect(result).toMatchSnapshot()
     })
 
-    it('svgAttribute', async () => {
-      const svg = `<svg><path d="M0 0h24v24H0z" fill="none" /></svg>`
-
-      expect(
-        await convert(svg, { svgAttribute: { focusable: false } }),
-      ).toMatchSnapshot()
-    })
-
     it('titleProp', async () => {
       const svg = `
       <svg width="0" height="0" style="position:absolute">

packages/core/src/index.js

@@ -10,7 +10,6 @@ export { default as removeComments } from './h2x/removeComments'
 export { default as removeDimensions } from './h2x/removeDimensions'
 export { default as replaceAttrValues } from './h2x/replaceAttrValues'
 export { default as stripAttribute } from './h2x/stripAttribute'
-export { default as svgAttributes } from './h2x/svgAttributes'
 export { default as svgProps } from './h2x/svgProps'
 export { default as svgRef } from './h2x/svgRef'
 export { default as titleProp } from './h2x/titleProp'

packages/core/src/plugins/h2x.js

@@ -7,7 +7,6 @@ import {
   removeDimensions,
   replaceAttrValues,
   stripAttribute,
-  svgAttributes,
   svgProps,
   svgRef,
   titleProp,
@@ -21,7 +20,6 @@ function configToPlugins(config) {
   if (!config.dimensions) plugins.push(removeDimensions())
   if (config.icon) plugins.push(emSize())
   if (config.ref) plugins.push(svgRef())
-  if (config.svgAttributes) plugins.push(svgAttributes(config.svgAttributes))
   if (config.svgProps) plugins.push(svgProps(config.svgProps))
   // TODO remove boolean value in the next major release
   if (config.expandProps)