Merge pull request #1143 from OpenGeoscience/harden-optional-dependen…

…cies feat: Harden checking for optional dependencies.
OpenGeoscience · Jan 4, 2022 · 01ec676 · 01ec676
2 parents 5476047 + 426c071
commit 01ec676
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/mapInteractor.js b/src/mapInteractor.js
@@ -718,6 +718,9 @@ var mapInteractor = function (args) {
       var Hammer;
       try {
         Hammer = require('hammerjs');
+        if (!Hammer || !Hammer.Manager) {
+          Hammer = undefined;
+        }
       } catch (_error) {}
       if (Hammer !== undefined) {
         var recog = [],

diff --git a/src/svg/svgRenderer.js b/src/svg/svgRenderer.js
@@ -681,6 +681,9 @@ svgRenderer.supported = function () {
   // webpack expects optional dependencies to be wrapped in a try-catch
   try {
     svgRenderer.d3 = require('d3');
+    if (!svgRenderer.d3 || !svgRenderer.d3.rgb) {
+      svgRenderer.d3 = undefined;
+    }
   } catch (_error) {}
   return svgRenderer.d3 !== undefined;
 };

diff --git a/src/vtkjs/vtkjsRenderer.js b/src/vtkjs/vtkjsRenderer.js
@@ -184,6 +184,9 @@ vtkjsRenderer.supported = function () {
   if ((!vtkjsRenderer.vtkjs || !vtkjsRenderer.vtkjs.Rendering) && window.vtk && window.vtk.Rendering) {
     vtkjsRenderer.vtkjs = window.vtk;
   }
+  if (!vtkjsRenderer.vtkjs || !vtkjsRenderer.vtkjs.Rendering) {
+    vtkjsRenderer.vtkjs = undefined;
+  }
   return vtkjsRenderer.vtkjs !== undefined;
 };