|
1 | 1 | // @ts-check
|
2 | 2 |
|
3 | 3 | // @ts-ignore
|
4 |
| -import { fs as nodeFs, module, os, path } from "#node-imports"; |
5 |
| -const dynamicRequire = module.createRequire(import.meta.url); |
| 4 | +import { fs as nodeFs, os, path } from "#node-imports"; |
6 | 5 | import { initialize as cacheInitialize } from "./cache.mjs";
|
7 | 6 | import { version } from "./constants.mjs";
|
| 7 | +import { requireMarkdownItCjs } from "./defer-require.cjs"; |
| 8 | +import { resolveModule } from "./resolve-module.cjs"; |
8 | 9 | import rules from "./rules.mjs";
|
9 | 10 | import { parse as micromarkParse } from "./micromark-parse.mjs";
|
10 | 11 | import * as helpers from "../helpers/helpers.cjs";
|
@@ -501,7 +502,7 @@ function lintContent(
|
501 | 502 | // Parse content into lines and get markdown-it tokens
|
502 | 503 | const lines = content.split(helpers.newLineRe);
|
503 | 504 | const markdownitTokens = needMarkdownItTokens ?
|
504 |
| - dynamicRequire("./markdownit.cjs").getMarkdownItTokens(markdownItPlugins, preClearedContent, lines) : |
| 505 | + requireMarkdownItCjs().getMarkdownItTokens(markdownItPlugins, preClearedContent, lines) : |
505 | 506 | [];
|
506 | 507 | // Create (frozen) parameters for rules
|
507 | 508 | /** @type {MarkdownParsers} */
|
@@ -1010,10 +1011,10 @@ function resolveConfigExtends(configFile, referenceId, fs, callback) {
|
1010 | 1011 | if (err) {
|
1011 | 1012 | // Not a file, try require.resolve
|
1012 | 1013 | try {
|
1013 |
| - return callback(null, dynamicRequire.resolve( |
1014 |
| - referenceId, |
1015 |
| - { "paths": [ configFileDirname ] } |
1016 |
| - )); |
| 1014 | + return callback( |
| 1015 | + null, |
| 1016 | + resolveModule(referenceId, [ configFileDirname ]) |
| 1017 | + ); |
1017 | 1018 | } catch {
|
1018 | 1019 | // Unable to resolve, use resolvedExtendsFile
|
1019 | 1020 | }
|
@@ -1041,10 +1042,7 @@ function resolveConfigExtendsSync(configFile, referenceId, fs) {
|
1041 | 1042 | // Not a file, try require.resolve
|
1042 | 1043 | }
|
1043 | 1044 | try {
|
1044 |
| - return dynamicRequire.resolve( |
1045 |
| - referenceId, |
1046 |
| - { "paths": [ configFileDirname ] } |
1047 |
| - ); |
| 1045 | + return resolveModule(referenceId, [ configFileDirname ]); |
1048 | 1046 | } catch {
|
1049 | 1047 | // Unable to resolve, return resolvedExtendsFile
|
1050 | 1048 | }
|
|
0 commit comments