Merge pull request #1 from fastmonkeys/ua-parser-js

ua-parser-js

Author: jpvanhal

.eslintignore

@@ -0,0 +1 @@
+dist/

.gitignore

@@ -1 +1,2 @@
+dist/
 node_modules/

caniuse-db-loader.js

@@ -0,0 +1,8 @@
+module.exports = function loader(source) {
+  var data;
+  if (this.cacheable) {
+    this.cacheable();
+  }
+  data = JSON.parse(source);
+  return JSON.stringify({ agents: data.agents });
+};

index.js

@@ -1,24 +1,31 @@
 var browserslist = require('browserslist');
-var useragent = require('useragent');
+var parser = require('ua-parser-js');
 
-function getBrowserName(family) {
-  var browserNames = {
-    'BlackBerry WebKit': 'bb',
-    'Chrome Mobile': 'and_chr',
-    'Firefox Mobile': 'and_ff',
-    'IE Mobile': 'ie_mob',
-    'Mobile Safari': 'ios_saf',
-    'Opera Mobile': 'op_mob',
-    'Samsung Internet': 'samsung',
-    'UC Browser': 'and_uc'
-  };
-  return browserNames[family] || family;
+function getBrowserName(agent) {
+  if (agent.browser.name === 'Android Browser') {
+    return 'android';
+  } else if (agent.os.name === 'BlackBerry') {
+    return 'bb';
+  } else if (agent.browser.name === 'Chrome' && agent.os.name === 'Android') {
+    return 'and_chr';
+  } else if (agent.browser.name === 'Firefox' && agent.os.name === 'Android') {
+    return 'and_ff';
+  } else if (agent.browser.name === 'IEMobile') {
+    return 'ie_mob';
+  } else if (agent.browser.name === 'Opera Mobi') {
+    return 'op_mob';
+  } else if (agent.browser.name === 'Safari' && agent.os.name === 'iOS') {
+    return 'ios_saf';
+  } else if (agent.browser.name === 'UCBrowser') {
+    return 'and_uc';
+  }
+  return agent.browser.name;
 }
 
 function getBrowserVersionFromUserAgent(userAgent) {
-  var agent = useragent.parse(userAgent);
-  var version = [agent.major, agent.minor, agent.patch];
-  var browserName = getBrowserName(agent.family);
+  var agent = parser(userAgent);
+  var version = (agent.browser.version || agent.os.version || '').split('.');
+  var browserName = getBrowserName(agent);
   while (version.length > 0) {
     try {
       return browserslist(browserName + ' ' + version.join('.'))[0];

package.json

@@ -11,7 +11,10 @@
   "engines": {
     "node": ">=4"
   },
+  "browser": "./dist/is-browser-supported.js",
   "scripts": {
+    "build": "webpack",
+    "prepublish": "npm run build",
     "test": "eslint . && mocha test.js"
   },
   "keywords": [
@@ -25,12 +28,15 @@
   ],
   "dependencies": {
     "browserslist": "^1.4.0",
-    "useragent": "^2.1.9"
+    "ua-parser-js": "github:faisalman/ua-parser-js#51b8089958ea0bf53a7433c9439233b13bcbae5e"
   },
   "devDependencies": {
+    "clean-webpack-plugin": "^0.1.13",
     "eslint": "^3.8.1",
     "eslint-config-airbnb-base": "^9.0.0",
     "eslint-plugin-import": "^2.0.1",
-    "mocha": "^3.1.2"
+    "json-loader": "^0.5.4",
+    "mocha": "^3.1.2",
+    "webpack": "^1.13.2"
   }
 }

test.js

@@ -84,11 +84,6 @@ describe('isBrowserSupported()', function () {
       selections: 'safari >= 7',
       expected: true
     },
-    {
-      userAgent: 'Mozilla/5.0 (Linux; Android 6.0.1; SAMSUNG SM-G920F Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) SamsungBrowser/4.0 Chrome/44.0.2403.133 Mobile Safari/537.36',
-      selections: 'samsung >= 4',
-      expected: true
-    },
     {
       userAgent: 'Googlebot/2.1 (+http://www.google.com/bot.html)',
       expected: false

webpack.config.js

@@ -0,0 +1,46 @@
+var path = require('path');
+var webpack = require('webpack');
+var CleanWebpackPlugin = require('clean-webpack-plugin');
+
+module.exports = {
+  entry: {
+    'is-browser-supported': './index',
+    'is-browser-supported.min': './index'
+  },
+  output: {
+    library: 'isBrowserSupported',
+    libraryTarget: 'umd',
+    filename: '[name].js',
+    path: './dist'
+  },
+  module: {
+    preLoaders: [
+      {
+        test: /\/caniuse-db\/data\.json$/,
+        loader: path.resolve('./caniuse-db-loader')
+      }
+    ],
+    loaders: [
+      {
+        test: /\.json$/,
+        loader: 'json'
+      }
+    ]
+  },
+  node: {
+    fs: 'empty',
+    path: 'empty'
+  },
+  plugins: [
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false
+      },
+      include: /\.min\.js$/,
+      minimize: true
+    }),
+    new webpack.IgnorePlugin(/caniuse-db\/region-usage-json/),
+    new CleanWebpackPlugin(['dist'])
+  ],
+  devtool: '#source-map'
+};