Cherry pick (#9749) to release-erie

mapbox · Jun 9, 2020 · 052df90 · 052df90
1 parent 4d9d606
commit 052df90
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/rollup/bundle_prelude.js b/rollup/bundle_prelude.js
@@ -14,6 +14,8 @@ if (!shared) {
     var sharedChunk = {};
     shared(sharedChunk);
     mapboxgl = chunk(sharedChunk);
-    mapboxgl.workerUrl = window.URL.createObjectURL(new Blob([workerBundleString], { type: 'text/javascript' }));
+    if (typeof window !== 'undefined') {
+        mapboxgl.workerUrl = window.URL.createObjectURL(new Blob([workerBundleString], { type: 'text/javascript' }));
+    }
 }
 }
diff --git a/src/util/browser.js b/src/util/browser.js
@@ -54,7 +54,7 @@ const exported = {
         return linkEl.href;
     },
 
-    hardwareConcurrency: window.navigator.hardwareConcurrency || 4,
+    hardwareConcurrency: window.navigator && window.navigator.hardwareConcurrency || 4,
 
     get devicePixelRatio() { return window.devicePixelRatio; },
     get prefersReducedMotion(): boolean {

diff --git a/src/util/browser/window.js b/src/util/browser/window.js
@@ -2,4 +2,5 @@
 /* eslint-env browser */
 import type {Window} from '../../types/window';
 
-export default (self: Window);
+// shim window for the case of requiring the browser bundle in Node
+export default typeof self !== 'undefined' ? (self: Window) : (({}: any): Window);
diff --git a/src/util/dom.js b/src/util/dom.js
@@ -20,7 +20,7 @@ DOM.createNS = function (namespaceURI: string, tagName: string) {
     return el;
 };
 
-const docStyle = window.document.documentElement.style;
+const docStyle = window.document && window.document.documentElement.style;
 
 function testProp(props) {
     if (!docStyle) return props[0];

diff --git a/test/build/min.test.js b/test/build/min.test.js
@@ -36,6 +36,11 @@ test('can be browserified', (t) => {
     });
 });
 
+test('evaluates without errors', (t) => {
+    t.doesNotThrow(() => require(path.join(__dirname, '../../dist/mapbox-gl.js')));
+    t.end();
+});
+
 test('distributed in plain ES5 code', (t) => {
     const linter = new Linter();
     const messages = linter.verify(minBundle, {