Skip to content

Commit f823fc0

Browse files
committed
Fix regexp to not find extensions in the middle of a module name
1 parent 79bdab9 commit f823fc0

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ export default function transformCssModules({ types: t }) {
4444
// is css modules require hook initialized?
4545
let initialized = false;
4646

47-
let matchExtensions = /\.css/i;
47+
let matchExtensions = /\.css$/i;
4848
function matcher(extensions = ['.css']) {
49-
const extensionsPatern = extensions.join('|').replace('.', '\.');
50-
return new RegExp(`(${extensionsPatern})`, 'i');
49+
const extensionsPatern = extensions.join('|').replace(/\./g, '\\\.');
50+
return new RegExp(`(${extensionsPatern})$`, 'i');
5151
}
5252

5353
return {

test/fixtures/extensions.expected.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ var css = {
55
};
66
var scss = {
77
'sassy': 'extensions__sassy___12Yag'
8-
};
8+
};
9+
var foo = require('something-that-has-css-somewhere-in-the-name');
10+
var bar = require('something-that-has-scss-somewhere-in-the-name');

test/fixtures/extensions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
var css = require('../styles.css');
22
var scss = require('../extensions.scss');
3+
var foo = require('something-that-has-css-somewhere-in-the-name');
4+
var bar = require('something-that-has-scss-somewhere-in-the-name');

test/index.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('babel-plugin-css-modules-transform', () => {
2525
}
2626

2727
function readExpected(path) {
28-
return readFileSync(resolve(__dirname, path), 'utf8');
28+
return readFileSync(resolve(__dirname, path), 'utf8').trim();
2929
}
3030

3131
it('should throw if we are requiring css module to module scope', () => {

0 commit comments

Comments
 (0)