update

node_modules/@babel/helper-compilation-targets/lib/debug.js

@@ -5,14 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getInclusionReasons = getInclusionReasons;
 
-var _semver = _interopRequireDefault(require("semver"));
+var _semver = require("semver");
 
 var _pretty = require("./pretty");
 
 var _utils = require("./utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function getInclusionReasons(item, targetVersions, list) {
   const minVersions = list[item] || {};
   return Object.keys(targetVersions).reduce((result, env) => {
@@ -25,7 +23,7 @@ function getInclusionReasons(item, targetVersions, list) {
       const minIsUnreleased = (0, _utils.isUnreleasedVersion)(minVersion, env);
       const targetIsUnreleased = (0, _utils.isUnreleasedVersion)(targetVersion, env);
 
-      if (!targetIsUnreleased && (minIsUnreleased || _semver.default.lt(targetVersion.toString(), (0, _utils.semverify)(minVersion)))) {
+      if (!targetIsUnreleased && (minIsUnreleased || _semver.lt(targetVersion.toString(), (0, _utils.semverify)(minVersion)))) {
         result[env] = (0, _pretty.prettifyVersion)(targetVersion);
       }
     }

node_modules/@babel/helper-compilation-targets/lib/filter-items.js

@@ -3,18 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.targetsSupported = targetsSupported;
-exports.isRequired = isRequired;
 exports.default = filterItems;
+exports.isRequired = isRequired;
+exports.targetsSupported = targetsSupported;
 
-var _semver = _interopRequireDefault(require("semver"));
+var _semver = require("semver");
 
-var _plugins = _interopRequireDefault(require("@babel/compat-data/plugins"));
+var _plugins = require("@babel/compat-data/plugins");
 
 var _utils = require("./utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function targetsSupported(target, support) {
   const targetEnvironments = Object.keys(target);
 
@@ -39,22 +37,22 @@ function targetsSupported(target, support) {
       return true;
     }
 
-    if (!_semver.default.valid(lowestTargetedVersion.toString())) {
+    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.default.gt((0, _utils.semverify)(lowestImplementedVersion), lowestTargetedVersion.toString());
+    return _semver.gt((0, _utils.semverify)(lowestImplementedVersion), lowestTargetedVersion.toString());
   });
   return unsupportedEnvironments.length === 0;
 }
 
 function isRequired(name, targets, {
-  compatData = _plugins.default,
+  compatData = _plugins,
   includes,
   excludes
 } = {}) {
-  if (excludes == null ? void 0 : excludes.has(name)) return false;
-  if (includes == null ? void 0 : includes.has(name)) return true;
+  if (excludes != null && excludes.has(name)) return false;
+  if (includes != null && includes.has(name)) return true;
   return !targetsSupported(targets, compatData[name]);
 }
 

node_modules/@babel/helper-compilation-targets/lib/index.js

@@ -3,18 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isBrowsersQueryValid = isBrowsersQueryValid;
-exports.default = getTargets;
-Object.defineProperty(exports, "unreleasedLabels", {
+Object.defineProperty(exports, "TargetNames", {
   enumerable: true,
   get: function () {
-    return _targets.unreleasedLabels;
+    return _options.TargetNames;
   }
 });
-Object.defineProperty(exports, "prettifyTargets", {
+exports.default = getTargets;
+Object.defineProperty(exports, "filterItems", {
   enumerable: true,
   get: function () {
-    return _pretty.prettifyTargets;
+    return _filterItems.default;
   }
 });
 Object.defineProperty(exports, "getInclusionReasons", {
@@ -23,26 +22,31 @@ Object.defineProperty(exports, "getInclusionReasons", {
     return _debug.getInclusionReasons;
   }
 });
-Object.defineProperty(exports, "filterItems", {
-  enumerable: true,
-  get: function () {
-    return _filterItems.default;
-  }
-});
+exports.isBrowsersQueryValid = isBrowsersQueryValid;
 Object.defineProperty(exports, "isRequired", {
   enumerable: true,
   get: function () {
     return _filterItems.isRequired;
   }
 });
+Object.defineProperty(exports, "prettifyTargets", {
+  enumerable: true,
+  get: function () {
+    return _pretty.prettifyTargets;
+  }
+});
+Object.defineProperty(exports, "unreleasedLabels", {
+  enumerable: true,
+  get: function () {
+    return _targets.unreleasedLabels;
+  }
+});
 
-var _browserslist = _interopRequireDefault(require("browserslist"));
+var _browserslist = require("browserslist");
 
-var _levenary = _interopRequireDefault(require("levenary"));
+var _helperValidatorOption = require("@babel/helper-validator-option");
 
-var _invariant = _interopRequireDefault(require("invariant"));
-
-var _nativeModules = _interopRequireDefault(require("@babel/compat-data/native-modules"));
+var _nativeModules = require("@babel/compat-data/native-modules");
 
 var _utils = require("./utils");
 
@@ -54,35 +58,18 @@ var _pretty = require("./pretty");
 
 var _debug = require("./debug");
 
-var _filterItems = _interopRequireWildcard(require("./filter-items"));
+var _filterItems = require("./filter-items");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const browserslistDefaults = _browserslist.default.defaults;
-const validBrowserslistTargets = [...Object.keys(_browserslist.default.data), ...Object.keys(_browserslist.default.aliases)];
-
-function objectToBrowserslist(object) {
-  return Object.keys(object).reduce((list, targetName) => {
-    if (validBrowserslistTargets.indexOf(targetName) >= 0) {
-      const targetVersion = object[targetName];
-      return list.concat(`${targetName} ${targetVersion}`);
-    }
-
-    return list;
-  }, []);
-}
+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 in targets) {
-    if (!_options.TargetNames[target]) {
-      throw new Error(`Invalid Option: '${target}' is not a valid target
-        Maybe you meant to use '${(0, _levenary.default)(target, validTargets)}'?`);
+  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)}'?`));
     }
   }
 
@@ -90,42 +77,42 @@ function validateTargetNames(targets) {
 }
 
 function isBrowsersQueryValid(browsers) {
-  return typeof browsers === "string" || Array.isArray(browsers);
+  return typeof browsers === "string" || Array.isArray(browsers) && browsers.every(b => typeof b === "string");
 }
 
 function validateBrowsers(browsers) {
-  (0, _invariant.default)(typeof browsers === "undefined" || isBrowsersQueryValid(browsers), `Invalid Option: '${String(browsers)}' is not a valid browserslist query`);
+  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 normalizedBrowserName = _targets.browserNameMap[browserName];
+    const target = _targets.browserNameMap[browserName];
 
-    if (!normalizedBrowserName) {
+    if (!target) {
       return all;
     }
 
     try {
       const splitVersion = browserVersion.split("-")[0].toLowerCase();
-      const isSplitUnreleased = (0, _utils.isUnreleasedVersion)(splitVersion, browserName);
+      const isSplitUnreleased = (0, _utils.isUnreleasedVersion)(splitVersion, target);
 
-      if (!all[normalizedBrowserName]) {
-        all[normalizedBrowserName] = isSplitUnreleased ? splitVersion : (0, _utils.semverify)(splitVersion);
+      if (!all[target]) {
+        all[target] = isSplitUnreleased ? splitVersion : (0, _utils.semverify)(splitVersion);
         return all;
       }
 
-      const version = all[normalizedBrowserName];
-      const isUnreleased = (0, _utils.isUnreleasedVersion)(version, browserName);
+      const version = all[target];
+      const isUnreleased = (0, _utils.isUnreleasedVersion)(version, target);
 
       if (isUnreleased && isSplitUnreleased) {
-        all[normalizedBrowserName] = (0, _utils.getLowestUnreleased)(version, splitVersion, browserName);
+        all[target] = (0, _utils.getLowestUnreleased)(version, splitVersion, target);
       } else if (isUnreleased) {
-        all[normalizedBrowserName] = (0, _utils.semverify)(splitVersion);
+        all[target] = (0, _utils.semverify)(splitVersion);
       } else if (!isUnreleased && !isSplitUnreleased) {
         const parsedBrowserVersion = (0, _utils.semverify)(splitVersion);
-        all[normalizedBrowserName] = (0, _utils.semverMin)(version, parsedBrowserVersion);
+        all[target] = (0, _utils.semverMin)(version, parsedBrowserVersion);
       }
     } catch (e) {}
 
@@ -134,102 +121,130 @@ function getLowestVersions(browsers) {
 }
 
 function outputDecimalWarning(decimalTargets) {
-  if (!(decimalTargets == null ? void 0 : decimalTargets.length)) {
+  if (!decimalTargets.length) {
     return;
   }
 
-  console.log("Warning, the following targets are using a decimal version:");
-  console.log("");
+  console.warn("Warning, the following targets are using a decimal version:\n");
   decimalTargets.forEach(({
     target,
     value
-  }) => console.log(`  ${target}: ${value}`));
-  console.log("");
-  console.log("We recommend using a string for minor/patch versions to avoid numbers like 6.10");
-  console.log("getting parsed as 6.1, which can lead to unexpected behavior.");
-  console.log("");
+  }) => console.warn(`  ${target}: ${value}`));
+  console.warn(`
+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);
   } catch (error) {
-    throw new Error(`Invalid Option: '${value}' is not a valid value for 'targets.${target}'.`);
+    throw new Error(v.formatMessage(`'${value}' is not a valid value for 'targets.${target}'.`));
   }
 }
 
-const targetParserMap = {
-  __default(target, value) {
-    const version = (0, _utils.isUnreleasedVersion)(value, target) ? value.toLowerCase() : semverifyTarget(target, value);
-    return [target, version];
-  },
+function nodeTargetParser(value) {
+  const parsed = value === true || value === "current" ? process.versions.node : semverifyTarget("node", value);
+  return ["node", parsed];
+}
 
-  node(target, value) {
-    const parsed = value === true || value === "current" ? process.versions.node : semverifyTarget(target, value);
-    return [target, parsed];
-  }
+function defaultTargetParser(target, value) {
+  const version = (0, _utils.isUnreleasedVersion)(value, target) ? value.toLowerCase() : semverifyTarget(target, value);
+  return [target, version];
+}
 
-};
-
-function getTargets(inputTargets = {}, options = {}) {
-  const targetOpts = {};
-  let {
-    browsers
-  } = inputTargets;
-
-  if (inputTargets.esmodules) {
-    const supportsESModules = _nativeModules.default["es6.module"];
-    browsers = Object.keys(supportsESModules).map(browser => `${browser} ${supportsESModules[browser]}`).join(", ");
-  }
-
-  const browsersquery = validateBrowsers(browsers);
+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);
+}
+
+function getTargets(inputTargets = {}, options = {}) {
+  var _browsers, _browsers2;
+
+  let {
+    browsers,
+    esmodules
+  } = inputTargets;
+  const {
+    configPath = "."
+  } = options;
+  validateBrowsers(browsers);
+  const input = generateTargets(inputTargets);
   let targets = validateTargetNames(input);
-  const shouldParseBrowsers = !!browsersquery;
+  const shouldParseBrowsers = !!browsers;
   const hasTargets = shouldParseBrowsers || Object.keys(targets).length > 0;
   const shouldSearchForConfig = !options.ignoreBrowserslistConfig && !hasTargets;
 
-  if (shouldParseBrowsers || shouldSearchForConfig) {
-    if (!hasTargets) {
-      _browserslist.default.defaults = objectToBrowserslist(targets);
-    }
-
-    const browsers = (0, _browserslist.default)(browsersquery, {
-      path: options.configPath,
-      mobileToDesktop: true,
+  if (!browsers && shouldSearchForConfig) {
+    browsers = _browserslist.loadConfig({
+      config: options.configFile,
+      path: configPath,
       env: options.browserslistEnv
     });
-    const queryBrowsers = getLowestVersions(browsers);
-    targets = Object.assign(queryBrowsers, targets);
-    _browserslist.default.defaults = browserslistDefaults;
+
+    if (browsers == null) {
+      {
+        browsers = [];
+      }
+    }
   }
 
-  const parsed = Object.keys(targets).sort().reduce((results, target) => {
-    var _targetParserMap$targ;
+  if (esmodules && (esmodules !== "intersect" || !((_browsers = browsers) != null && _browsers.length))) {
+    browsers = Object.keys(ESM_SUPPORT).map(browser => `${browser} >= ${ESM_SUPPORT[browser]}`).join(", ");
+    esmodules = false;
+  }
 
+  if ((_browsers2 = browsers) != null && _browsers2.length) {
+    const queryBrowsers = resolveTargets(browsers, options.browserslistEnv);
+
+    if (esmodules === "intersect") {
+      for (const browser of Object.keys(queryBrowsers)) {
+        const version = queryBrowsers[browser];
+        const esmSupportVersion = ESM_SUPPORT[browser];
+
+        if (esmSupportVersion) {
+          queryBrowsers[browser] = (0, _utils.getHighestUnreleased)(version, (0, _utils.semverify)(esmSupportVersion), browser);
+        } else {
+          delete queryBrowsers[browser];
+        }
+      }
+    }
+
+    targets = Object.assign(queryBrowsers, targets);
+  }
+
+  const result = {};
+  const decimalWarnings = [];
+
+  for (const target of Object.keys(targets).sort()) {
     const value = targets[target];
 
     if (typeof value === "number" && value % 1 !== 0) {
-      results.decimalWarnings.push({
+      decimalWarnings.push({
         target,
         value
       });
     }
 
-    const parser = (_targetParserMap$targ = targetParserMap[target]) != null ? _targetParserMap$targ : targetParserMap.__default;
-    const [parsedTarget, parsedValue] = parser(target, value);
+    const [parsedTarget, parsedValue] = target === "node" ? nodeTargetParser(value) : defaultTargetParser(target, value);
 
     if (parsedValue) {
-      results.targets[parsedTarget] = parsedValue;
+      result[parsedTarget] = parsedValue;
     }
+  }
 
-    return results;
-  }, {
-    targets: targetOpts,
-    decimalWarnings: []
-  });
-  outputDecimalWarning(parsed.decimalWarnings);
-  return parsed.targets;
+  outputDecimalWarning(decimalWarnings);
+  return result;
 }

node_modules/@babel/helper-compilation-targets/lib/options.js

@@ -15,6 +15,7 @@ const TargetNames = {
   ios: "ios",
   android: "android",
   electron: "electron",
-  samsung: "samsung"
+  samsung: "samsung",
+  rhino: "rhino"
 };
 exports.TargetNames = TargetNames;

node_modules/@babel/helper-compilation-targets/lib/pretty.js

@@ -3,25 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.prettifyVersion = prettifyVersion;
 exports.prettifyTargets = prettifyTargets;
+exports.prettifyVersion = prettifyVersion;
 
-var _semver = _interopRequireDefault(require("semver"));
+var _semver = require("semver");
 
 var _targets = require("./targets");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function prettifyVersion(version) {
   if (typeof version !== "string") {
     return version;
   }
 
-  const parts = [_semver.default.major(version)];
+  const parts = [_semver.major(version)];
 
-  const minor = _semver.default.minor(version);
+  const minor = _semver.minor(version);
 
-  const patch = _semver.default.patch(version);
+  const patch = _semver.patch(version);
 
   if (minor || patch) {
     parts.push(minor);

node_modules/@babel/helper-compilation-targets/lib/targets.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.browserNameMap = exports.unreleasedLabels = void 0;
+exports.unreleasedLabels = exports.browserNameMap = void 0;
 const unreleasedLabels = {
   safari: "tp"
 };

node_modules/@babel/helper-compilation-targets/lib/utils.js

@@ -3,32 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getHighestUnreleased = getHighestUnreleased;
+exports.getLowestImplementedVersion = getLowestImplementedVersion;
+exports.getLowestUnreleased = getLowestUnreleased;
+exports.isUnreleasedVersion = isUnreleasedVersion;
 exports.semverMin = semverMin;
 exports.semverify = semverify;
-exports.isUnreleasedVersion = isUnreleasedVersion;
-exports.getLowestUnreleased = getLowestUnreleased;
-exports.getLowestImplementedVersion = getLowestImplementedVersion;
 
-var _invariant = _interopRequireDefault(require("invariant"));
+var _semver = require("semver");
 
-var _semver = _interopRequireDefault(require("semver"));
+var _helperValidatorOption = require("@babel/helper-validator-option");
 
 var _targets = require("./targets");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const versionRegExp = /^(\d+|\d+.\d+)$/;
+const v = new _helperValidatorOption.OptionValidator("@babel/helper-compilation-targets");
 
 function semverMin(first, second) {
-  return first && _semver.default.lt(first, second) ? first : second;
+  return first && _semver.lt(first, second) ? first : second;
 }
 
 function semverify(version) {
-  if (typeof version === "string" && _semver.default.valid(version)) {
+  if (typeof version === "string" && _semver.valid(version)) {
     return version;
   }
 
-  (0, _invariant.default)(typeof version === "number" || typeof version === "string" && versionRegExp.test(version), `'${version}' is not a valid 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) {
@@ -45,15 +45,22 @@ function isUnreleasedVersion(version, env) {
 
 function getLowestUnreleased(a, b, env) {
   const unreleasedLabel = _targets.unreleasedLabels[env];
-  const hasUnreleased = [a, b].some(item => item === unreleasedLabel);
 
-  if (hasUnreleased) {
-    return a === hasUnreleased ? b : a || b;
+  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];