Skip to content

Commit 795c885

Browse files
committed
temporarily disabled hoisting to get us going
1 parent d68210f commit 795c885

2 files changed

Lines changed: 27 additions & 27 deletions

File tree

src/package-linker.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -133,31 +133,31 @@ export default class PackageLinker {
133133
}
134134

135135
// hoist tree
136-
hoist: for (let key in tree) {
137-
let parts = key.split("#");
138-
let info = tree[key];
139-
delete tree[key];
140-
141-
let name = parts.pop();
142-
while (parts.length) {
143-
let key = parts.concat(name).join("#");
144-
145-
let existing = tree[key];
146-
if (existing) {
147-
if (existing.loc === info.loc) {
148-
continue hoist;
149-
} else {
150-
break;
151-
}
152-
}
153-
154-
parts.pop();
155-
}
156-
157-
parts.push(name);
158-
159-
tree[parts.join("#")] = info;
160-
}
136+
// hoist: for (let key in tree) {
137+
// let parts = key.split("#");
138+
// let info = tree[key];
139+
// delete tree[key];
140+
//
141+
// let name = parts.pop();
142+
// while (parts.length) {
143+
// let key = parts.concat(name).join("#");
144+
//
145+
// let existing = tree[key];
146+
// if (existing) {
147+
// if (existing.loc === info.loc) {
148+
// continue hoist;
149+
// } else {
150+
// break;
151+
// }
152+
// }
153+
//
154+
// parts.pop();
155+
// }
156+
//
157+
// parts.push(name);
158+
//
159+
// tree[parts.join("#")] = info;
160+
// }
161161

162162
//
163163
let flatTree = [];

test/commands/install.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ test("install from offline mirror", () => {
143143
});
144144
});
145145

146-
test("install should not flatten dependencies if there are collisions", () => {
146+
test.only("install should not flatten dependencies if there are collisions", () => {
147147
// A@2.0.1 -> B@2.0.0
148148
// B@1.0.0
149149
// should result in B@2.0.0 not flattened
@@ -155,7 +155,7 @@ test("install should not flatten dependencies if there are collisions", () => {
155155
});
156156
});
157157

158-
test("install should flatten dependencies at the most top level without collisions", () => {
158+
test.only("install should flatten dependencies at the most top level without collisions", () => {
159159
// A@2.0.1 -> B@2.0.0
160160
// should result in B@2.0.0 flattened
161161
return run({}, [], "install-flatten-when-no-conflict", async (cwd) => {

0 commit comments

Comments
 (0)