Skip to content

Commit 066afd1

Browse files
committed
Release 3.9.14
1 parent fe3ab68 commit 066afd1

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v3.9.14 (2023-02-05)
2+
--------------------
3+
[new] Support conditional export resolution with custom resolver. (nick-klaviyo)
4+
15
v3.9.13 (2022-12-08)
26
--------------------
37
[fix] Fix typescript errors in index.d.ts

lib/resolver-compat.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ function resolverFromOptions(vm, options, override, compiler) {
324324
if (!resolved) return undefined;
325325
if (typeof resolved === 'string') {
326326
if (externals) externals.push(new RegExp('^' + escapeRegExp(resolved)));
327-
return resolver.loadAsFileOrDirecotry(resolved, extList);
327+
return resolver.loadAsFileOrDirectory(resolved, extList);
328328
}
329329
const {module=x, path: resolvedPath} = resolved;
330330
if (externals) externals.push(new RegExp('^' + escapeRegExp(resolvedPath)));

lib/resolver.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ class DefaultResolver extends Resolver {
242242
// 2. If X begins with '/'
243243
if (this.pathIsAbsolute(x)) {
244244
// a. set Y to be the filesystem root
245-
f = this.loadAsFileOrDirecotry(x, extList);
245+
f = this.loadAsFileOrDirectory(x, extList);
246246
if (f) return f;
247247

248248
// c. THROW "not found"
@@ -256,21 +256,21 @@ class DefaultResolver extends Resolver {
256256
for (let i = 0; i < paths.length; i++) {
257257
// a. LOAD_AS_FILE(Y + X)
258258
// b. LOAD_AS_DIRECTORY(Y + X)
259-
f = this.loadAsFileOrDirecotry(this.pathConcat(paths[i], x), extList);
259+
f = this.loadAsFileOrDirectory(this.pathConcat(paths[i], x), extList);
260260
if (f) return f;
261261
}
262262
} else if (paths === undefined) {
263263
// a. LOAD_AS_FILE(Y + X)
264264
// b. LOAD_AS_DIRECTORY(Y + X)
265-
f = this.loadAsFileOrDirecotry(this.pathConcat(path, x), extList);
265+
f = this.loadAsFileOrDirectory(this.pathConcat(path, x), extList);
266266
if (f) return f;
267267
} else {
268268
throw new VMError('Invalid options.paths option.');
269269
}
270270
} else {
271271
// a. LOAD_AS_FILE(Y + X)
272272
// b. LOAD_AS_DIRECTORY(Y + X)
273-
f = this.loadAsFileOrDirecotry(this.pathConcat(path, x), extList);
273+
f = this.loadAsFileOrDirectory(this.pathConcat(path, x), extList);
274274
if (f) return f;
275275
}
276276

@@ -315,7 +315,7 @@ class DefaultResolver extends Resolver {
315315
return super.resolveFull(mod, x, options, ext, direct);
316316
}
317317

318-
loadAsFileOrDirecotry(x, extList) {
318+
loadAsFileOrDirectory(x, extList) {
319319
// a. LOAD_AS_FILE(X)
320320
const f = this.loadAsFile(x, extList);
321321
if (f) return f;
@@ -555,7 +555,7 @@ class DefaultResolver extends Resolver {
555555
} else {
556556
// a. LOAD_AS_FILE(RESOLVED_PATH)
557557
// b. LOAD_AS_DIRECTORY(RESOLVED_PATH)
558-
f = this.loadAsFileOrDirecotry(resolvedPath, extList);
558+
f = this.loadAsFileOrDirectory(resolvedPath, extList);
559559
}
560560
if (f) return f;
561561
// 5. THROW "not found"

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"alcatraz",
1414
"contextify"
1515
],
16-
"version": "3.9.13",
16+
"version": "3.9.14",
1717
"main": "index.js",
1818
"sideEffects": false,
1919
"repository": "github:patriksimek/vm2",

0 commit comments

Comments
 (0)