Bump the npm group with 2 updates (#1819)
* Bump the npm group with 2 updates Bumps the npm group with 2 updates: [eslint](https://github.com/eslint/eslint) and [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import). Updates `eslint` from 8.45.0 to 8.46.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.45.0...v8.46.0) Updates `eslint-plugin-import` from 2.27.5 to 2.28.0 - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.27.5...v2.28.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com> * Update checked-in dependencies --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
parent
a6b0ced86b
commit
e7e35baaf0
1408 changed files with 27215 additions and 9910 deletions
44
node_modules/eslint-module-utils/parse.js
generated
vendored
44
node_modules/eslint-module-utils/parse.js
generated
vendored
|
|
@ -1,4 +1,5 @@
|
|||
'use strict';
|
||||
|
||||
exports.__esModule = true;
|
||||
|
||||
const moduleRequire = require('./module-require').default;
|
||||
|
|
@ -23,10 +24,10 @@ function keysFromParser(parserPath, parserInstance, parsedResult) {
|
|||
if (parsedResult && parsedResult.visitorKeys) {
|
||||
return parsedResult.visitorKeys;
|
||||
}
|
||||
if (/.*espree.*/.test(parserPath)) {
|
||||
if (typeof parserPath === 'string' && (/.*espree.*/).test(parserPath)) {
|
||||
return parserInstance.VisitorKeys;
|
||||
}
|
||||
if (/.*babel-eslint.*/.test(parserPath)) {
|
||||
if (typeof parserPath === 'string' && (/.*babel-eslint.*/).test(parserPath)) {
|
||||
return getBabelEslintVisitorKeys(parserPath);
|
||||
}
|
||||
return null;
|
||||
|
|
@ -51,13 +52,13 @@ function transformHashbang(text) {
|
|||
}
|
||||
|
||||
exports.default = function parse(path, content, context) {
|
||||
if (context == null) { throw new Error('need context to parse properly'); }
|
||||
|
||||
if (context == null) throw new Error('need context to parse properly');
|
||||
// ESLint in "flat" mode only sets context.languageOptions.parserOptions
|
||||
let parserOptions = context.languageOptions && context.languageOptions.parserOptions || context.parserOptions;
|
||||
const parserOrPath = getParser(path, context);
|
||||
|
||||
let parserOptions = context.parserOptions;
|
||||
const parserPath = getParserPath(path, context);
|
||||
|
||||
if (!parserPath) throw new Error('parserPath is required!');
|
||||
if (!parserOrPath) { throw new Error('parserPath or languageOptions.parser is required!'); }
|
||||
|
||||
// hack: espree blows up with frozen options
|
||||
parserOptions = Object.assign({}, parserOptions);
|
||||
|
|
@ -84,7 +85,7 @@ exports.default = function parse(path, content, context) {
|
|||
delete parserOptions.projects;
|
||||
|
||||
// require the parser relative to the main module (i.e., ESLint)
|
||||
const parser = moduleRequire(parserPath);
|
||||
const parser = typeof parserOrPath === 'string' ? moduleRequire(parserOrPath) : parserOrPath;
|
||||
|
||||
// replicate bom strip and hashbang transform of ESLint
|
||||
// https://github.com/eslint/eslint/blob/b93af98b3c417225a027cabc964c38e779adb945/lib/linter/linter.js#L779
|
||||
|
|
@ -95,7 +96,7 @@ exports.default = function parse(path, content, context) {
|
|||
try {
|
||||
const parserRaw = parser.parseForESLint(content, parserOptions);
|
||||
ast = parserRaw.ast;
|
||||
return makeParseReturn(ast, keysFromParser(parserPath, parser, parserRaw));
|
||||
return makeParseReturn(ast, keysFromParser(parserOrPath, parser, parserRaw));
|
||||
} catch (e) {
|
||||
console.warn();
|
||||
console.warn('Error while parsing ' + parserOptions.filePath);
|
||||
|
|
@ -103,19 +104,34 @@ exports.default = function parse(path, content, context) {
|
|||
}
|
||||
if (!ast || typeof ast !== 'object') {
|
||||
console.warn(
|
||||
'`parseForESLint` from parser `' +
|
||||
parserPath +
|
||||
'` is invalid and will just be ignored'
|
||||
// Can only be invalid for custom parser per imports/parser
|
||||
'`parseForESLint` from parser `' + (typeof parserOrPath === 'string' ? parserOrPath : '`context.languageOptions.parser`') + '` is invalid and will just be ignored'
|
||||
);
|
||||
} else {
|
||||
return makeParseReturn(ast, keysFromParser(parserPath, parser, undefined));
|
||||
return makeParseReturn(ast, keysFromParser(parserOrPath, parser, undefined));
|
||||
}
|
||||
}
|
||||
|
||||
const ast = parser.parse(content, parserOptions);
|
||||
return makeParseReturn(ast, keysFromParser(parserPath, parser, undefined));
|
||||
return makeParseReturn(ast, keysFromParser(parserOrPath, parser, undefined));
|
||||
};
|
||||
|
||||
function getParser(path, context) {
|
||||
const parserPath = getParserPath(path, context);
|
||||
if (parserPath) {
|
||||
return parserPath;
|
||||
}
|
||||
const isFlat = context.languageOptions
|
||||
&& context.languageOptions.parser
|
||||
&& typeof context.languageOptions.parser !== 'string'
|
||||
&& (
|
||||
typeof context.languageOptions.parser.parse === 'function'
|
||||
|| typeof context.languageOptions.parser.parseForESLint === 'function'
|
||||
);
|
||||
|
||||
return isFlat ? context.languageOptions.parser : null;
|
||||
}
|
||||
|
||||
function getParserPath(path, context) {
|
||||
const parsers = context.settings['import/parsers'];
|
||||
if (parsers != null) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue