Alternative pattern for matching local imports (#22)

* Alternative pattern for matching local imports * Support doublequotes in local import
diegohaz · May 31, 2018 · aec90ab · aec90ab
1 parent 91a1e77
commit aec90ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -66,8 +66,8 @@ export const replaceContents = (
   oldName: string,
   newName: string
 ): string => contents.replace(
-  new RegExp(`([^a-zA-Z0-9_$])${oldName}([^a-zA-Z0-9_$]|Container)`, 'g'),
-  `$1${newName}$2`
+  new RegExp(`([^a-zA-Z0-9_$])${oldName}([^a-zA-Z0-9_$]|Container)|(['|"]./[a-zA-Z0-9_$]*?)${oldName}([a-zA-Z0-9_$]*?)`, 'g'),
+  `$1$3${newName}$2$4`
 )
 
 export const replicate = async (

diff --git a/test/utils.test.js b/test/utils.test.js
@@ -85,15 +85,27 @@ test('getComponentFiles', async () => {
 test('replaceContents', () => {
   const contents = `
     import './Button.css'
+    import ButtonComponent from '../ButtonComponent'
+    import NodeButtonComponent from 'node-button-component'
+    import NodeYellowButtonComponent from 'node-component/YellowButton'
     import SimpleButton from './SimpleButton'
+    import { someButtonUtil } from './SimpleButtonUtils'
+    import { someButtonUtil } from "./SimpleButtonUtils";
     const Button = () => <button />
+    export const someButtonUtil = () => {}
     export default Button
   `
 
   expect(replaceContents(contents, 'Button', 'AnotherButton')).toBe(`
     import './AnotherButton.css'
-    import SimpleButton from './SimpleButton'
+    import ButtonComponent from '../ButtonComponent'
+    import NodeButtonComponent from 'node-button-component'
+    import NodeYellowButtonComponent from 'node-component/YellowButton'
+    import SimpleButton from './SimpleAnotherButton'
+    import { someButtonUtil } from './SimpleAnotherButtonUtils'
+    import { someButtonUtil } from "./SimpleAnotherButtonUtils";
     const AnotherButton = () => <button />
+    export const someButtonUtil = () => {}
     export default AnotherButton
   `)
 })