Skip to content

Commit 23c174f

Browse files
committed
prettier
1 parent c6f2e74 commit 23c174f

File tree

2 files changed

+33
-30
lines changed

2 files changed

+33
-30
lines changed

packages/jest-resolve/src/index.ts

+32-29
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ const nodePaths = NODE_PATH
5050
: undefined;
5151

5252
function parseOutQuery(pathQithQuery: string) {
53-
const [path, ...queryParts] = pathQithQuery.split('?')
54-
const query = queryParts.join('')
55-
return [path, query]
53+
const [path, ...queryParts] = pathQithQuery.split('?');
54+
const query = queryParts.join('');
55+
return [path, query];
5656
}
5757

5858
/* eslint-disable-next-line no-redeclare */
@@ -118,7 +118,7 @@ class Resolver {
118118
const paths = options.paths;
119119

120120
try {
121-
const [nativePath, query] = parseOutQuery(path)
121+
const [nativePath, query] = parseOutQuery(path);
122122
const realpath = resolver(nativePath, {
123123
basedir: options.basedir,
124124
browser: options.browser,
@@ -130,9 +130,9 @@ class Resolver {
130130
});
131131

132132
return {
133+
id: `${realpath}?${query}`,
133134
path: realpath,
134-
id: `${realpath}?${query}`
135-
}
135+
};
136136
} catch (e) {
137137
if (options.throwIfNotFound) {
138138
throw e;
@@ -176,9 +176,9 @@ class Resolver {
176176
const hasteModule = this.getModule(nativeName);
177177
if (hasteModule) {
178178
const resolvedPath = {
179+
id: `haste:${hasteModule}?${query}`,
179180
path: hasteModule,
180-
id: `haste:${hasteModule}?${query}`
181-
}
181+
};
182182
this._moduleNameCache.set(key, resolvedPath);
183183
return resolvedPath;
184184
}
@@ -206,7 +206,10 @@ class Resolver {
206206

207207
if (!skipResolution) {
208208
// @ts-ignore: the "pnp" version named isn't in DefinitelyTyped
209-
const nodeModule = resolveNodeModule(moduleName, Boolean(process.versions.pnp));
209+
const nodeModule = resolveNodeModule(
210+
moduleName,
211+
Boolean(process.versions.pnp),
212+
);
210213

211214
if (nodeModule) {
212215
this._moduleNameCache.set(key, nodeModule);
@@ -220,12 +223,12 @@ class Resolver {
220223
const hastePackage = this.getPackage(parts.shift()!);
221224
if (hastePackage) {
222225
const requireResolve = (name: string) => {
223-
const path = require.resolve(name)
226+
const path = require.resolve(name);
224227
return {
228+
id: `haste:${path}?${query}`,
225229
path,
226-
id: `haste:${path}?${query}`
227-
}
228-
}
230+
};
231+
};
229232
try {
230233
const hastePackageModule = path.join.apply(
231234
path,
@@ -234,7 +237,8 @@ class Resolver {
234237
// try resolving with custom resolver first to support extensions,
235238
// then fallback to require.resolve
236239
const resolvedModule =
237-
resolveNodeModule(hastePackageModule) || requireResolve(hastePackageModule);
240+
resolveNodeModule(hastePackageModule) ||
241+
requireResolve(hastePackageModule);
238242
this._moduleNameCache.set(key, resolvedModule);
239243
return resolvedModule;
240244
} catch (ignoredError) {}
@@ -454,28 +458,27 @@ class Resolver {
454458
for (const possibleModuleName of possibleModuleNames) {
455459
const updatedName = mapModuleName(possibleModuleName);
456460

457-
const hasteModule = this.getModule(updatedName)
461+
const hasteModule = this.getModule(updatedName);
458462
if (hasteModule) {
459463
module = {
464+
id: `haste:${hasteModule}?${query}`,
460465
path: hasteModule,
461-
id: `haste:${hasteModule}?${query}`
462-
}
463-
break
466+
};
467+
break;
464468
}
465469

466-
const nodeModule =
467-
Resolver.findNodeModule(updatedName, {
468-
basedir: dirname,
469-
browser: this._options.browser,
470-
extensions,
471-
moduleDirectory,
472-
paths,
473-
resolver,
474-
rootDir: this._options.rootDir,
475-
});
470+
const nodeModule = Resolver.findNodeModule(updatedName, {
471+
basedir: dirname,
472+
browser: this._options.browser,
473+
extensions,
474+
moduleDirectory,
475+
paths,
476+
resolver,
477+
rootDir: this._options.rootDir,
478+
});
476479

477480
if (nodeModule) {
478-
module = nodeModule
481+
module = nodeModule;
479482
break;
480483
}
481484
}

packages/jest-runtime/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ class Runtime {
939939
filename,
940940
id: filename,
941941
loaded: false,
942-
rpth: {id: 'InitialModule', path: filename}
942+
rpth: {id: 'InitialModule', path: filename},
943943
});
944944
};
945945

0 commit comments

Comments
 (0)