Merge pull request #3385 from hypothesis/gh2723-fix-client-on-pages-that-define-global

Fix client on pages that define a variable called `global`

scripts/gulp/create-bundle.js

@@ -86,7 +86,18 @@ module.exports = function createBundle(config, buildOpts) {
       'querystring',
     ],
     insertGlobalVars: {
+      // The Browserify polyfill for the `Buffer` global is large and
+      // unnecessary, but can get pulled into the bundle by modules that can
+      // optionally use it if present.
       Buffer: undefined,
+      // Override the default stub for the `global` var which defaults to
+      // the `global`, `self` and `window` globals in that order.
+      //
+      // This can break on web pages which provide their own definition of
+      // `global`. See https://github.com/hypothesis/h/issues/2723
+      global: function () {
+        return 'typeof self !== "undefined" ? self : window';
+      },
     },
   };