Merge pull request #59 from ben-eb/caniuse-lite

Migrate from caniuse-db to caniuse-lite. Closes #57 #60.

Author: Nyalab

package.json

@@ -17,8 +17,8 @@
     "dist"
   ],
   "dependencies": {
-    "browserslist": "^1.3.6",
-    "caniuse-db": "^1.0.30000529",
+    "browserslist": "^2.0.0",
+    "caniuse-lite": "^1.0.0",
     "lodash.memoize": "^4.1.2",
     "lodash.uniq": "^4.5.0"
   },
@@ -40,7 +40,7 @@
     "release": "npmpub"
   },
   "babel": {
-    "presets":[
+    "presets": [
       "babel-preset-latest"
     ]
   }

src/index.js

@@ -1,10 +1,9 @@
 import memoize from "lodash.memoize"
 import browserslist from "browserslist"
+import {features, feature as featureUnpack} from "caniuse-lite"
 
 import {contains, parseCaniuseData, cleanBrowsersList} from "./utils"
-import db from "caniuse-db/data.json"
 
-const features = db.data
 const featuresList = Object.keys(features)
 
 let browsers
@@ -16,14 +15,14 @@ function getBrowserScope() {
   return browsers
 }
 
-const parse = memoize(parseCaniuseData, function(feature, browsers) {
-  return feature.title + browsers
+const parse = memoize(parseCaniuseData, function(feat, browsers) {
+  return feat.title + browsers
 })
 
 function getSupport(query) {
   let feature
   try {
-    feature = features[query]
+    feature = featureUnpack(features[query])
   } catch(e) {
     let res = find(query)
     if (res.length === 1) return getSupport(res[0])
@@ -35,7 +34,7 @@ function getSupport(query) {
 function isSupported(feature, browsers) {
   let data
   try {
-    data = features[feature]
+    data = featureUnpack(features[feature])
   } catch(e) {
     let res = find(feature)
     if (res.length === 1) {

test/index.js

@@ -1,5 +1,6 @@
 import test from "tape"
 import browserslist from "browserslist"
+import {feature} from "caniuse-lite"
 import * as caniuse from "../src/index"
 import {cleanBrowsersList} from "../src/utils"
 
@@ -29,7 +30,7 @@ test("find tests", (t) => {
 
 test("getLatestStableBrowsers tests", (t) => {
   t.ok(caniuse.getLatestStableBrowsers().length, "it should return an array of results")
-  t.ok(caniuse.getLatestStableBrowsers().every((browser) => browser.match(/[A-z_]+ [0-9]+/)), "every entry is correctly formed")
+  t.ok(caniuse.getLatestStableBrowsers().every((browser) => browser.match(/[A-z_]+ ([0-9\.\-]+|all)/)), "every entry is correctly formed")
   t.end()
 })
 
@@ -60,7 +61,7 @@ test("isSupported test with browsers caniuse doesn't know", (t) => {
 test("getSupport tests", (t) => {
   caniuse.setBrowserScope()
 
-  const borderRadiusFeature = require('caniuse-db/features-json/border-radius')
+  const borderRadiusFeature = feature(require('caniuse-lite/data/features/border-radius'))
   const support = caniuse.getSupport("border-radius")
   t.ok(support.safari.y, "border-radius support is ok on some safari")
   t.throws(() => caniuse.getSupport("canaillou"),"throws if silly thing are asked")

test/utils.js

@@ -1,6 +1,7 @@
 import test from "tape"
 import browserslist from "browserslist"
 import uniq from "lodash.uniq"
+import {feature} from "caniuse-lite"
 import {contains, parseCaniuseData, cleanBrowsersList} from "../src/utils"
 
 test("contains should work", (t) => {
@@ -12,7 +13,7 @@ test("contains should work", (t) => {
 
 test("parseCaniuseData should work", (t) => {
   const browsers = cleanBrowsersList()
-  const borderRadiusFeature = require('caniuse-db/features-json/border-radius')
+  const borderRadiusFeature = feature(require('caniuse-lite/data/features/border-radius'))
   const parsed = parseCaniuseData(borderRadiusFeature, browsers)
 
   t.ok(parsed.safari.y, "border-radius support is ok on some safari")