Remove globals.js (#3849)

gorhill · Aug 23, 2021 · d959c7a · d959c7a
1 parent d13294d
commit d959c7a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 51 deletions.
diff --git a/src/js/biditrie.js b/src/js/biditrie.js
@@ -19,8 +19,6 @@
     Home: https://github.com/gorhill/uBlock
 */
 
-/* globals WebAssembly vAPI */
-
 'use strict';
 
 /*******************************************************************************

diff --git a/src/js/globals.js b/src/js/globals.js
diff --git a/src/js/logger-ui-inspector.js b/src/js/logger-ui-inspector.js
@@ -25,10 +25,6 @@
 
 /******************************************************************************/
 
-import globals from './globals.js';
-
-/******************************************************************************/
-
 (( ) => {
 
 /******************************************************************************/
@@ -47,7 +43,7 @@ if (
 
 /******************************************************************************/
 
-const logger = globals.logger;
+const logger = self.logger;
 var inspectorConnectionId;
 var inspectedTabId = 0;
 var inspectedURL = '';

diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js
@@ -25,7 +25,6 @@
 
 /******************************************************************************/
 
-import globals from './globals.js';
 import { hostnameFromURI } from './uri-utils.js';
 
 /******************************************************************************/
@@ -34,7 +33,7 @@ import { hostnameFromURI } from './uri-utils.js';
 //       accumulated over time.
 
 const messaging = vAPI.messaging;
-const logger = globals.logger = { ownerId: Date.now() };
+const logger = self.logger = { ownerId: Date.now() };
 const logDate = new Date();
 const logDateTimezoneOffset = logDate.getTimezoneOffset() * 60000;
 const loggerEntries = [];

diff --git a/tools/make-browser.sh b/tools/make-browser.sh
@@ -10,7 +10,6 @@ mkdir -p $DES/js
 cp src/js/base64-custom.js           $DES/js
 cp src/js/biditrie.js                $DES/js
 cp src/js/filtering-context.js       $DES/js
-cp src/js/globals.js                 $DES/js
 cp src/js/hntrie.js                  $DES/js
 cp src/js/static-filtering-parser.js $DES/js
 cp src/js/static-net-filtering.js    $DES/js

diff --git a/tools/make-nodejs.sh b/tools/make-nodejs.sh
@@ -11,7 +11,6 @@ cp src/js/base64-custom.js           $DES/js
 cp src/js/biditrie.js                $DES/js
 cp src/js/dynamic-net-filtering.js   $DES/js
 cp src/js/filtering-context.js       $DES/js
-cp src/js/globals.js                 $DES/js
 cp src/js/hnswitches.js              $DES/js
 cp src/js/hntrie.js                  $DES/js
 cp src/js/static-filtering-parser.js $DES/js