refactor: improve code

This commit is contained in:
alexander.akait 2024-07-31 10:37:05 +03:00
parent 1fe55ac7b5
commit 40151be78e
65 changed files with 236 additions and 196 deletions

View File

@ -80,8 +80,8 @@ const runCli = cli => {
if (pkg.type === "module" || /\.mjs/i.test(pkg.bin[cli.binName])) {
import(path.resolve(path.dirname(pkgPath), pkg.bin[cli.binName])).catch(
error => {
console.error(error);
err => {
console.error(err);
process.exitCode = 1;
}
);
@ -177,8 +177,8 @@ if (!cli.installed) {
.then(() => {
runCli(cli);
})
.catch(error => {
console.error(error);
.catch(err => {
console.error(err);
process.exitCode = 1;
});
});

View File

@ -6,6 +6,7 @@ const jsdoc = require("eslint-plugin-jsdoc");
const prettierConfig = require("eslint-config-prettier");
const globals = require("globals");
const stylistic = require("@stylistic/eslint-plugin");
const unicorn = require("eslint-plugin-unicorn");
const nodeConfig = n.configs["flat/recommended"];
const jsdocConfig = jsdoc.configs["flat/recommended-typescript-flavor-error"];
@ -78,7 +79,7 @@ module.exports = [
varsIgnorePattern: "^_",
args: "none",
argsIgnorePattern: "^_",
caughtErrors: "none",
caughtErrors: "all",
caughtErrorsIgnorePattern: "^_",
ignoreRestSiblings: true
}
@ -197,9 +198,42 @@ module.exports = [
"prefer-spread": "error",
"no-sequences": "error",
// TODO Enable
"id-length": "off",
"prefer-destructuring": "off"
}
},
{
plugins: {
unicorn
},
rules: {
"unicorn/catch-error-name": [
"error",
{ name: "err", ignore: [/(^_|[0-9]+$)/i] }
],
// TODO Enable
"unicorn/prefer-spread": "off",
"unicorn/prefer-string-slice": "off",
"unicorn/explicit-length-check": "off",
"unicorn/no-lonely-if": "off",
"unicorn/prefer-ternary": "off",
"unicorn/no-useless-undefined": "off",
"unicorn/no-hex-escape": "off",
"unicorn/escape-case": "off",
"unicorn/prefer-negative-index": "off",
"unicorn/no-array-for-each": "off",
"unicorn/prefer-number-properties": "off",
"unicorn/prefer-default-parameters": "off",
"unicorn/prefer-regexp-test": "off",
"unicorn/prefer-includes": "off",
"unicorn/prefer-math-trunc": "off",
"unicorn/prefer-array-find": "off",
"unicorn/prefer-native-coercion-functions": "off",
"unicorn/no-useless-switch-case": "off",
"unicorn/prefer-string-starts-ends-with": "off",
"unicorn/no-zero-fractions": "off"
}
},
{
plugins: {
"@stylistic": stylistic

View File

@ -483,8 +483,8 @@ class Compilation {
fn: (assets, callback) => {
try {
fn(assets);
} catch (e) {
return callback(e);
} catch (err) {
return callback(err);
}
if (processedAssets !== undefined)
processedAssets.add(this.assets);
@ -1644,8 +1644,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
});
return;
}
} catch (e) {
console.error(e);
} catch (err) {
console.error(err);
}
}
processDependencyForResolving(dep);
@ -1737,8 +1737,8 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
for (const b of block.blocks) queue.push(b);
}
} while (queue.length !== 0);
} catch (e) {
return callback(e);
} catch (err) {
return callback(err);
}
if (--inProgressSorting === 0) onDependenciesSorted();
@ -5240,14 +5240,14 @@ This prevents using hashes of each other and should be avoided.`);
);
moduleObject.loaded = true;
return moduleObject.exports;
} catch (e) {
} catch (execErr) {
if (strictModuleExceptionHandling) {
if (id) delete moduleCache[id];
} else if (strictModuleErrorHandling) {
moduleObject.error = e;
moduleObject.error = execErr;
}
if (!e.module) e.module = module;
throw e;
if (!execErr.module) execErr.module = module;
throw execErr;
}
};
@ -5260,14 +5260,14 @@ This prevents using hashes of each other and should be avoided.`);
);
}
exports = __webpack_require__(module.identifier());
} catch (e) {
} catch (execErr) {
const err = new WebpackError(
`Execution of module code from module graph (${module.readableIdentifier(
this.requestShortener
)}) failed: ${e.message}`
)}) failed: ${execErr.message}`
);
err.stack = e.stack;
err.module = e.module;
err.stack = execErr.stack;
err.module = execErr.module;
return callback(err);
}

View File

@ -619,11 +619,11 @@ class Compiler {
const finalCallback = (err, entries, compilation) => {
try {
callback(err, entries, compilation);
} catch (e) {
} catch (runAsChildErr) {
const err = new WebpackError(
`compiler.runAsChild callback error: ${e}`
`compiler.runAsChild callback error: ${runAsChildErr}`
);
err.details = /** @type {Error} */ (e).stack;
err.details = /** @type {Error} */ (runAsChildErr).stack;
/** @type {Compilation} */
(this.parentCompilation).errors.push(err);
}
@ -1137,10 +1137,10 @@ ${other}`);
this.records = parseJson(
/** @type {Buffer} */ (content).toString("utf-8")
);
} catch (e) {
} catch (parseErr) {
return callback(
new Error(
`Cannot parse records: ${/** @type {Error} */ (e).message}`
`Cannot parse records: ${/** @type {Error} */ (parseErr).message}`
)
);
}

View File

@ -75,7 +75,7 @@ class DllReferencePlugin {
data.data = parseJson(
/** @type {Buffer} */ (result).toString("utf-8")
);
} catch (e) {
} catch (parseErr) {
// Store the error in the params so that it can
// be added as a compilation error later on.
const manifestPath = makePathsRelative(
@ -83,7 +83,10 @@ class DllReferencePlugin {
manifest,
compiler.root
);
data.error = new DllManifestError(manifestPath, e.message);
data.error = new DllManifestError(
manifestPath,
parseErr.message
);
}
this._compilationData.set(params, data);
return callback();

View File

@ -1770,7 +1770,7 @@ class FileSystemInfo {
expected: imp.d > -1 ? false : undefined,
issuer: job
});
} catch (e) {
} catch (err1) {
this.logger.warn(
`Parsing of ${path} for build dependencies failed at 'import(${source.substring(
imp.s,
@ -1779,15 +1779,15 @@ class FileSystemInfo {
"Build dependencies behind this expression are ignored and might cause incorrect cache invalidation."
);
this.logger.debug(pathToString(job));
this.logger.debug(e.stack);
this.logger.debug(err1.stack);
}
}
} catch (e) {
} catch (err2) {
this.logger.warn(
`Parsing of ${path} for build dependencies failed and all dependencies of this file are ignored, which might cause incorrect cache invalidation..`
);
this.logger.debug(pathToString(job));
this.logger.debug(e.stack);
this.logger.debug(err2.stack);
}
process.nextTick(callback);
});
@ -1830,8 +1830,8 @@ class FileSystemInfo {
let packageData;
try {
packageData = JSON.parse(content.toString("utf-8"));
} catch (e) {
return callback(e);
} catch (parseErr) {
return callback(parseErr);
}
const depsObject = packageData.dependencies;
const optionalDepsObject = packageData.optionalDependencies;
@ -3616,8 +3616,8 @@ class FileSystemInfo {
let data;
try {
data = JSON.parse(/** @type {Buffer} */ (content).toString("utf-8"));
} catch (e) {
return callback(e);
} catch (parseErr) {
return callback(parseErr);
}
if (!data.name) {
/** @type {Logger} */

View File

@ -615,8 +615,8 @@ class NormalModule extends Module {
if (options.startsWith("{") && options.endsWith("}")) {
try {
options = parseJson(options);
} catch (e) {
throw new Error(`Cannot parse string options: ${e.message}`);
} catch (err) {
throw new Error(`Cannot parse string options: ${err.message}`);
}
} else {
options = querystring.parse(options, "&", "=", {
@ -1161,7 +1161,7 @@ class NormalModule extends Module {
: deps
).add(absolute);
}
} catch (e) {
} catch (_err) {
// ignore
}
}
@ -1237,8 +1237,8 @@ class NormalModule extends Module {
compilation,
options
});
} catch (e) {
handleParseError(/** @type {Error} */ (e));
} catch (parseErr) {
handleParseError(/** @type {Error} */ (parseErr));
return;
}
handleParseResult();

View File

@ -535,8 +535,8 @@ class NormalModuleFactory extends ModuleFactory {
item.ident = ident;
}
}
} catch (e) {
return callback(/** @type {Error} */ (e));
} catch (identErr) {
return callback(/** @type {Error} */ (identErr));
}
if (!resourceData) {
@ -685,8 +685,8 @@ class NormalModuleFactory extends ModuleFactory {
generatorOptions: settings.generator,
resolveOptions
});
} catch (e) {
return callback(/** @type {Error} */ (e));
} catch (createDataErr) {
return callback(/** @type {Error} */ (createDataErr));
}
callback();
});

View File

@ -159,7 +159,7 @@ class RuntimeModule extends Module {
try {
const source = this.getGeneratedCode();
return source ? source.length : 0;
} catch (e) {
} catch (_err) {
return 0;
}
}

View File

@ -207,10 +207,10 @@ class AssetModulesPlugin {
module.buildInfo.fullContentHash ||
codeGenResult.data.get("fullContentHash")
});
} catch (e) {
/** @type {Error} */ (e).message +=
} catch (err) {
/** @type {Error} */ (err).message +=
`\nduring rendering of asset ${module.identifier()}`;
throw e;
throw err;
}
}
}

View File

@ -676,16 +676,16 @@ class PackContentItems {
logger.log(`Serialization of '${key}': ${duration} ms`);
else logger.debug(`Serialization of '${key}': ${duration} ms`);
}
} catch (e) {
} catch (err) {
rollback(s);
if (e === NOT_SERIALIZABLE) continue;
if (err === NOT_SERIALIZABLE) continue;
const msg = "Skipped not serializable cache item";
if (e.message.includes("ModuleBuildError")) {
logger.log(`${msg} (in build error): ${e.message}`);
logger.debug(`${msg} '${key}' (in build error): ${e.stack}`);
if (err.message.includes("ModuleBuildError")) {
logger.log(`${msg} (in build error): ${err.message}`);
logger.debug(`${msg} '${key}' (in build error): ${err.stack}`);
} else {
logger.warn(`${msg}: ${e.message}`);
logger.debug(`${msg} '${key}': ${e.stack}`);
logger.warn(`${msg}: ${err.message}`);
logger.debug(`${msg} '${key}': ${err.stack}`);
}
}
}
@ -697,7 +697,7 @@ class PackContentItems {
try {
write(true);
write(this.map);
} catch (e) {
} catch (_err) {
rollback(s);
// Try to serialize each item on it's own
@ -707,13 +707,13 @@ class PackContentItems {
try {
write(key);
write(value);
} catch (e) {
} catch (err) {
rollback(s);
if (e === NOT_SERIALIZABLE) continue;
if (err === NOT_SERIALIZABLE) continue;
logger.warn(
`Skipped not serializable cache item '${key}': ${e.message}`
`Skipped not serializable cache item '${key}': ${err.message}`
);
logger.debug(e.stack);
logger.debug(err.stack);
}
}
write(null);

View File

@ -411,7 +411,7 @@ const applyCacheDefaults = (
try {
if (fs.statSync(path.join(dir, "package.json")).isFile()) break;
// eslint-disable-next-line no-empty
} catch (e) {}
} catch (_err) {}
const parent = path.dirname(dir);
if (dir === parent) {
dir = undefined;
@ -908,12 +908,12 @@ const applyOutputDefaults = (
try {
const packageInfo = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
return packageInfo.name || "";
} catch (e) {
if (/** @type {Error & { code: string }} */ (e).code !== "ENOENT") {
} catch (err) {
if (/** @type {Error & { code: string }} */ (err).code !== "ENOENT") {
/** @type {Error & { code: string }} */
(e).message +=
(err).message +=
`\nwhile determining default 'output.uniqueName' from 'name' in ${pkgPath}`;
throw e;
throw err;
}
return "";
}

View File

@ -758,10 +758,10 @@ class CssModulesPlugin {
module
});
source.add(moduleSource);
} catch (e) {
} catch (err) {
/** @type {Error} */
(e).message += `\nduring rendering of css ${module.identifier()}`;
throw e;
(err).message += `\nduring rendering of css ${module.identifier()}`;
throw err;
}
}
const metaDataStr = metaData.join(",");

View File

@ -73,7 +73,7 @@ const normalizeUrl = (str, isString) => {
// Convert `url('%2E/img.png')` -> `url('./img.png')`
try {
str = decodeURIComponent(str);
} catch (error) {
} catch (_err) {
// Ignore
}
}

View File

@ -41,7 +41,7 @@ let inspector;
try {
// eslint-disable-next-line n/no-unsupported-features/node-builtins
inspector = require("inspector");
} catch (e) {
} catch (_err) {
console.log("Unable to CPU profile in < node 8.0");
}
@ -474,13 +474,13 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
let r;
try {
r = fn(...args);
} catch (error) {
} catch (err) {
tracer.trace.end({
name,
id,
cat: defaultCategory
});
throw error;
throw err;
}
tracer.trace.end({
name,

View File

@ -376,17 +376,17 @@ module.exports = function () {
moduleId: moduleId,
module: $moduleCache$[moduleId]
});
} catch (err2) {
} catch (err1) {
if (options.onErrored) {
options.onErrored({
type: "self-accept-error-handler-errored",
moduleId: moduleId,
error: err2,
error: err1,
originalError: err
});
}
if (!options.ignoreErrored) {
reportError(err2);
reportError(err1);
reportError(err);
}
}

View File

@ -448,12 +448,12 @@ class JavascriptModulesPlugin {
moduleObject.exports,
context.__webpack_require__
);
} catch (e) {
e.stack += printGeneratedCodeForStack(
} catch (err) {
err.stack += printGeneratedCodeForStack(
options.module,
/** @type {string} */ (code)
);
throw e;
throw err;
}
});
compilation.hooks.executeModule.tap(PLUGIN_NAME, (options, context) => {
@ -472,9 +472,9 @@ class JavascriptModulesPlugin {
try {
// eslint-disable-next-line no-useless-call
fn.call(null, context.__webpack_require__);
} catch (e) {
e.stack += printGeneratedCodeForStack(options.module, code);
throw e;
} catch (err) {
err.stack += printGeneratedCodeForStack(options.module, code);
throw err;
}
});
}
@ -603,9 +603,9 @@ class JavascriptModulesPlugin {
),
"JavascriptModulesPlugin.getCompilationHooks().renderModulePackage"
);
} catch (e) {
e.module = module;
throw e;
} catch (err) {
err.module = module;
throw err;
}
}

View File

@ -4056,8 +4056,8 @@ class JavascriptParser extends Parser {
return result;
}
}
} catch (e) {
console.warn(e);
} catch (err) {
console.warn(err);
// ignore error
}
return new BasicEvaluatedExpression()
@ -4594,9 +4594,9 @@ class JavascriptParser extends Parser {
}
options[key] = val;
}
} catch (e) {
const newErr = new Error(String(e.message));
newErr.stack = String(e.stack);
} catch (err) {
const newErr = new Error(String(err.message));
newErr.stack = String(err.stack);
Object.assign(newErr, { comment });
errors.push(newErr);
}
@ -4749,8 +4749,8 @@ class JavascriptParser extends Parser {
let threw = false;
try {
ast = /** @type {AnyNode} */ (parser.parse(code, parserOptions));
} catch (e) {
error = e;
} catch (err) {
error = err;
threw = true;
}
@ -4765,7 +4765,7 @@ class JavascriptParser extends Parser {
try {
ast = /** @type {AnyNode} */ (parser.parse(code, parserOptions));
threw = false;
} catch (e) {
} catch (_err) {
// we use the error from first parse try
// so nothing to do here
}

View File

@ -50,8 +50,10 @@ class JsonParser extends Parser {
typeof source === "object"
? source
: parseFn(source[0] === "\ufeff" ? source.slice(1) : source);
} catch (e) {
throw new Error(`Cannot parse JSON: ${/** @type {Error} */ (e).message}`);
} catch (err) {
throw new Error(
`Cannot parse JSON: ${/** @type {Error} */ (err).message}`
);
}
const jsonData = new JsonData(/** @type {Buffer | RawJsonData} */ (data));
const buildInfo = /** @type {BuildInfo} */ (state.module.buildInfo);

View File

@ -1488,11 +1488,11 @@ class ConcatenatedModule extends Module {
return `/* ${
exportInfo.isReexport() ? "reexport" : "binding"
} */ ${finalName}`;
} catch (e) {
} catch (err) {
/** @type {Error} */
(e).message +=
(err).message +=
`\nwhile generating the root export '${name}' (used name: '${used}')`;
throw e;
throw err;
}
});
}

View File

@ -236,7 +236,7 @@ class RuleSetCompiler {
matchWhenEmpty: condition(""),
fn: condition
};
} catch (err) {
} catch (_err) {
throw this.error(
path,
condition,

View File

@ -938,7 +938,7 @@ Remove this line from the lockfile to force upgrading.`
contentWithChangedEol,
entry.integrity
);
} catch (e) {
} catch (_err) {
// ignore
}
if (isEolChanged) {

View File

@ -383,7 +383,7 @@ class ObjectMiddleware extends SerializerMiddleware {
if (request) {
return `${request}${name ? `.${name}` : ""}`;
}
} catch (e) {
} catch (_err) {
// ignore -> fallback
}
if (typeof item === "object" && item !== null) {
@ -406,8 +406,8 @@ class ObjectMiddleware extends SerializerMiddleware {
}
try {
return `${item}`;
} catch (e) {
return `(${e.message})`;
} catch (err) {
return `(${err.message})`;
}
})
.join(" -> ");
@ -417,16 +417,16 @@ class ObjectMiddleware extends SerializerMiddleware {
write(value, key) {
try {
process(value);
} catch (e) {
if (e !== NOT_SERIALIZABLE) {
} catch (err) {
if (err !== NOT_SERIALIZABLE) {
if (hasDebugInfoAttached === undefined)
hasDebugInfoAttached = new WeakSet();
if (!hasDebugInfoAttached.has(e)) {
e.message += `\nwhile serializing ${stackToString(value)}`;
hasDebugInfoAttached.add(e);
if (!hasDebugInfoAttached.has(err)) {
err.message += `\nwhile serializing ${stackToString(value)}`;
hasDebugInfoAttached.add(err);
}
}
throw e;
throw err;
}
},
setCircularReference(ref) {
@ -571,10 +571,10 @@ class ObjectMiddleware extends SerializerMiddleware {
process(item);
}
return result;
} catch (e) {
if (e === NOT_SERIALIZABLE) return null;
} catch (err) {
if (err === NOT_SERIALIZABLE) return null;
throw e;
throw err;
} finally {
// Get rid of these references to avoid leaking memory
// This happens because the optimized code v8 generates

View File

@ -166,7 +166,7 @@ function getCommithash(urlParsed) {
try {
hash = decodeURIComponent(hash);
// eslint-disable-next-line no-empty
} catch (e) {}
} catch (_err) {}
if (
extractCommithashByDomain[
@ -236,7 +236,7 @@ function getVersionFromHash(hash) {
function canBeDecoded(str) {
try {
decodeURIComponent(str);
} catch (e) {
} catch (_err) {
return false;
}
@ -264,7 +264,7 @@ function getGitUrlVersion(gitUrl) {
try {
parsed = new URL(gitUrl);
// eslint-disable-next-line no-empty
} catch (e) {}
} catch (_err) {}
if (!parsed) {
return "";

View File

@ -597,8 +597,8 @@ const readJson = (fs, p, callback) => {
let data;
try {
data = JSON.parse(/** @type {Buffer} */ (buf).toString("utf-8"));
} catch (e) {
return callback(/** @type {Error} */ (e));
} catch (err1) {
return callback(/** @type {Error} */ (err1));
}
return callback(null, data);
});

View File

@ -208,9 +208,9 @@ class AsyncWebAssemblyModulesPlugin {
hooks.renderModuleContent.call(moduleSource, module, renderContext),
"AsyncWebAssemblyModulesPlugin.getCompilationHooks().renderModuleContent"
);
} catch (e) {
/** @type {WebpackError} */ (e).module = module;
throw e;
} catch (err) {
/** @type {WebpackError} */ (err).module = module;
throw err;
}
}
}

View File

@ -62,6 +62,7 @@
"eslint-plugin-jsdoc": "^48.10.1",
"eslint-plugin-n": "^17.8.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-unicorn": "^55.0.0",
"file-loader": "^6.0.0",
"fork-ts-checker-webpack-plugin": "^9.0.2",
"globals": "^15.4.0",

View File

@ -21,8 +21,8 @@ function setup() {
.then(() => {
process.exitCode = 0;
})
.catch(e => {
console.error(e);
.catch(err => {
console.error(err);
process.exitCode = 1;
});
}
@ -54,7 +54,7 @@ async function ensureYarnInstalledAsync() {
try {
const stdout = await execGetOutput("yarn", ["-v"], "Check yarn version");
hasYarn = semverPattern.test(stdout);
} catch (e) {
} catch (_err) {
hasYarn = false;
}
if (!hasYarn) await installYarnAsync();

View File

@ -16,7 +16,7 @@ it("should cache assets", done => {
fs.mkdirSync(path.join(pluginDir), {
recursive: true
});
} catch (e) {
} catch (_err) {
// empty
}
const compiler = webpack({
@ -53,7 +53,7 @@ it("can place banner as footer", done => {
fs.mkdirSync(path.join(pluginDir), {
recursive: true
});
} catch (e) {
} catch (_err) {
// empty
}
const compiler = webpack({
@ -87,7 +87,7 @@ it("should allow to change stage", done => {
fs.mkdirSync(path.join(pluginDir), {
recursive: true
});
} catch (e) {
} catch (_err) {
// empty
}
const compiler = webpack({

View File

@ -20,10 +20,10 @@ describe("BenchmarkTestCases", function () {
try {
fs.mkdirSync(path.join(__dirname, "js"));
} catch (e) {} // eslint-disable-line no-empty
} catch (_err) {} // eslint-disable-line no-empty
try {
fs.mkdirSync(baselinesPath);
} catch (e) {} // eslint-disable-line no-empty
} catch (_err) {} // eslint-disable-line no-empty
beforeAll(function (done) {
const git = require("simple-git");
@ -40,7 +40,7 @@ describe("BenchmarkTestCases", function () {
} else {
try {
fs.mkdirSync(baselinePath);
} catch (e) {} // eslint-disable-line no-empty
} catch (_err) {} // eslint-disable-line no-empty
const gitIndex = path.resolve(rootPath, ".git/index");
const index = fs.readFileSync(gitIndex);
git(rootPath).raw(

View File

@ -154,7 +154,7 @@ const describeCases = config => {
testConfig,
require(path.join(testDirectory, "test.config.js"))
);
} catch (e) {
} catch (_err) {
// ignored
}
if (testConfig.timeout) setDefaultTimeout(testConfig.timeout);
@ -712,8 +712,8 @@ const describeCases = config => {
});
});
});
} catch (e) {
handleFatalError(e, done);
} catch (err) {
handleFatalError(err, done);
}
} else {
require("..")(options, onCompiled);

View File

@ -36,12 +36,12 @@ describe("HotModuleReplacementPlugin", () => {
fs.mkdirSync(path.join(__dirname, "js", "HotModuleReplacementPlugin"), {
recursive: true
});
} catch (e) {
} catch (_err) {
// empty
}
try {
fs.unlinkSync(recordsFile);
} catch (e) {
} catch (_err) {
// empty
}
const compiler = webpack({
@ -107,7 +107,7 @@ describe("HotModuleReplacementPlugin", () => {
let firstUpdate;
try {
fs.mkdirSync(outputPath, { recursive: true });
} catch (e) {
} catch (_err) {
// empty
}
fs.writeFileSync(entryFile, `${++step}`, "utf-8");
@ -116,7 +116,7 @@ describe("HotModuleReplacementPlugin", () => {
try {
fs.statSync(path.join(outputPath, file));
return true;
} catch (err) {
} catch (_err) {
return false;
}
};
@ -188,12 +188,12 @@ describe("HotModuleReplacementPlugin", () => {
const recordsFile = path.join(outputPath, "records.json");
try {
fs.mkdirSync(outputPath, { recursive: true });
} catch (e) {
} catch (_err) {
// empty
}
try {
fs.unlinkSync(recordsFile);
} catch (e) {
} catch (_err) {
// empty
}
const compiler = webpack({
@ -271,12 +271,12 @@ describe("HotModuleReplacementPlugin", () => {
recursive: true
}
);
} catch (e) {
} catch (_err) {
// empty
}
try {
fs.unlinkSync(recordsFile);
} catch (e) {
} catch (_err) {
// empty
}
const compiler = webpack({

View File

@ -155,7 +155,7 @@ describe("JavascriptParser", () => {
fgh.sub;
fgh;
}
} catch (e) {
} catch (err) {
fgh.sub;
fgh;
}

View File

@ -51,7 +51,7 @@ describe("MemoryLimitTestCases", () => {
testConfig,
require(path.join(base, testName, "test.config.js"))
);
} catch (e) {
} catch (_err) {
// ignored
}
it(`should build ${JSON.stringify(testName)} with heap limit of ${toMiB(

View File

@ -451,9 +451,9 @@ describe("MultiCompiler", function () {
setTimeout(() => {
compiler.close(done);
}, 1000);
} catch (e) {
console.error(e);
done(e);
} catch (err) {
console.error(err);
done(err);
}
});
});
@ -530,9 +530,9 @@ describe("MultiCompiler", function () {
setTimeout(() => {
compiler.close(done);
}, 1000);
} catch (e) {
console.error(e);
done(e);
} catch (err) {
console.error(err);
done(err);
}
});
});

View File

@ -27,8 +27,8 @@ describe("MultiStats", () => {
);
expect(statsObject.children).toHaveLength(2);
done();
} catch (e) {
done(e);
} catch (err) {
done(err);
}
});
});

View File

@ -65,7 +65,7 @@ describe("StatsTestCases", () => {
testConfig,
require(path.join(base, testName, "test.config.js"))
);
} catch (e) {
} catch (_err) {
// ignored
}

View File

@ -447,10 +447,10 @@ const describeCases = config => {
}
});
cleanups.push(() => (esmContext.it = undefined));
} catch (e) {
console.log(e);
e.message += `\nwhile parsing ${p}`;
throw e;
} catch (err) {
console.log(err);
err.message += `\nwhile parsing ${p}`;
throw err;
}
if (esmMode === "unlinked") return esm;
return (async () => {

View File

@ -41,7 +41,7 @@ describe("WatchDetection", () => {
beforeAll(() => {
try {
fs.mkdirSync(fixturePath);
} catch (e) {
} catch (_err) {
// empty
}
fs.writeFileSync(filePath, "require('./file2')", "utf-8");
@ -52,17 +52,17 @@ describe("WatchDetection", () => {
setTimeout(() => {
try {
fs.unlinkSync(filePath);
} catch (e) {
} catch (_err) {
// empty
}
try {
fs.unlinkSync(file2Path);
} catch (e) {
} catch (_err) {
// empty
}
try {
fs.rmdirSync(fixturePath);
} catch (e) {
} catch (_err) {
// empty
}
done();

View File

@ -32,14 +32,14 @@ describe("WatchSuspend", () => {
beforeAll(() => {
try {
fs.mkdirSync(fixturePath);
} catch (e) {
} catch (_err) {
// skip
}
try {
fs.writeFileSync(filePath, "'foo'", "utf-8");
fs.writeFileSync(file2Path, "'file2'", "utf-8");
fs.writeFileSync(file3Path, "'file3'", "utf-8");
} catch (e) {
} catch (_err) {
// skip
}
const webpack = require("../");
@ -63,12 +63,12 @@ describe("WatchSuspend", () => {
compiler = null;
try {
fs.unlinkSync(filePath);
} catch (e) {
} catch (_err) {
// skip
}
try {
fs.rmdirSync(fixturePath);
} catch (e) {
} catch (_err) {
// skip
}
});

View File

@ -335,7 +335,7 @@ const describeCases = config => {
testConfig = require(
path.join(testDirectory, "test.config.js")
);
} catch (e) {
} catch (_err) {
// empty
}

View File

@ -5,14 +5,14 @@ module.exports = {
beforeExecute() {
try {
fs.unlinkSync(path.join(__dirname, "dev-defaults.webpack.lock"));
} catch (e) {
} catch (_err) {
// Empty
}
},
afterExecute() {
try {
fs.unlinkSync(path.join(__dirname, "dev-defaults.webpack.lock"));
} catch (e) {
} catch (_err) {
// Empty
}
}

View File

@ -10,7 +10,7 @@ module.exports = () => {
);
fs.unlinkSync(path.join(__dirname, ".testlink"));
return true;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -60,9 +60,9 @@ module.exports = {
expect(auxiliaryFiles).toContain("assets/file.png");
expect(auxiliaryFiles).toContain("assets/file.png?1");
expect(auxiliaryFiles).toContain("assets/file.jpg");
} catch (e) {
} catch (err) {
console.log(stats.toString({ colors: true, orphanModules: true }));
throw e;
throw err;
}
})
]

View File

@ -5,9 +5,9 @@ const plugins = [
const result = asset.source.sourceAndMap();
try {
expect(result.map).toBe(null);
} catch (e) {
e.message += `\nfor asset ${asset.name}`;
throw e;
} catch (err) {
err.message += `\nfor asset ${asset.name}`;
throw err;
}
}
});

View File

@ -60,10 +60,10 @@ module.exports = (globalTimeout = 2000, nameSuffix = "") => {
state.hasStarted = false;
try {
fn();
} catch (e) {
} catch (err) {
// avoid leaking memory
e.stack;
throw e;
err.stack;
throw err;
}
state.currentDescribeBlock = oldCurrentDescribeBlock;
state.currentlyRunningTest = oldCurrentlyRunningTest;

View File

@ -4,7 +4,7 @@ module.exports = function supportDefaultAssignment() {
var E = eval("class E { toString() { return 'default' } }");
var f1 = eval("(function f1({a, b = E}) {return new b().toString();})");
return f1({ a: "test" }) === "default";
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -4,7 +4,7 @@ module.exports = function supportArrowFunctionExpression() {
"var foo = function(fn) {return fn.toString()}; foo(() => {return 'a'})"
);
return true;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -4,7 +4,7 @@ module.exports = function supportsBlockScoping() {
"(function f() { const x = 1; if (true) { const x = 2; } return x; })"
);
return f() === 1;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsES6() {
try {
eval("class A { #field = 1 }");
return true;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsClassStaticBLock() {
try {
eval("(function f({x, y}) { class Foo { static {} } })");
return true;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsDefaultArgs() {
try {
var f = eval("(function f(a = 123) { return a; })");
return f() === 123;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsES6() {
try {
eval("class A {}");
return true;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportDefaultAssignment() {
try {
var f = eval("(function f() { for(var x of ['ok', 'fail']) return x; })");
return f() === "ok";
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsIteratorDestructuring() {
try {
var f = eval("(function f([, x, ...y]) { return x; })");
return f([1, 2]) === 2;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -4,7 +4,7 @@ module.exports = function supportsLogicalAssignment() {
"(function f() { var x = null; x ??= true; x &&= true; return x ||= false; })"
);
return f();
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsNullishCoalescing() {
try {
var f = eval("(function f() { return null ?? true; })");
return f();
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsObjectDestructuring() {
try {
var f = eval("(function f({x, y}) { return x + y; })");
return f({ x: 1, y: 2 }) === 3;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsOptionalCatchBinding() {
try {
eval("try {} catch {}");
return true;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsOptionalChaining() {
try {
var f = eval("(function f() { return ({a: true}) ?.a })");
return f();
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -4,7 +4,7 @@ module.exports = function supportsSpread() {
var y;
eval("y = { ...x }");
return y !== x && y.a;
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -2,7 +2,7 @@ module.exports = function supportsTemplateStrings() {
try {
var f = eval("(function f() { return String.raw`a\\b`; })");
return f() === "a\\b";
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -1,7 +1,7 @@
module.exports = function supportsWebAssembly() {
try {
return typeof WebAssembly !== "undefined";
} catch (e) {
} catch (_err) {
return false;
}
};

View File

@ -17,8 +17,8 @@ describe("warmup", () => {
try {
expect(err).toBe(END);
done();
} catch (e) {
done(e);
} catch (doneErr) {
done(doneErr);
}
}
);

View File

@ -83,17 +83,17 @@ if (process.env.DEBUG_INFO) {
process.stdout.write(`DONE OK ${name}\n`);
return r;
},
e => {
err => {
process.stdout.write(`DONE FAIL ${name}\n`);
throw e;
throw err;
}
);
}
process.stdout.write(`DONE OK ${name}\n`);
} catch (e) {
} catch (err) {
process.stdout.write(`DONE FAIL ${name}\n`);
throw e;
throw err;
}
},
timeout