Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve main in module so extension regex works #79

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 18 additions & 2 deletions index.js
@@ -1,4 +1,6 @@
var utils = require('./utils');
var fs = require('fs');
var path = require('path');

var scopedModuleRegex = new RegExp(
'@[a-zA-Z0-9][\\w-.]+/[a-zA-Z0-9][\\w-.]+([a-zA-Z0-9./]+)?',
Expand Down Expand Up @@ -68,18 +70,32 @@ module.exports = function nodeExternals(options) {
request = arg1.request;
callback = arg2;
}

var res = request;
try {
res = utils.resolveRequest(request, `${context}/`)
} catch (err) {
res = request
}

var moduleName = getModuleName(request, includeAbsolutePaths);

// use res incase modules main does not resolve to js.
// e.g. reset-css resolves to reset-css/reset.css
// makes /\.css$/ work in this case
// then use request to make 'a-module' work
if (
utils.contains(nodeModules, moduleName) &&
!utils.containsPattern(allowlist, res) &&
!utils.containsPattern(allowlist, request)
) {
) { // externalize module
if (typeof importType === 'function') {
return callback(null, importType(request));
}
// mark this module as external
// https://webpack.js.org/configuration/externals/
return callback(null, importType + ' ' + request);
}
callback();
callback();; // bundle module
};
};
13 changes: 13 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Expand Up @@ -7,7 +7,9 @@
"type": "git",
"url": "https://github.com/liady/webpack-node-externals.git"
},
"dependencies": {},
"dependencies": {
"resolve": "1.17.0"
},
"devDependencies": {
"chai": "^3.5.0",
"mocha": "^2.5.3",
Expand Down
9 changes: 9 additions & 0 deletions utils.js
@@ -1,5 +1,6 @@
var fs = require('fs');
var path = require('path');
var resolve = require('resolve');

exports.contains = function contains(arr, val) {
return arr && arr.indexOf(val) !== -1;
Expand Down Expand Up @@ -143,3 +144,11 @@ exports.error = function (errors) {
.join('\r\n')
);
};

exports.resolveRequest= function (req, issuer) {
var basedir =
issuer.endsWith(path.posix.sep) || issuer.endsWith(path.win32.sep)
? issuer
: path.dirname(issuer);
return resolve.sync(req, { basedir: basedir });
};