Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to import * as React from 'react' #401

Merged
merged 1 commit into from
Feb 23, 2020
Merged

Migrate to import * as React from 'react' #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ npx @svgr/cli --icon --replace-attr-values "#063855=currentColor" icon.svg
**Output**

```js
import React from 'react'
import * as React from 'react'

const SvgComponent = props => (
<svg width="1em" height="1em" viewBox="0 0 48 1" {...props}>
Expand Down
2 changes: 1 addition & 1 deletion __fixtures__/template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = () => (code, state) => `
import React from 'react'
import * as React from 'react'

export default function ${state.componentName}() {
return ${code}
Expand Down
16 changes: 8 additions & 8 deletions packages/babel-plugin-transform-svg-component/src/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('plugin', () => {
state: { componentName: 'SvgComponent' },
})
expect(code).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent() {
return <svg><div /></svg>;
Expand All @@ -32,7 +32,7 @@ describe('plugin', () => {
native: true,
})
expect(code).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";
import Svg from \\"react-native-svg\\";

function SvgComponent() {
Expand All @@ -49,7 +49,7 @@ describe('plugin', () => {
native: { expo: true },
})
expect(code).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";
import \\"expo\\";

function SvgComponent() {
Expand All @@ -66,14 +66,14 @@ describe('plugin', () => {
{ template },
opts,
{ jsx },
) => template.ast`import React from 'react';
) => template.ast`import * as React from 'react';
const MyComponent = () => ${jsx}
export default MyComponent
`,
state: { componentName: 'SvgComponent' },
})
expect(code).toMatchInlineSnapshot(`
"import React from 'react';
"import * as React from 'react';

const MyComponent = () => <svg><div /></svg>;

Expand Down Expand Up @@ -116,7 +116,7 @@ describe('plugin', () => {
ref: true,
})
expect(code).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent({
svgRef
Expand All @@ -135,7 +135,7 @@ describe('plugin', () => {
memo: true,
})
expect(code).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent() {
return <svg><div /></svg>;
Expand All @@ -153,7 +153,7 @@ describe('plugin', () => {
ref: true,
})
expect(code).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent({
svgRef
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-svg-component/src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const getProps = ({ types: t }, opts) => {
export const getImport = ({ types: t }, opts) => {
const importDeclarations = [
t.importDeclaration(
[t.importDefaultSpecifier(t.identifier('React'))],
[t.importNamespaceSpecifier(t.identifier('React'))],
t.stringLiteral('react'),
),
]
Expand Down
14 changes: 7 additions & 7 deletions packages/babel-preset/src/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('preset', () => {
},
}),
).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent() {
return <svg foo=\\"bar\\" x={y} />;
Expand All @@ -43,7 +43,7 @@ describe('preset', () => {
},
}),
).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";
import { Svg } from \\"expo\\";

function SvgComponent() {
Expand All @@ -63,7 +63,7 @@ describe('preset', () => {
},
}),
).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent({
title,
Expand All @@ -85,7 +85,7 @@ describe('preset', () => {
},
}),
).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent({
title,
Expand All @@ -105,7 +105,7 @@ describe('preset', () => {
},
}),
).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent({
title,
Expand All @@ -130,7 +130,7 @@ describe('preset', () => {
},
}),
).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent() {
return <svg a=\\"black\\" b={props.white} />;
Expand All @@ -151,7 +151,7 @@ describe('preset', () => {
},
}),
).toMatchInlineSnapshot(`
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgComponent(props) {
return <svg a=\\"#000\\" b=\\"#fff\\" width=\\"1em\\" height=\\"1em\\" {...props} />;
Expand Down
44 changes: 22 additions & 22 deletions packages/cli/src/__snapshots__/index.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export { default as File } from './File'"
`;

exports[`cli should not override config with cli defaults 1`] = `
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgFile() {
return <svg viewBox=\\"0 0 48 1\\"><title>{\\"Rectangle 5\\"}</title><desc>{\\"Created with Sketch.\\"}</desc><defs /><g id=\\"Page-1\\" stroke=\\"none\\" strokeWidth={1} fill=\\"none\\" fillRule=\\"evenodd\\"><g id=\\"19-Separator\\" transform=\\"translate(-129.000000, -156.000000)\\" fill=\\"#063855\\"><g id=\\"Controls/Settings\\" transform=\\"translate(80.000000, 0.000000)\\"><g id=\\"Content\\" transform=\\"translate(0.000000, 64.000000)\\"><g id=\\"Group\\" transform=\\"translate(24.000000, 56.000000)\\"><g id=\\"Group-2\\"><rect id=\\"Rectangle-5\\" x={25} y={36} width={48} height={1} /></g></g></g></g></g></g></svg>;
Expand All @@ -19,7 +19,7 @@ export default SvgFile;
exports[`cli should support --index-template in cli 1`] = `"export { File } from './File'"`;

exports[`cli should support --prettier-config as file 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -35,7 +35,7 @@ export default SvgFile
`;

exports[`cli should support --prettier-config as json 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -51,7 +51,7 @@ export default SvgFile
`;

exports[`cli should support --svgo-config as file 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -68,7 +68,7 @@ export default SvgFile
`;

exports[`cli should support --svgo-config as json 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand Down Expand Up @@ -134,7 +134,7 @@ Array [
`;

exports[`cli should support stdin filepath 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -150,7 +150,7 @@ export default SvgFile
`;

exports[`cli should support various args: --expand-props none 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile() {
return (
Expand All @@ -166,7 +166,7 @@ export default SvgFile
`;

exports[`cli should support various args: --expand-props start 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -182,7 +182,7 @@ export default SvgFile
`;

exports[`cli should support various args: --icon 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -198,7 +198,7 @@ export default SvgFile
`;

exports[`cli should support various args: --native --expand-props none 1`] = `
"import React from 'react'
"import * as React from 'react'
import Svg, { Path } from 'react-native-svg'

function SvgFile() {
Expand All @@ -215,7 +215,7 @@ export default SvgFile
`;

exports[`cli should support various args: --native --icon 1`] = `
"import React from 'react'
"import * as React from 'react'
import Svg, { Path } from 'react-native-svg'

function SvgFile(props) {
Expand All @@ -232,7 +232,7 @@ export default SvgFile
`;

exports[`cli should support various args: --native --ref 1`] = `
"import React from 'react'
"import * as React from 'react'
import Svg, { Path } from 'react-native-svg'

function SvgFile({ svgRef, ...props }) {
Expand All @@ -252,7 +252,7 @@ export default ForwardRef
`;

exports[`cli should support various args: --native 1`] = `
"import React from 'react'
"import * as React from 'react'
import Svg, { Path } from 'react-native-svg'

function SvgFile(props) {
Expand All @@ -269,7 +269,7 @@ export default SvgFile
`;

exports[`cli should support various args: --no-dimensions 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -285,7 +285,7 @@ export default SvgFile
`;

exports[`cli should support various args: --no-prettier 1`] = `
"import React from \\"react\\";
"import * as React from \\"react\\";

function SvgFile(props) {
return <svg width={48} height={1} {...props}><path d=\\"M0 0h48v1H0z\\" fill=\\"#063855\\" fillRule=\\"evenodd\\" /></svg>;
Expand All @@ -296,7 +296,7 @@ export default SvgFile;
`;

exports[`cli should support various args: --no-svgo 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand Down Expand Up @@ -337,7 +337,7 @@ export default SvgFile
`;

exports[`cli should support various args: --ref 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile({ svgRef, ...props }) {
return (
Expand All @@ -356,7 +356,7 @@ export default ForwardRef
`;

exports[`cli should support various args: --replace-attr-values "#063855=currentColor" 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -372,7 +372,7 @@ export default SvgFile
`;

exports[`cli should support various args: --svg-props "hidden={true},id=hello" 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -388,7 +388,7 @@ export default SvgFile
`;

exports[`cli should support various args: --title-prop 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile({ title, titleId, ...props }) {
return (
Expand Down Expand Up @@ -426,7 +426,7 @@ __fixtures__/withSvgrRc/file.svg -> __fixtures_build__/whole/withSvgrRc/File.js"
`;

exports[`cli should work with a simple file 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -442,7 +442,7 @@ export default SvgFile
`;

exports[`cli should work with stdin 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgComponent(props) {
return (
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/__snapshots__/util.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`util #convertFile should convert a file 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand All @@ -16,7 +16,7 @@ export default SvgFile
`;

exports[`util #convertFile should support a custom config path 1`] = `
"import React from 'react'
"import * as React from 'react'

function SvgFile(props) {
return (
Expand Down
Loading