fix(webpack): fix double export (#648)

gregberge · web-flow · commit 7595d378b73d · 2021-12-04T21:59:20.000+01:00
Closes #645
diff --git a/packages/core/src/__snapshots__/transform.test.ts.snap b/packages/core/src/__snapshots__/transform.test.ts.snap
@@ -205,7 +205,8 @@ const SvgComponent = (props) => (
   </svg>
 )
 
-export default SvgComponent
+export { SvgComponent as Component }
+export default 'logo.svg'
 "
 `;
 
diff --git a/packages/core/src/transform.test.ts b/packages/core/src/transform.test.ts
@@ -325,8 +325,8 @@ describe('convert', () => {
       { exportType: 'named' },
     ]
 
-    test.each(configs)('accepts options %j', async (config) => {
-      const result = await convertWithAllPlugins(svgBaseCode, config)
+    test.each(configs)('accepts options %j', async ({ state, ...config }) => {
+      const result = await convertWithAllPlugins(svgBaseCode, config, state)
       expect(result).toMatchSnapshot()
     })
 
diff --git a/packages/webpack/src/__snapshots__/index.test.ts.snap b/packages/webpack/src/__snapshots__/index.test.ts.snap
@@ -22,8 +22,7 @@ var SvgIcon = function SvgIcon() {
 };
 
 export { SvgIcon as ReactComponent };
-export default \\"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iODhweCIgaGVpZ2h0PSI4OHB4IiB2aWV3Qm94PSIwIDAgODggODgiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDQ2LjIgKDQ0NDk2KSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5EaXNtaXNzPC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IkJsb2NrcyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWxpbmVjYXA9InNxdWFyZSI+CiAgICAgICAgPGcgaWQ9IkRpc21pc3MiIHN0cm9rZT0iIzA2Mzg1NSIgc3Ryb2tlLXdpZHRoPSIyIj4KICAgICAgICAgICAgPHBhdGggZD0iTTUxLDM3IEwzNyw1MSIgaWQ9IlNoYXBlIj48L3BhdGg+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik01MSw1MSBMMzcsMzciIGlkPSJTaGFwZSI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+Cg==\\";
-export default \\"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iODhweCIgaGVpZ2h0PSI4OHB4IiB2aWV3Qm94PSIwIDAgODggODgiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDQ2LjIgKDQ0NDk2KSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5EaXNtaXNzPC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IkJsb2NrcyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWxpbmVjYXA9InNxdWFyZSI+CiAgICAgICAgPGcgaWQ9IkRpc21pc3MiIHN0cm9rZT0iIzA2Mzg1NSIgc3Ryb2tlLXdpZHRoPSIyIj4KICAgICAgICAgICAgPHBhdGggZD0iTTUxLDM3IEwzNyw1MSIgaWQ9IlNoYXBlIj48L3BhdGg+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik01MSw1MSBMMzcsMzciIGlkPSJTaGFwZSI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+Cg==\\""
+export default \\"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iODhweCIgaGVpZ2h0PSI4OHB4IiB2aWV3Qm94PSIwIDAgODggODgiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8IS0tIEdlbmVyYXRvcjogU2tldGNoIDQ2LjIgKDQ0NDk2KSAtIGh0dHA6Ly93d3cuYm9oZW1pYW5jb2RpbmcuY29tL3NrZXRjaCAtLT4KICAgIDx0aXRsZT5EaXNtaXNzPC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IkJsb2NrcyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWxpbmVjYXA9InNxdWFyZSI+CiAgICAgICAgPGcgaWQ9IkRpc21pc3MiIHN0cm9rZT0iIzA2Mzg1NSIgc3Ryb2tlLXdpZHRoPSIyIj4KICAgICAgICAgICAgPHBhdGggZD0iTTUxLDM3IEwzNyw1MSIgaWQ9IlNoYXBlIj48L3BhdGg+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik01MSw1MSBMMzcsMzciIGlkPSJTaGFwZSI+PC9wYXRoPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+Cg==\\";"
 `;
 
 exports[`webpack loader transforms file (babel: false) 1`] = `
diff --git a/packages/webpack/src/index.ts b/packages/webpack/src/index.ts
@@ -92,7 +92,7 @@ function svgrLoader(
           callback(err)
           return
         }
-        callback(null, `${content}\n${previousExport}`)
+        callback(null, content)
       })
     })
   }

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,8 @@ const SvgComponent = (props) => (`
`205`	`205`	`</svg>`
`206`	`206`	`)`
`207`	`207`
`208`		`-export default SvgComponent`
	`208`	`+export { SvgComponent as Component }`
	`209`	`+export default 'logo.svg'`
`209`	`210`	`"`
`210`	`211`	`;
`211`	`212`
Original file line number	Diff line number	Diff line change
`@@ -325,8 +325,8 @@ describe('convert', () => {`
`325`	`325`	`{ exportType: 'named' },`
`326`	`326`	`]`
`327`	`327`
`328`		`- test.each(configs)('accepts options %j', async (config) => {`
`329`		`- const result = await convertWithAllPlugins(svgBaseCode, config)`
	`328`	`+ test.each(configs)('accepts options %j', async ({ state, ...config }) => {`
	`329`	`+ const result = await convertWithAllPlugins(svgBaseCode, config, state)`
`330`	`330`	`expect(result).toMatchSnapshot()`
`331`	`331`	`})`
`332`	`332`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ function svgrLoader(`
`92`	`92`	`callback(err)`
`93`	`93`	`return`
`94`	`94`	`}`
`95`		- callback(null, `${content}\n${previousExport}`)
	`95`	`+ callback(null, content)`
`96`	`96`	`})`
`97`	`97`	`})`
`98`	`98`	`}`