diff options
Diffstat (limited to 'tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets')
6 files changed, 39 insertions, 107 deletions
diff --git a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/debug.js b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/debug.js index b7a6332278..0fefa43cca 100644 --- a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/debug.js +++ b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/debug.js @@ -4,30 +4,23 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.getInclusionReasons = getInclusionReasons; - var _semver = require("semver"); - var _pretty = require("./pretty"); - var _utils = require("./utils"); - function getInclusionReasons(item, targetVersions, list) { const minVersions = list[item] || {}; return Object.keys(targetVersions).reduce((result, env) => { const minVersion = (0, _utils.getLowestImplementedVersion)(minVersions, env); const targetVersion = targetVersions[env]; - if (!minVersion) { result[env] = (0, _pretty.prettifyVersion)(targetVersion); } else { const minIsUnreleased = (0, _utils.isUnreleasedVersion)(minVersion, env); const targetIsUnreleased = (0, _utils.isUnreleasedVersion)(targetVersion, env); - if (!targetIsUnreleased && (minIsUnreleased || _semver.lt(targetVersion.toString(), (0, _utils.semverify)(minVersion)))) { result[env] = (0, _pretty.prettifyVersion)(targetVersion); } } - return result; }, {}); } diff --git a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/filter-items.js b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/filter-items.js index 4cb3fa6c81..f1945ebe9f 100644 --- a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/filter-items.js +++ b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/filter-items.js @@ -6,27 +6,20 @@ Object.defineProperty(exports, "__esModule", { exports.default = filterItems; exports.isRequired = isRequired; exports.targetsSupported = targetsSupported; - var _semver = require("semver"); - var _plugins = require("@babel/compat-data/plugins"); - var _utils = require("./utils"); - function targetsSupported(target, support) { const targetEnvironments = Object.keys(target); - if (targetEnvironments.length === 0) { return false; } - const unsupportedEnvironments = targetEnvironments.filter(environment => { const lowestImplementedVersion = (0, _utils.getLowestImplementedVersion)(support, environment); if (!lowestImplementedVersion) { return true; } - const lowestTargetedVersion = target[environment]; if ((0, _utils.isUnreleasedVersion)(lowestTargetedVersion, environment)) { @@ -36,16 +29,13 @@ function targetsSupported(target, support) { if ((0, _utils.isUnreleasedVersion)(lowestImplementedVersion, environment)) { return true; } - if (!_semver.valid(lowestTargetedVersion.toString())) { throw new Error(`Invalid version passed for target "${environment}": "${lowestTargetedVersion}". ` + "Versions must be in semver format (major.minor.patch)"); } - return _semver.gt((0, _utils.semverify)(lowestImplementedVersion), lowestTargetedVersion.toString()); }); return unsupportedEnvironments.length === 0; } - function isRequired(name, targets, { compatData = _plugins, includes, @@ -55,7 +45,6 @@ function isRequired(name, targets, { if (includes != null && includes.has(name)) return true; return !targetsSupported(targets, compatData[name]); } - function filterItems(list, includes, excludes, targets, defaultIncludes, defaultExcludes, pluginSyntaxMap) { const result = new Set(); const options = { @@ -63,27 +52,22 @@ function filterItems(list, includes, excludes, targets, defaultIncludes, default includes, excludes }; - for (const item in list) { if (isRequired(item, targets, options)) { result.add(item); } else if (pluginSyntaxMap) { const shippedProposalsSyntax = pluginSyntaxMap.get(item); - if (shippedProposalsSyntax) { result.add(shippedProposalsSyntax); } } } - if (defaultIncludes) { defaultIncludes.forEach(item => !excludes.has(item) && result.add(item)); } - if (defaultExcludes) { defaultExcludes.forEach(item => !includes.has(item) && result.delete(item)); } - return result; } diff --git a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/index.js b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/index.js index 952d3a3d6c..2d2460af66 100644 --- a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/index.js +++ b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/index.js @@ -41,71 +41,51 @@ Object.defineProperty(exports, "unreleasedLabels", { return _targets.unreleasedLabels; } }); - var _browserslist = require("browserslist"); - var _helperValidatorOption = require("@babel/helper-validator-option"); - var _nativeModules = require("@babel/compat-data/native-modules"); - +var _lruCache = require("lru-cache"); var _utils = require("./utils"); - var _targets = require("./targets"); - var _options = require("./options"); - var _pretty = require("./pretty"); - var _debug = require("./debug"); - var _filterItems = require("./filter-items"); - const ESM_SUPPORT = _nativeModules["es6.module"]; const v = new _helperValidatorOption.OptionValidator("@babel/helper-compilation-targets"); - function validateTargetNames(targets) { const validTargets = Object.keys(_options.TargetNames); - for (const target of Object.keys(targets)) { if (!(target in _options.TargetNames)) { throw new Error(v.formatMessage(`'${target}' is not a valid target - Did you mean '${(0, _helperValidatorOption.findSuggestion)(target, validTargets)}'?`)); } } - return targets; } - function isBrowsersQueryValid(browsers) { return typeof browsers === "string" || Array.isArray(browsers) && browsers.every(b => typeof b === "string"); } - function validateBrowsers(browsers) { v.invariant(browsers === undefined || isBrowsersQueryValid(browsers), `'${String(browsers)}' is not a valid browserslist query`); return browsers; } - function getLowestVersions(browsers) { return browsers.reduce((all, browser) => { const [browserName, browserVersion] = browser.split(" "); const target = _targets.browserNameMap[browserName]; - if (!target) { return all; } - try { const splitVersion = browserVersion.split("-")[0].toLowerCase(); const isSplitUnreleased = (0, _utils.isUnreleasedVersion)(splitVersion, target); - if (!all[target]) { all[target] = isSplitUnreleased ? splitVersion : (0, _utils.semverify)(splitVersion); return all; } - const version = all[target]; const isUnreleased = (0, _utils.isUnreleasedVersion)(version, target); - if (isUnreleased && isSplitUnreleased) { all[target] = (0, _utils.getLowestUnreleased)(version, splitVersion, target); } else if (isUnreleased) { @@ -115,16 +95,13 @@ function getLowestVersions(browsers) { all[target] = (0, _utils.semverMin)(version, parsedBrowserVersion); } } catch (e) {} - return all; }, {}); } - function outputDecimalWarning(decimalTargets) { if (!decimalTargets.length) { return; } - console.warn("Warning, the following targets are using a decimal version:\n"); decimalTargets.forEach(({ target, @@ -135,7 +112,6 @@ We recommend using a string for minor/patch versions to avoid numbers like 6.10 getting parsed as 6.1, which can lead to unexpected behavior. `); } - function semverifyTarget(target, value) { try { return (0, _utils.semverify)(value); @@ -148,31 +124,37 @@ function nodeTargetParser(value) { const parsed = value === true || value === "current" ? process.versions.node : semverifyTarget("node", value); return ["node", parsed]; } - function defaultTargetParser(target, value) { const version = (0, _utils.isUnreleasedVersion)(value, target) ? value.toLowerCase() : semverifyTarget(target, value); return [target, version]; } - function generateTargets(inputTargets) { const input = Object.assign({}, inputTargets); delete input.esmodules; delete input.browsers; return input; } - function resolveTargets(queries, env) { const resolved = _browserslist(queries, { mobileToDesktop: true, env }); - return getLowestVersions(resolved); } - +const targetsCache = new _lruCache({ + max: 64 +}); +function resolveTargetsCached(queries, env) { + const cacheKey = typeof queries === "string" ? queries : queries.join() + env; + let cached = targetsCache.get(cacheKey); + if (!cached) { + cached = resolveTargets(queries, env); + targetsCache.set(cacheKey, cached); + } + return Object.assign({}, cached); +} function getTargets(inputTargets = {}, options = {}) { var _browsers, _browsers2; - let { browsers, esmodules @@ -186,14 +168,12 @@ function getTargets(inputTargets = {}, options = {}) { const shouldParseBrowsers = !!browsers; const hasTargets = shouldParseBrowsers || Object.keys(targets).length > 0; const shouldSearchForConfig = !options.ignoreBrowserslistConfig && !hasTargets; - if (!browsers && shouldSearchForConfig) { browsers = _browserslist.loadConfig({ config: options.configFile, path: configPath, env: options.browserslistEnv }); - if (browsers == null) { { browsers = []; @@ -207,13 +187,12 @@ function getTargets(inputTargets = {}, options = {}) { } if ((_browsers2 = browsers) != null && _browsers2.length) { - const queryBrowsers = resolveTargets(browsers, options.browserslistEnv); - + const queryBrowsers = resolveTargetsCached(browsers, options.browserslistEnv); if (esmodules === "intersect") { for (const browser of Object.keys(queryBrowsers)) { const version = queryBrowsers[browser]; - const esmSupportVersion = ESM_SUPPORT[browser]; - + const esmSupportVersion = + ESM_SUPPORT[browser]; if (esmSupportVersion) { queryBrowsers[browser] = (0, _utils.getHighestUnreleased)(version, (0, _utils.semverify)(esmSupportVersion), browser); } else { @@ -221,13 +200,11 @@ function getTargets(inputTargets = {}, options = {}) { } } } - targets = Object.assign(queryBrowsers, targets); } const result = {}; const decimalWarnings = []; - for (const target of Object.keys(targets).sort()) { const value = targets[target]; @@ -237,14 +214,11 @@ function getTargets(inputTargets = {}, options = {}) { value }); } - const [parsedTarget, parsedValue] = target === "node" ? nodeTargetParser(value) : defaultTargetParser(target, value); - if (parsedValue) { result[parsedTarget] = parsedValue; } } - outputDecimalWarning(decimalWarnings); return result; } diff --git a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/pretty.js b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/pretty.js index 322555f33e..7ef31b4796 100644 --- a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/pretty.js +++ b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/pretty.js @@ -5,42 +5,34 @@ Object.defineProperty(exports, "__esModule", { }); exports.prettifyTargets = prettifyTargets; exports.prettifyVersion = prettifyVersion; - var _semver = require("semver"); - var _targets = require("./targets"); - function prettifyVersion(version) { if (typeof version !== "string") { return version; } - - const parts = [_semver.major(version)]; - - const minor = _semver.minor(version); - - const patch = _semver.patch(version); - + const { + major, + minor, + patch + } = _semver.parse(version); + const parts = [major]; if (minor || patch) { parts.push(minor); } - if (patch) { parts.push(patch); } - return parts.join("."); } - function prettifyTargets(targets) { return Object.keys(targets).reduce((results, target) => { let value = targets[target]; - const unreleasedLabel = _targets.unreleasedLabels[target]; - + const unreleasedLabel = + _targets.unreleasedLabels[target]; if (typeof value === "string" && unreleasedLabel !== value) { value = prettifyVersion(value); } - results[target] = value; return results; }, {}); diff --git a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/utils.js b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/utils.js index f046054d7c..c52b36ab13 100644 --- a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/utils.js +++ b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/lib/utils.js @@ -9,16 +9,11 @@ exports.getLowestUnreleased = getLowestUnreleased; exports.isUnreleasedVersion = isUnreleasedVersion; exports.semverMin = semverMin; exports.semverify = semverify; - var _semver = require("semver"); - var _helperValidatorOption = require("@babel/helper-validator-option"); - var _targets = require("./targets"); - const versionRegExp = /^(\d+|\d+.\d+)$/; const v = new _helperValidatorOption.OptionValidator("@babel/helper-compilation-targets"); - function semverMin(first, second) { return first && _semver.lt(first, second) ? first : second; } @@ -27,47 +22,39 @@ function semverify(version) { if (typeof version === "string" && _semver.valid(version)) { return version; } - v.invariant(typeof version === "number" || typeof version === "string" && versionRegExp.test(version), `'${version}' is not a valid version`); - const split = version.toString().split("."); - - while (split.length < 3) { - split.push("0"); + version = version.toString(); + let pos = 0; + let num = 0; + while ((pos = version.indexOf(".", pos + 1)) > 0) { + num++; } - - return split.join("."); + return version + ".0".repeat(2 - num); } - function isUnreleasedVersion(version, env) { - const unreleasedLabel = _targets.unreleasedLabels[env]; + const unreleasedLabel = + _targets.unreleasedLabels[env]; return !!unreleasedLabel && unreleasedLabel === version.toString().toLowerCase(); } - function getLowestUnreleased(a, b, env) { - const unreleasedLabel = _targets.unreleasedLabels[env]; - + const unreleasedLabel = + _targets.unreleasedLabels[env]; if (a === unreleasedLabel) { return b; } - if (b === unreleasedLabel) { return a; } - return semverMin(a, b); } - function getHighestUnreleased(a, b, env) { return getLowestUnreleased(a, b, env) === a ? b : a; } - function getLowestImplementedVersion(plugin, environment) { const result = plugin[environment]; - if (!result && environment === "android") { return plugin.chrome; } - return result; } diff --git a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/package.json b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/package.json index 10efaf2d6e..994dbfe5cc 100644 --- a/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/package.json +++ b/tools/node_modules/eslint/node_modules/@babel/helper-compilation-targets/package.json @@ -1,6 +1,6 @@ { "name": "@babel/helper-compilation-targets", - "version": "7.20.0", + "version": "7.20.7", "author": "The Babel Team (https://babel.dev/team)", "license": "MIT", "description": "Helper functions on Babel compilation targets", @@ -22,17 +22,19 @@ "babel-plugin" ], "dependencies": { - "@babel/compat-data": "^7.20.0", + "@babel/compat-data": "^7.20.5", "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.21.3", + "lru-cache": "^5.1.1", "semver": "^6.3.0" }, "peerDependencies": { "@babel/core": "^7.0.0" }, "devDependencies": { - "@babel/core": "^7.19.6", + "@babel/core": "^7.20.7", "@babel/helper-plugin-test-runner": "^7.18.6", + "@types/lru-cache": "^5.1.1", "@types/semver": "^5.5.0" }, "engines": { |