Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default declare(({
}) => {
const namedTemplate = `
var SVG_NAME = function SVG_NAME(props) { return SVG_CODE; };
${SVG_DEFAULT_PROPS_CODE ? 'SVG_NAME.defaultProps = SVG_DEFAULT_PROPS_CODE;' : ''}
${SVG_DEFAULT_PROPS_CODE ? 'SVG_NAME.defaultProps = SVG_DEFAULT_PROPS_CODE;' : ''}
${IS_EXPORT ? 'export { SVG_NAME };' : ''}
`;
const anonymousTemplate = `
Expand All @@ -44,7 +44,6 @@ export default declare(({
return template(anonymousTemplate)({ SVG_CODE, SVG_DEFAULT_PROPS_CODE, EXPORT_FILENAME });
};


function applyPlugin(importIdentifier, importPath, path, state, isExport, exportFilename) {
if (typeof importPath !== 'string') {
throw new TypeError('`applyPlugin` `importPath` must be a string');
Expand Down Expand Up @@ -124,19 +123,22 @@ export default declare(({
return {
visitor: {
Program: {
enter({ scope, node }, { file, opts, filename }) {
enter(path, { file, opts, filename }) {
if (typeof filename === 'string' && typeof opts.filename !== 'undefined') {
throw new TypeError('the "filename" option may only be provided when transforming code');
}
if (typeof filename === 'undefined' && typeof opts.filename !== 'string') {
throw new TypeError('the "filename" option is required when transforming code');
}
if (!scope.hasBinding('React')) {
if (!path.scope.hasBinding('React')) {
const reactImportDeclaration = t.importDeclaration([
t.importDefaultSpecifier(t.identifier('React')),
], t.stringLiteral('react'));

file.set('ensureReact', () => { node.body.unshift(reactImportDeclaration); });
file.set('ensureReact', () => {
const [newPath] = path.unshiftContainer('body', reactImportDeclaration);
newPath.get('specifiers').forEach((specifier) => { path.scope.registerBinding('module', specifier); });
});
} else {
file.set('ensureReact', () => {});
}
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/test-no-duplicate-react.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import MySvg from './close.svg';

export function MyFunctionIcon() {
return MySvg;
}
26 changes: 25 additions & 1 deletion test/sanity.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,30 @@ transformFile('test/fixtures/test-no-react.jsx', {
validateDefaultProps(result);
});

transformFile('test/fixtures/test-no-duplicate-react.jsx', {
babelrc: false,
presets: ['@babel/preset-react'],
plugins: [
inlineReactSvgPlugin,
({
visitor: {
Program: {
exit({ scope }) {
if (!scope.hasBinding('React')) {
throw new Error('React binding was expected.');
}
},
},
},
}),
],
}, (err, result) => {
if (err) throw err;
console.log('test/fixtures/test-no-duplicate-react.jsx', result.code);
assertReactImport(result);
validateDefaultProps(result);
});

if (fs.existsSync(path.resolve('./PACKAGE.JSON'))) {
transformFile('test/fixtures/test-case-sensitive.jsx', {
babelrc: false,
Expand All @@ -71,7 +95,7 @@ if (fs.existsSync(path.resolve('./PACKAGE.JSON'))) {
if (err && err.message.indexOf('match case') !== -1) {
console.log('test/fixtures/test-case-sensitive.jsx', 'Test passed: Expected case sensitive error was thrown');
} else {
throw new Error('Test failed: Expected case sensitive error wasn‘t thrown, got: ' + err.message);
throw new Error(`Test failed: Expected case sensitive error wasn‘t thrown, got: ${err.message}`);
}
});
} else {
Expand Down