Skip to content

Commit 32587e5

Browse files
committed
Fix component name finding
1 parent 5354fa5 commit 32587e5

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Diff for: src/index.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
const exportDefaultContainerRegex = /export\s+default\s+.*\(([A-Z][A-Za-z_\$\d]*)/g
2-
const exportDefaultRegex = /export\s+default(?:\s+class)?\s+([A-Z][A-Za-z_\$\d]*)/g
1+
const exportDefaultContainerRegex = /export\s+default\s+.*\(([A-Z][A-Za-z_\$\d]*)/
2+
const exportDefaultRegex = /export\s+default(?:\s+class)?\s+([A-Z][A-Za-z_\$\d]*)/
33
const classNameRegex = /(className=(?:\{\s*c\(|\{\s*classnames\(|\{\s*)?\s*[\'\"\`]\s*)([a-z][a-zA-Z\d_\-]*)/g
44

55
function loader (source, inputSourceMap) {
66
this.cacheable()
7-
let matches = exportDefaultContainerRegex.exec(source) ||
8-
exportDefaultRegex.exec(source)
7+
let matches = source.match(exportDefaultContainerRegex) || source.match(exportDefaultRegex)
98

109
if (matches) {
1110
let jsClassName = matches[1]

Diff for: test/index.mocha.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ describe('className regexps', () => {
4141
const exportDefaultRegex = /export\s+default(?:\s+class)?\s+([A-Z][A-Za-z_\$\d]*)/
4242
let exportDefaultTests = [
4343
{in: 'export default MyClass', out: 'MyClass'},
44+
{in: '\n export default Toolbar \n', out: 'Toolbar'},
45+
{in: '\n export default Toolbar\n', out: 'Toolbar'},
4446
{in: 'export default MyClass', out: 'MyClass'},
4547
{in: 'export default class MyClass', out: 'MyClass'},
4648
{in: 'export default class MyClass', out: 'MyClass'},
@@ -144,7 +146,7 @@ let loaderFunctionalTest = {
144146
}
145147
`
146148
}
147-
describe.only('loader', () => {
149+
describe('loader', () => {
148150

149151
it('big functional test of loader', () => {
150152
let context = {

0 commit comments

Comments
 (0)