Skip to content

Commit 8d6d742

Browse files
committed
refactor: update for compliance with @softwareventures/eslint-config v5
1 parent c9e0718 commit 8d6d742

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

index.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ async function buildTestProject(path: string): Promise<void> {
1414

1515
async function yarn(path: string, args: readonly string[]): Promise<number> {
1616
const fullPath = resolve(__dirname, path);
17-
return new Promise((resolve, reject) =>
17+
return new Promise((resolve, reject) => {
1818
fork(require.resolve("yarn/bin/yarn.js"), args, {cwd: fullPath})
1919
.on("error", reject)
20-
.on("exit", (code, signal) => (code == null ? reject(signal) : resolve(code)))
21-
);
20+
.on("exit", (code, signal) =>
21+
code == null ? void reject(signal) : void resolve(code)
22+
);
23+
});
2224
}
2325

2426
test("type-module-config-cjs-import-js", async t => {

index.ts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ResolveOptions} from "webpack";
1+
import type {ResolveOptions} from "webpack";
22

33
type Resolver = NonNullable<ResolveOptions["resolver"]>;
44

@@ -13,11 +13,11 @@ class ResolveTypescriptPlugin {
1313
* Will be removed in v2.0. */
1414
public static default = ResolveTypescriptPlugin;
1515

16-
private static defaultOptions: ResolveTypescriptPluginOptions = {
16+
private static readonly defaultOptions: ResolveTypescriptPluginOptions = {
1717
includeNodeModules: false
1818
};
1919

20-
private options: ResolveTypescriptPluginOptions;
20+
private readonly options: ResolveTypescriptPluginOptions;
2121

2222
public constructor(options: ResolveTypescriptPluginOptions = {}) {
2323
this.options = {...ResolveTypescriptPlugin.defaultOptions, ...options};
@@ -30,14 +30,15 @@ class ResolveTypescriptPlugin {
3030
.getHook("raw-file")
3131
.tapAsync(pluginName, (request, resolveContext, callback) => {
3232
if (
33-
!request.path ||
34-
(!this.options.includeNodeModules &&
35-
request.path.match(/(^|[\\/])node_modules($|[\\/])/))
33+
typeof request.path !== "string" ||
34+
(!(this.options.includeNodeModules ?? false) &&
35+
request.path.match(/(^|[\\/])node_modules($|[\\/])/u) != null)
3636
) {
37-
return callback();
37+
callback();
38+
return;
3839
}
3940

40-
const path = request.path.replace(/\.jsx?$/, extension);
41+
const path = request.path.replace(/\.jsx?$/u, extension);
4142
if (path === request.path) {
4243
callback();
4344
} else {
@@ -46,9 +47,7 @@ class ResolveTypescriptPlugin {
4647
{
4748
...request,
4849
path,
49-
relativePath:
50-
request.relativePath &&
51-
request.relativePath.replace(/\.jsx?$/, extension)
50+
relativePath: request.relativePath?.replace(/\.jsx?$/u, extension)
5251
},
5352
`using path: ${path}`,
5453
resolveContext,

0 commit comments

Comments
 (0)