Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"bindings": "^1.4.0",
"codecov": "^3.6.5",
"estree-walker": "^0.6.1",
"ffi-napi": "^4.0.3",
"glob": "^7.1.3",
"graceful-fs": "^4.1.15",
"jest": "^26.6.3",
Expand Down
32 changes: 17 additions & 15 deletions src/asset-relocator.js
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ module.exports = async function (content, map) {
break;
// require('bindings')(...)
case BINDINGS:
if (node.arguments.length) {
if (node.arguments.length > 0) {
const arg = computePureStaticValue(node.arguments[0], false).result;
if (arg && arg.value) {
let staticBindingsInstance = false;
Expand Down Expand Up @@ -934,19 +934,21 @@ module.exports = async function (content, map) {
}
break;
case NODE_GYP_BUILD:
if (node.arguments.length === 1 && node.arguments[0].type === 'Identifier' &&
node.arguments[0].name === '__dirname' && knownBindings.__dirname.shadowDepth === 0) {
transformed = true;
let resolved;
try {
resolved = nodeGypBuild.path(dir);
}
catch (e) {}
if (resolved) {
staticChildValue = { value: resolved };
staticChildNode = node;
emitStaticChildAsset(path);
return backtrack(this, parent);
if (node.arguments.length > 0) {
const arg = computePureStaticValue(node.arguments[0], false).result;
if (arg && arg.value) {
transformed = true;
let resolved;
try {
resolved = nodeGypBuild.path(arg.value);
}
catch (e) {}
if (resolved) {
staticChildValue = { value: resolved };
staticChildNode = node;
emitStaticChildAsset(path);
return backtrack(this, parent);
}
}
}
break;
Expand All @@ -961,7 +963,7 @@ module.exports = async function (content, map) {
break;
// nbind.init(...) -> require('./resolved.node')
case NBIND_INIT:
if (node.arguments.length) {
if (node.arguments.length > 0) {
const arg = computePureStaticValue(node.arguments[0], false).result;
if (arg && arg.value) {
const bindingInfo = nbind(arg.value);
Expand Down
1 change: 1 addition & 0 deletions test/unit/node-gyp-build-resolve/input.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('ffi-napi');
Loading