Skip to content

Commit 39c8119

Browse files
committed
fix(js-loader): 优化正则
1 parent 4bf7321 commit 39c8119

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/models/loader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function (content) {
1414
* 存在aaa/index.js: require('aaa/index.js') => require('./aaa/index.js')
1515
* 不存在jquery/index.js: require('jquery/index.js') => require('jquery/index.js')
1616
**/
17-
content = content.replace(/require\([\'|\"]([^.|\'|\"]+)\.(\w+)[\'|\"]\)/igm, function (match, filepath, postfix) {
17+
content = content.replace(/require\([\'|\"]([^.|\'|\"]+)\.(\w+)[\'|\"]\)/gm, function (match, filepath, postfix) {
1818
if (fileExists(path.resolve(self.context, filepath + "." + postfix))) {
1919
return "require('.\/" + filepath + "." + postfix + "')";
2020
} else {
@@ -26,7 +26,7 @@ module.exports = function (content) {
2626
* 存在aaa.js: require('aaa') => require('./aaa')
2727
* 不存在bbb.js: require('bbb') => require('bbb')
2828
**/
29-
content = content.replace(/require\([\'|\"]([^.|\'|\"]+)[\'|\"]\)/igm, function (match, filepath) {
29+
content = content.replace(/require\([\'|\"]([^.|\'|\"]+)[\'|\"]\)/gm, function (match, filepath) {
3030
// var files = Finder.in(self.context).findFiles(filepath + '.js');
3131
if (fileExists(path.resolve(self.context, filepath + ".js"))) {
3232
return "require('.\/" + filepath + "')";

src/models/loader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = function(content) {
1212
* 存在aaa/index.js: require('aaa/index.js') => require('./aaa/index.js')
1313
* 不存在jquery/index.js: require('jquery/index.js') => require('jquery/index.js')
1414
**/
15-
content = content.replace(/require\([\'|\"]([^.|\'|\"]+)\.(\w+)[\'|\"]\)/igm, function(match, filepath, postfix) {
15+
content = content.replace(/require\([\'|\"]([^.|\'|\"]+)\.(\w+)[\'|\"]\)/gm, function(match, filepath, postfix) {
1616
if(fileExists(path.resolve(self.context, filepath +"." + postfix))) {
1717
return "require('.\/" + filepath +"." + postfix + "')"
1818
} else {
@@ -24,7 +24,7 @@ module.exports = function(content) {
2424
* 存在aaa.js: require('aaa') => require('./aaa')
2525
* 不存在bbb.js: require('bbb') => require('bbb')
2626
**/
27-
content = content.replace(/require\([\'|\"]([^.|\'|\"]+)[\'|\"]\)/igm, function(match, filepath) {
27+
content = content.replace(/require\([\'|\"]([^.|\'|\"]+)[\'|\"]\)/gm, function(match, filepath) {
2828
// var files = Finder.in(self.context).findFiles(filepath + '.js');
2929
if(fileExists(path.resolve(self.context, filepath + ".js"))) {
3030
return "require('.\/" + filepath + "')"

0 commit comments

Comments
 (0)