fix: remove global and use 'videojs-global-compat'

package.json

@@ -60,11 +60,11 @@
     "@babel/runtime": "^7.12.5",
     "@videojs/vhs-utils": "^4.1.1",
     "aes-decrypter": "^4.0.2",
-    "global": "^4.4.0",
     "m3u8-parser": "^7.2.0",
     "mpd-parser": "^1.3.1",
     "mux.js": "7.1.0",
-    "video.js": "^7 || ^8"
+    "video.js": "^7 || ^8",
+    "videojs-global-compat": "^1.0.1"
   },
   "peerDependencies": {
     "video.js": "^8.19.0"

src/ad-cue-tags.js

@@ -1,7 +1,7 @@
 /**
  * @file ad-cue-tags.js
  */
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 
 /**
  * Searches for an ad cue that overlaps with the given mediaTime

src/content-steering-controller.js

@@ -1,5 +1,5 @@
 import resolveUrl from './resolve-url';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import logger from './util/logger';
 import videojs from 'video.js';
 

src/dash-playlist-loader.js

@@ -13,7 +13,7 @@ import {
 import { resolveUrl, resolveManifestRedirect } from './resolve-url';
 import parseSidx from 'mux.js/lib/tools/parse-sidx';
 import { segmentXhrHeaders } from './xhr';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import {
   forEachMediaGroup,
   addPropertiesToMain

src/manifest.js

@@ -1,5 +1,5 @@
 import videojs from 'video.js';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import { Parser as M3u8Parser } from 'm3u8-parser';
 import { resolveUrl } from './resolve-url';
 import { getLastParts, isAudioOnly } from './playlist.js';

src/playback-watcher.js

@@ -8,7 +8,7 @@
  * my life and honor to the Playback Watch, for this Player and all the Players to come.
  */
 
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import * as Ranges from './ranges';
 import logger from './util/logger';
 import { createTimeRanges } from './util/vjs-compat';

src/playlist-controller.js

@@ -1,7 +1,7 @@
 /**
  * @file playlist-controller.js
  */
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import PlaylistLoader from './playlist-loader';
 import DashPlaylistLoader from './dash-playlist-loader';
 import { isEnabled, isLowestEnabledRendition } from './playlist.js';

src/playlist-loader.js

@@ -7,7 +7,7 @@
  */
 import { resolveUrl, resolveManifestRedirect } from './resolve-url';
 import videojs from 'video.js';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import logger from './util/logger';
 import {
   parseManifest,

src/playlist-selectors.js

@@ -1,4 +1,4 @@
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import Config from './config';
 import Playlist from './playlist';
 import { codecsForPlaylist } from './util/codecs.js';

src/playlist.js

@@ -3,7 +3,7 @@
  *
  * Playlist related utilities.
  */
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import {isAudioCodec} from '@videojs/vhs-utils/es/codecs.js';
 import {TIME_FUDGE_FACTOR} from './ranges.js';
 import {createTimeRanges} from './util/vjs-compat';

src/segment-loader.js

@@ -4,7 +4,7 @@
 import Playlist from './playlist';
 import videojs from 'video.js';
 import Config from './config';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import { initSegmentId, segmentKeyId } from './bin-utils';
 import { mediaSegmentRequest, REQUEST_ERRORS } from './media-segment-request';
 import segmentTransmuxer from './segment-transmuxer';

src/source-updater.js

@@ -6,7 +6,7 @@ import logger from './util/logger';
 import noop from './util/noop';
 import { bufferIntersection } from './ranges.js';
 import {getMimeForCodec} from '@videojs/vhs-utils/es/codecs.js';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import toTitleCase from './util/to-title-case.js';
 import { QUOTA_EXCEEDED_ERR } from './error-codes';
 import {createTimeRanges, bufferedRangesToString} from './util/vjs-compat';

src/util/text-tracks.js

@@ -1,7 +1,7 @@
 /**
  * @file text-tracks.js
  */
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import videojs from 'video.js';
 
 /**

src/videojs-http-streaming.js

@@ -4,8 +4,8 @@
  * The main file for the VHS project.
  * License: https://github.com/videojs/videojs-http-streaming/blob/main/LICENSE
  */
-import document from 'global/document';
-import window from 'global/window';
+import document from 'videojs-global-compat/document';
+import window from 'videojs-global-compat/window';
 import PlaylistLoader from './playlist-loader';
 import Playlist from './playlist';
 import xhrFactory from './xhr';

src/vtt-segment-loader.js

@@ -3,7 +3,7 @@
  */
 import SegmentLoader from './segment-loader';
 import videojs from 'video.js';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import { removeCuesFromTrack, removeDuplicateCuesFromTrack } from './util/text-tracks';
 import { initSegmentId } from './bin-utils';
 import { uint8ToUtf8 } from './util/string';

src/xhr.js

@@ -10,7 +10,7 @@
  * @return {Request} the xhr request that is going to be made
  */
 import videojs from 'video.js';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import {merge} from './util/vjs-compat';
 
 const callbackWrapper = function(request, error, response, callback) {

test/ad-cue-tags.test.js

@@ -1,6 +1,6 @@
 import QUnit from 'qunit';
 import { updateAdCues, findAdCue } from '../src/ad-cue-tags';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 
 QUnit.module('AdCueTags', {
   beforeEach() {

test/dash-playlist-loader.test.js

@@ -1,6 +1,6 @@
 import QUnit from 'qunit';
 import sinon from 'sinon';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import {
   default as DashPlaylistLoader,
   updateMain,

test/loader-common.js

@@ -1,7 +1,7 @@
 import QUnit from 'qunit';
 import xhrFactory from '../src/xhr';
 import Config from '../src/config';
-import document from 'global/document';
+import document from 'videojs-global-compat/document';
 import {
   playlistWithDuration,
   useFakeEnvironment,
@@ -14,7 +14,7 @@ import SourceUpdater from '../src/source-updater';
 import SyncController from '../src/sync-controller';
 import TimelineChangeController from '../src/timeline-change-controller';
 import Decrypter from 'worker!../src/decrypter-worker.js';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 /* eslint-disable no-unused-vars */
 // we need this so that it can register VHS with videojs
 import { Vhs } from '../src/videojs-http-streaming';

test/manifest.test.js

@@ -1,5 +1,5 @@
 import QUnit from 'qunit';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import {
   setupMediaPlaylists,
   resolveMediaGroupUris,

test/playback.test.js

@@ -1,7 +1,7 @@
 import QUnit from 'qunit';
 import videojs from 'video.js';
-import window from 'global/window';
-import document from 'global/document';
+import window from 'videojs-global-compat/window';
+import document from 'videojs-global-compat/document';
 import '../src/videojs-http-streaming';
 import 'videojs-contrib-eme';
 import dashManifestObject from '../scripts/dash-manifest-object.json';

test/playlist-controller.test.js

@@ -1,7 +1,7 @@
 import QUnit from 'qunit';
 import sinon from 'sinon';
 import videojs from 'video.js';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import {
   useFakeEnvironment,
   useFakeMediaSource,

test/playlist-loader.test.js

@@ -7,7 +7,7 @@ import {
 } from '../src/playlist-loader';
 import xhrFactory from '../src/xhr';
 import { useFakeEnvironment, urlTo } from './test-helpers';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 // needed for plugin registration
 import '../src/videojs-http-streaming';
 import {

test/playlist-selectors.test.js

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
-import document from 'global/document';
-import window from 'global/window';
+import document from 'videojs-global-compat/document';
+import window from 'videojs-global-compat/window';
 import {
   TEST_ONLY_SIMPLE_SELECTOR,
   simpleSelector,

test/resolve-url.test.js

@@ -1,5 +1,5 @@
 import QUnit from 'qunit';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import resolveUrl from '../src/resolve-url';
 
 // A modified subset of tests from https://github.com/tjenkinson/url-toolkit

test/sanity.test.js

@@ -1,6 +1,6 @@
 import QUnit from 'qunit';
 import videojs from 'video.js';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 // needed for plugin registration
 import '../src/videojs-http-streaming';
 

test/segment-loader.test.js

@@ -52,8 +52,8 @@ import {
 import sinon from 'sinon';
 import { timeRangesEqual } from './custom-assertions.js';
 import { QUOTA_EXCEEDED_ERR } from '../src/error-codes';
-import window from 'global/window';
-import document from 'global/document';
+import window from 'videojs-global-compat/window';
+import document from 'videojs-global-compat/document';
 import {merge, createTimeRanges} from '../src/util/vjs-compat';
 
 const newEvent = function(name) {

test/source-updater.test.js

@@ -1,5 +1,5 @@
-import document from 'global/document';
-import window from 'global/window';
+import document from 'videojs-global-compat/document';
+import window from 'videojs-global-compat/window';
 import QUnit from 'qunit';
 import videojs from 'video.js';
 import SourceUpdater from '../src/source-updater';

test/test-helpers.js

@@ -1,10 +1,10 @@
-import document from 'global/document';
+import document from 'videojs-global-compat/document';
 import sinon from 'sinon';
 import videojs from 'video.js';
 import URLToolkit from 'url-toolkit';
 import testDataManifests from 'create-test-data!manifests';
 import xhrFactory from '../src/xhr';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import { muxed as muxedSegment } from 'create-test-data!segments';
 import {bytesToString, isTypedArray} from '@videojs/vhs-utils/es/byte-helpers';
 import {createTimeRanges} from '../src/util/vjs-compat';

test/util/date-ranges.test.js

@@ -1,6 +1,6 @@
 import QUnit from 'qunit';
 // import sinon from 'sinon';
-// import window from 'global/window';
+// import window from 'videojs-global-compat/window';
 import DateRangesStorage from '../../src/util/date-ranges';
 import xhrFactory from '../../src/xhr';
 import { useFakeEnvironment } from '../test-helpers';

test/videojs-http-streaming.test.js

@@ -1,4 +1,4 @@
-import document from 'global/document';
+import document from 'videojs-global-compat/document';
 import videojs from 'video.js';
 import Events from 'video.js';
 import QUnit from 'qunit';
@@ -41,7 +41,7 @@ import {
   getAllPsshKeySystemsOptions,
   waitForKeySessionCreation
 } from '../src/videojs-http-streaming';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 // we need this so the plugin registers itself
 import 'videojs-contrib-quality-levels';
 import 'videojs-contrib-eme';
@@ -4163,7 +4163,7 @@ QUnit.test('Allows overriding the global beforeRequest function', function(asser
 
   assert.equal(beforeLocalRequestCalled, 2, 'local beforeRequest was called twice ' +
                                            'for the media playlist and media');
-  assert.equal(beforeGlobalRequestCalled, 1, 'global beforeRequest was called once ' +
+  assert.equal(beforeGlobalRequestCalled, 1, 'videojs-global-compat beforeRequest was called once ' +
                                             'for the main playlist');
   assert.equal(this.env.log.warn.calls, 3, 'warning logged for deprecation');
 
@@ -4305,7 +4305,7 @@ QUnit.test('Allows setting onRequest hooks globally and overriding with player h
   this.player.tech_.vhs.xhr.offRequest(playerRequestHook2);
 
   assert.equal(onRequestHookCallCountGlobal, 0, 'no onRequest global hooks called');
-  assert.equal(actualRequestUrlGlobal, undefined, 'global request url undefined');
+  assert.equal(actualRequestUrlGlobal, undefined, 'videojs-global-compat request url undefined');
   assert.equal(onRequestHookCallCountPlayer, 2, '2 onRequest player hooks called');
   assert.equal(actualRequestUrlPlayer, 'http://localhost:9999/test/media2.m3u8?bar=foo', 'request url modified by player onRequest hook');
 

test/vtt-segment-loader.test.js

@@ -1,5 +1,5 @@
 import QUnit from 'qunit';
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import VTTSegmentLoader from '../src/vtt-segment-loader';
 import {
   playlistWithDuration as oldPlaylistWithDuration,

test/xhr.test.js

@@ -1,4 +1,4 @@
-import window from 'global/window';
+import window from 'videojs-global-compat/window';
 import QUnit from 'qunit';
 import {default as xhrFactory, byterangeStr} from '../src/xhr';
 import { useFakeEnvironment } from './test-helpers.js';
@@ -36,7 +36,7 @@ QUnit.test('xhr respects beforeRequest', function(assert) {
   assert.equal(this.env.log.warn.calls, 1, 'warning logged for deprecation');
 
   videojs.Vhs.xhr.beforeRequest = (options) => {
-    options.url = 'global';
+    options.url = 'videojs-global-compat';
     return options;
   };
 
@@ -47,7 +47,7 @@ QUnit.test('xhr respects beforeRequest', function(assert) {
   delete this.xhr.beforeRequest;
 
   this.xhr(defaultOptions);
-  assert.equal(this.requests.shift().url, 'global', 'url changed with global override');
+  assert.equal(this.requests.shift().url, 'videojs-global-compat', 'url changed with global override');
   assert.equal(this.env.log.warn.calls, 1, 'warning logged for deprecation');
 
   delete videojs.Vhs.xhr.beforeRequest;
@@ -62,11 +62,11 @@ QUnit.test('beforeRequest can return a new options object', function(assert) {
   assert.equal(this.requests.shift().url, 'default', 'url the same without override');
 
   videojs.Vhs.xhr.beforeRequest = () => {
-    return { uri: 'global-newOptions'};
+    return { uri: 'videojs-global-compat-newOptions'};
   };
 
   this.xhr(defaultOptions);
-  assert.equal(this.requests.shift().url, 'global-newOptions', 'url changed with global override');
+  assert.equal(this.requests.shift().url, 'videojs-global-compat-newOptions', 'url changed with global override');
   assert.equal(this.env.log.warn.calls, 1, 'warning logged for deprecation');
 
   this.xhr.beforeRequest = () => {
@@ -95,7 +95,7 @@ QUnit.test('calls global and player onRequest hooks respectively', function(asse
   // create the global onRequest set and 2 hooks
   videojs.Vhs.xhr._requestCallbackSet = new Set();
   const globalRequestHook1 = (options) => {
-    options.url = 'global';
+    options.url = 'videojs-global-compat';
     return options;
   };
   const globalRequestHook2 = (options) => {
@@ -112,7 +112,7 @@ QUnit.test('calls global and player onRequest hooks respectively', function(asse
   this.xhr(defaultOptions);
   xhrRequest = this.requests.shift();
 
-  assert.equal(xhrRequest.url, 'global', 'url changed with global onRequest hooks');
+  assert.equal(xhrRequest.url, 'videojs-global-compat', 'url changed with global onRequest hooks');
   assert.equal(xhrRequest.headers.foo, 'bar', 'headers changed with global onRequest hooks');
 
   // create the player onRequest set and 2 hooks
@@ -143,7 +143,7 @@ QUnit.test('calls global and player onRequest hooks respectively', function(asse
   delete this.xhr._requestCallbackSet;
   this.xhr(defaultOptions);
   xhrRequest = this.requests.shift();
-  assert.equal(xhrRequest.url, 'global', 'url changed with player onRequest hooks');
+  assert.equal(xhrRequest.url, 'videojs-global-compat', 'url changed with player onRequest hooks');
   assert.equal(xhrRequest.headers.foo, 'bar', 'headers changed with player onRequest hooks');
 
   delete videojs.Vhs.xhr._requestCallbackSet;
@@ -180,7 +180,7 @@ QUnit.test('xhr calls global and player onResponse hooks respectively', function
   const playerOnResponseHook2 = (request, error, response) => {
     assert.equal(response.headers.foo, 'bar', 'expected headers');
     assert.equal(response.statusCode, 200, 'expected statusCode');
-    assert.equal(globalHookCallCount, 0, 'global response hooks not called yet');
+    assert.equal(globalHookCallCount, 0, 'videojs-global-compat response hooks not called yet');
     done();
   };