Skip to content

Commit cce77da

Browse files
committed
chore: convert lib/utils.js to ESM
1 parent fb1998a commit cce77da

30 files changed

Lines changed: 109 additions & 102 deletions

lib/cli/cli.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { fileURLToPath } from "node:url";
1313
import { loadOptions, YARGS_PARSER_CONFIG } from "./options.mjs";
1414
import { run, init } from "./commands.mjs";
1515
import pc from "picocolors";
16-
import { logSymbols } from "../utils.js";
16+
import { logSymbols } from "../utils.mjs";
1717

1818
import packageJson from "../../package.json" with { type: "json" };
1919

lib/cli/collect-files.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const debug = require("debug")("mocha:cli:run:helpers");
66
const { minimatch } = require("minimatch");
77
const { NO_FILES_MATCH_PATTERN } = require("../error-constants.mjs").constants;
88
const { lookupFiles } = require("./lookup-files.mjs");
9-
const { castArray } = require("../utils");
9+
const { castArray } = require("../utils.mjs");
1010

1111
/**
1212
* Exports a function that collects test files from CLI parameters.

lib/cli/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const path = require("node:path");
1212
const debug = require("debug")("mocha:cli:config");
1313
const findUp = require("find-up");
1414
const { createUnparsableFileError } = require("../errors.mjs");
15-
const utils = require("../utils");
15+
const utils = require("../utils.mjs");
1616

1717
/**
1818
* These are the valid config files, in order of precedence;

lib/cli/options.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
createInvalidArgumentTypeError,
2828
createUnsupportedError,
2929
} from "../errors.mjs";
30-
import { isNumeric } from "../utils.js";
30+
import { isNumeric } from "../utils.mjs";
3131

3232
/**
3333
* The `yargs-parser` namespace

lib/cli/run.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const { ONE_AND_DONES, ONE_AND_DONE_ARGS } = require("./one-and-dones.mjs");
2525
const debug = require("debug")("mocha:cli:run");
2626
const defaults = require("../mocharc.json");
2727
const { types, aliases } = require("./run-option-metadata.mjs");
28-
const { isCI, logSymbols } = require("../utils");
28+
const { isCI, logSymbols } = require("../utils.mjs");
2929

3030
/**
3131
* Logical option groups

lib/cli/watch-run.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const isPathInside = require("is-path-inside");
88
const { minimatch } = require("minimatch");
99
const Context = require("../context.mjs").Context;
1010
const collectFiles = require("./collect-files");
11-
const { logSymbols } = require("../utils");
11+
const { logSymbols } = require("../utils.mjs");
1212

1313
/**
1414
* @typedef {import('chokidar').FSWatcher} FSWatcher

lib/errors.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import { format } from "node:util";
99
import { constants } from "./error-constants.mjs";
10-
import { isCI } from "./utils.js";
10+
import { isCI } from "./utils.mjs";
1111

1212
/**
1313
* Contains error codes and factory functions to create throwable error objects

lib/hook.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Runnable } from "./runnable.mjs";
2-
import utils from "./utils.js";
2+
import * as utils from "./utils.mjs";
33

44
const { MOCHA_ID_PROP_NAME } = utils.constants;
55

lib/mocha.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
var { escapeRegExp } = require("./utils/regexp.mjs");
1010
var path = require("node:path");
1111
var builtinReporters = require("./reporters");
12-
var utils = require("./utils");
12+
var utils = require("./utils.mjs");
1313
var mocharc = require("./mocharc.json");
1414
var { Suite } = require("./suite.mjs");
1515
var esmUtils = require("./nodejs/esm-utils");

lib/nodejs/parallel-buffered-runner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const { EVENT_RUN_BEGIN, EVENT_RUN_END } = Runner.constants;
1818
const debug = require("debug")("mocha:parallel:parallel-buffered-runner");
1919
const { BufferedWorkerPool } = require("./buffered-worker-pool");
2020
const { setInterval, clearInterval } = global;
21-
const { createMap, constants } = require("../utils");
21+
const { createMap, constants } = require("../utils.mjs");
2222
const { MOCHA_ID_PROP_NAME } = constants;
2323
const { createFatalError } = require("../errors.mjs");
2424

0 commit comments

Comments
 (0)