browserslist 4.9.0 → 4.9.1

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.9.1
+* Normalize incorrect Can I Use regional data (by Huáng Jùnliàng).
+
 ## 4.9
 * Add `node X-Y` query support (by Yuping Zuo).
 

package/index.js

@@ -588,7 +588,7 @@ browserslist.coverage = function (browsers, stats) {
     } else {
       stats = stats.toUpperCase()
     }
-    env.loadCountry(browserslist.usage, stats)
+    env.loadCountry(browserslist.usage, stats, browserslist.data)
     data = browserslist.usage[stats]
   } else {
     if ('dataByBrowser' in stats) {
@@ -823,7 +823,7 @@ var QUERIES = [
       } else {
         place = place.toLowerCase()
       }
-      env.loadCountry(browserslist.usage, place)
+      env.loadCountry(browserslist.usage, place, browserslist.data)
       var usage = browserslist.usage[place]
       return Object.keys(usage).reduce(function (result, version) {
         if (sign === '>') {
@@ -866,7 +866,7 @@ var QUERIES = [
           } else {
             place = place.toLowerCase()
           }
-          env.loadCountry(browserslist.usage, place)
+          env.loadCountry(browserslist.usage, place, browserslist.data)
           usage = browserslist.usage[place]
         }
       }

package/node.js

@@ -137,6 +137,20 @@ function normalizeStats (data, stats) {
   return normalized
 }
 
+function normalizeUsageData (usageData, data) {
+  for (var browser in usageData) {
+    var browserUsage = usageData[browser]
+    // eslint-disable-next-line max-len
+    // https://github.com/browserslist/browserslist/issues/431#issuecomment-565230615
+    // caniuse-db returns { 0: "percentage" } for `and_*` regional stats
+    if ('0' in browserUsage) {
+      var versions = data[browser].versions
+      browserUsage[versions[versions.length - 1]] = browserUsage[0]
+      delete browserUsage[0]
+    }
+  }
+}
+
 module.exports = {
   loadQueries: function loadQueries (context, name) {
     if (!context.dangerousExtend) checkExtend(name)
@@ -201,16 +215,17 @@ module.exports = {
     }
   },
 
-  loadCountry: function loadCountry (usage, country) {
+  loadCountry: function loadCountry (usage, country, data) {
     var code = country.replace(/[^\w-]/g, '')
     if (!usage[code]) {
       // eslint-disable-next-line security/detect-non-literal-require
       var compressed = require('caniuse-lite/data/regions/' + code + '.js')
-      var data = region(compressed)
+      var usageData = region(compressed)
+      normalizeUsageData(usageData, data)
       usage[country] = { }
-      for (var i in data) {
-        for (var j in data[i]) {
-          usage[country][i + ' ' + j] = data[i][j]
+      for (var i in usageData) {
+        for (var j in usageData[i]) {
+          usage[country][i + ' ' + j] = usageData[i][j]
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -16,7 +16,7 @@
   "repository": "browserslist/browserslist",
   "dependencies": {
     "caniuse-lite": "^1.0.30001030",
-    "electron-to-chromium": "^1.3.361",
+    "electron-to-chromium": "^1.3.363",
     "node-releases": "^1.1.50"
   },
   "bin": "./cli.js",