Merge pull request #6494 from plotly/stackgl-is-mobile-v3

Use identical version of  `is-mobile` in `stackgl` modules and src code

Author: archmoj

stackgl_modules/index.js

@@ -1810,6 +1810,35 @@ function BufferBigIntNotDefined() {
 
 /***/ }),
 
+/***/ 2321:
+/***/ (function(module) {
+
+"use strict";
+
+
+module.exports = isMobile;
+module.exports.isMobile = isMobile;
+module.exports["default"] = isMobile;
+var mobileRE = /(android|bb\d+|meego).+mobile|armv7l|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series[46]0|samsungbrowser|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i;
+var notMobileRE = /CrOS/;
+var tabletRE = /android|ipad|playbook|silk/i;
+function isMobile(opts) {
+  if (!opts) opts = {};
+  var ua = opts.ua;
+  if (!ua && typeof navigator !== 'undefined') ua = navigator.userAgent;
+  if (ua && ua.headers && typeof ua.headers['user-agent'] === 'string') {
+    ua = ua.headers['user-agent'];
+  }
+  if (typeof ua !== 'string') return false;
+  var result = mobileRE.test(ua) && !notMobileRE.test(ua) || !!opts.tablet && tabletRE.test(ua);
+  if (!result && opts.tablet && opts.featureDetect && navigator && navigator.maxTouchPoints > 1 && ua.indexOf('Macintosh') !== -1 && ua.indexOf('Safari') !== -1) {
+    result = true;
+  }
+  return result;
+}
+
+/***/ }),
+
 /***/ 3910:
 /***/ (function(__unused_webpack_module, exports) {
 
@@ -20314,7 +20343,7 @@ var mouseChange  = __webpack_require__(6145)
 var perspective  = __webpack_require__(1120)
 var ortho        = __webpack_require__(5268)
 var createShader = __webpack_require__(8245)
-var isMobile = __webpack_require__(2861)({ tablet: true, featureDetect: true })
+var isMobile = __webpack_require__(2321)({ tablet: true, featureDetect: true })
 
 module.exports = {
   createScene: createScene,
@@ -30623,49 +30652,6 @@ function isSlowBuffer (obj) {
 }
 
 
-/***/ }),
-
-/***/ 2861:
-/***/ (function(module) {
-
-"use strict";
-
-
-module.exports = isMobile
-module.exports.isMobile = isMobile
-module.exports["default"] = isMobile
-
-var mobileRE = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series[46]0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i
-
-var tabletRE = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series[46]0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino|android|ipad|playbook|silk/i
-
-function isMobile (opts) {
-  if (!opts) opts = {}
-  var ua = opts.ua
-  if (!ua && typeof navigator !== 'undefined') ua = navigator.userAgent
-  if (ua && ua.headers && typeof ua.headers['user-agent'] === 'string') {
-    ua = ua.headers['user-agent']
-  }
-  if (typeof ua !== 'string') return false
-
-  var result = opts.tablet ? tabletRE.test(ua) : mobileRE.test(ua)
-
-  if (
-    !result &&
-    opts.tablet &&
-    opts.featureDetect &&
-    navigator &&
-    navigator.maxTouchPoints > 1 &&
-    ua.indexOf('Macintosh') !== -1 &&
-    ua.indexOf('Safari') !== -1
-  ) {
-    result = true
-  }
-
-  return result
-}
-
-
 /***/ }),
 
 /***/ 3596:

stackgl_modules/package-lock.json

@@ -30,6 +30,7 @@
     "gl-surface3d": "^1.6.0",
     "glslify": "^7.1.1",
     "incremental-convex-hull": "plotly/incremental-convex-hull#v1.1.0",
+    "is-mobile": "^3.1.1",
     "matrix-camera-controller": "^2.1.4",
     "ndarray": "plotly/ndarray#v1.1.0",
     "ndarray-extract-contour": "plotly/ndarray-extract-contour#v1.1.0",

stackgl_modules/package.json

@@ -1,5 +1,6 @@
 var path = require('path');
-var NodePolyfillPlugin = require('node-polyfill-webpack-plugin');
+
+var plotlyjsConfig = require('../webpack.config');
 
 module.exports = {
     target: ['web', 'es5'],
@@ -15,37 +16,5 @@ module.exports = {
     optimization: {
         minimize: false
     },
-    module: {
-        rules: [{
-            test: /\.js$/,
-            exclude: /node_modules/,
-            use: {
-                loader: 'babel-loader'
-            }
-        }, {
-            test: /\.js$/,
-            include: /node_modules[\\\/]buffer[\\\/]/,
-            use: {
-                loader: 'babel-loader',
-                options: {
-                    babelrc: false,
-                    configFile: false,
-                    presets: [
-                        '@babel/preset-env'
-                    ]
-                }
-            },
-        }, {
-            test: /\.glsl$/,
-            include: /node_modules/,
-            use: {
-                loader: 'raw-loader'
-            }
-        }, {
-            test: /\.(js|glsl)$/,
-            use: [
-                'ify-loader'
-            ]
-        }]
-    }
+    module: plotlyjsConfig.module
 };