Skip to content

Commit 693e31c

Browse files
committed
fix spelling error
1 parent bd94b7f commit 693e31c

File tree

4 files changed

+89
-78
lines changed

4 files changed

+89
-78
lines changed

.cspell.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"entrypoints",
1212
"filesystems",
1313
"hashishere",
14-
"Hierachic",
1514
"jsons",
1615
"Kopeykin",
1716
"Koppers",
@@ -34,5 +33,5 @@
3433
"zippi",
3534
"zizizi"
3635
],
37-
"ignorePaths": ["package.json", "yarn.lock"]
36+
"ignorePaths": ["package.json", "yarn.lock", "coverage", "*.log"]
3837
}

lib/ModulesInHierachicDirectoriesPlugin.js

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5,76 +5,4 @@
55

66
"use strict";
77

8-
const forEachBail = require("./forEachBail");
9-
const getPaths = require("./getPaths");
10-
11-
/** @typedef {import("./Resolver")} Resolver */
12-
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
13-
14-
module.exports = class ModulesInHierachicDirectoriesPlugin {
15-
/**
16-
* @param {string | ResolveStepHook} source source
17-
* @param {string | Array<string>} directories directories
18-
* @param {string | ResolveStepHook} target target
19-
*/
20-
constructor(source, directories, target) {
21-
this.source = source;
22-
this.directories = /** @type {Array<string>} */ ([]).concat(directories);
23-
this.target = target;
24-
}
25-
26-
/**
27-
* @param {Resolver} resolver the resolver
28-
* @returns {void}
29-
*/
30-
apply(resolver) {
31-
const target = resolver.ensureHook(this.target);
32-
resolver
33-
.getHook(this.source)
34-
.tapAsync(
35-
"ModulesInHierachicDirectoriesPlugin",
36-
(request, resolveContext, callback) => {
37-
const fs = resolver.fileSystem;
38-
const addrs = getPaths(request.path)
39-
.paths.map(p => {
40-
return this.directories.map(d => resolver.join(p, d));
41-
})
42-
.reduce((array, p) => {
43-
array.push.apply(array, p);
44-
return array;
45-
}, []);
46-
forEachBail(
47-
addrs,
48-
(addr, callback) => {
49-
fs.stat(addr, (err, stat) => {
50-
if (!err && stat && stat.isDirectory()) {
51-
const obj = {
52-
...request,
53-
path: addr,
54-
request: "./" + request.request,
55-
module: false
56-
};
57-
const message = "looking for modules in " + addr;
58-
return resolver.doResolve(
59-
target,
60-
obj,
61-
message,
62-
resolveContext,
63-
callback
64-
);
65-
}
66-
if (resolveContext.log)
67-
resolveContext.log(
68-
addr + " doesn't exist or is not a directory"
69-
);
70-
if (resolveContext.missingDependencies)
71-
resolveContext.missingDependencies.add(addr);
72-
return callback();
73-
});
74-
},
75-
callback
76-
);
77-
}
78-
);
79-
}
80-
};
8+
module.exports = require("./ModulesInHierarchicalDirectoriesPlugin");
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/*
2+
MIT License http://www.opensource.org/licenses/mit-license.php
3+
Author Tobias Koppers @sokra
4+
*/
5+
6+
"use strict";
7+
8+
const forEachBail = require("./forEachBail");
9+
const getPaths = require("./getPaths");
10+
11+
/** @typedef {import("./Resolver")} Resolver */
12+
/** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
13+
14+
module.exports = class ModulesInHierarchicalDirectoriesPlugin {
15+
/**
16+
* @param {string | ResolveStepHook} source source
17+
* @param {string | Array<string>} directories directories
18+
* @param {string | ResolveStepHook} target target
19+
*/
20+
constructor(source, directories, target) {
21+
this.source = source;
22+
this.directories = /** @type {Array<string>} */ ([]).concat(directories);
23+
this.target = target;
24+
}
25+
26+
/**
27+
* @param {Resolver} resolver the resolver
28+
* @returns {void}
29+
*/
30+
apply(resolver) {
31+
const target = resolver.ensureHook(this.target);
32+
resolver
33+
.getHook(this.source)
34+
.tapAsync(
35+
"ModulesInHierarchicalDirectoriesPlugin",
36+
(request, resolveContext, callback) => {
37+
const fs = resolver.fileSystem;
38+
const addrs = getPaths(request.path)
39+
.paths.map(p => {
40+
return this.directories.map(d => resolver.join(p, d));
41+
})
42+
.reduce((array, p) => {
43+
array.push.apply(array, p);
44+
return array;
45+
}, []);
46+
forEachBail(
47+
addrs,
48+
(addr, callback) => {
49+
fs.stat(addr, (err, stat) => {
50+
if (!err && stat && stat.isDirectory()) {
51+
const obj = {
52+
...request,
53+
path: addr,
54+
request: "./" + request.request,
55+
module: false
56+
};
57+
const message = "looking for modules in " + addr;
58+
return resolver.doResolve(
59+
target,
60+
obj,
61+
message,
62+
resolveContext,
63+
callback
64+
);
65+
}
66+
if (resolveContext.log)
67+
resolveContext.log(
68+
addr + " doesn't exist or is not a directory"
69+
);
70+
if (resolveContext.missingDependencies)
71+
resolveContext.missingDependencies.add(addr);
72+
return callback();
73+
});
74+
},
75+
callback
76+
);
77+
}
78+
);
79+
}
80+
};

lib/ResolverFactory.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const ImportsFieldPlugin = require("./ImportsFieldPlugin");
2323
const JoinRequestPartPlugin = require("./JoinRequestPartPlugin");
2424
const JoinRequestPlugin = require("./JoinRequestPlugin");
2525
const MainFieldPlugin = require("./MainFieldPlugin");
26-
const ModulesInHierachicDirectoriesPlugin = require("./ModulesInHierachicDirectoriesPlugin");
26+
const ModulesInHierarchicalDirectoriesPlugin = require("./ModulesInHierarchicalDirectoriesPlugin");
2727
const ModulesInRootPlugin = require("./ModulesInRootPlugin");
2828
const NextPlugin = require("./NextPlugin");
2929
const ParsePlugin = require("./ParsePlugin");
@@ -406,7 +406,7 @@ exports.createResolver = function (options) {
406406
if (Array.isArray(item)) {
407407
if (item.includes("node_modules") && pnpApi) {
408408
plugins.push(
409-
new ModulesInHierachicDirectoriesPlugin(
409+
new ModulesInHierarchicalDirectoriesPlugin(
410410
"raw-module",
411411
item.filter(i => i !== "node_modules"),
412412
"module"
@@ -417,7 +417,11 @@ exports.createResolver = function (options) {
417417
);
418418
} else {
419419
plugins.push(
420-
new ModulesInHierachicDirectoriesPlugin("raw-module", item, "module")
420+
new ModulesInHierarchicalDirectoriesPlugin(
421+
"raw-module",
422+
item,
423+
"module"
424+
)
421425
);
422426
}
423427
} else {

0 commit comments

Comments
 (0)