10000 option, refactor: fix dependency module tree. · fibjs/fibjs@6081d12 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 6081d12

Browse files
committed
option, refactor: fix dependency module tree.
1 parent f9fc0f6 commit 6081d12

File tree

2 files changed

+291
-286
lines changed

2 files changed

+291
-286
lines changed

fibjs/scripts/opt_tools/install.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ function fetch_leveled_module_info(m, v, parent) {
180180
hosted_tarball: opt.hosted_tarball
181181
}
182182
} catch (e) {
183-
console.log("ode-pre-gyp", e);
183+
console.log("node-pre-gyp", e);
184184
// process.exit();
185185
}
186186
}
@@ -343,9 +343,6 @@ function walkthrough_deps(level_info, need_dev_deps = false) {
343343

344344
function move_up(level_info, parent) {
345345
if (level_info.new_module) {
346-
for (let k in level_info.node_modules)
347-
move_up(level_info.node_modules[k], level_info);
348-
349346
if (parent !== undefined)
350347
for (let k in level_info.node_modules) {
351348
const m = level_info.node_modules[k];
@@ -354,9 +351,15 @@ function move_up(level_info, parent) {
354351
if (m1 === undefined || m1.version === m.version) {
355352
parent.node_modules[k] = m;
356353
delete level_info.node_modules[k];
354+
355+
parent.module_list.push(k);
357356
}
358357
}
359358
}
359+
360+
level_info.module_list = Object.keys(level_info.node_modules);
361+
for (let i = 0; i < level_info.module_list.length; i++)
362+
move_up(level_info.node_modules[level_info.module_list[i]], level_info);
360363
}
361364
}
362365

0 commit comments

Comments
 (0)
0