Merge 406503f into 227c71c

.eslintrc.js

@@ -33,6 +33,7 @@ module.exports = {
     Headers: false,
     Request: false,
     XMLHttpRequest: false,
+    globalThis: false,
   },
   rules: {
     // Default

engines/query-sparql/test/QuerySparql-solid-test.ts

@@ -20,7 +20,6 @@ const config = [{
 }];
 
 // Store global fetch to reset to after mock.
-// eslint-disable-next-line no-undef
 const globalFetch = globalThis.fetch;
 
 // Use an increased timeout, since the CSS server takes too much setup time.
@@ -109,15 +108,13 @@ describe('System test: QuerySparql over Solid Pods', () => {
 
     // Override global fetch with auth fetch
     // @ts-expect-error
-    // eslint-disable-next-line no-undef
     globalThis.fetch = jest.fn(authFetch);
   });
 
   afterAll(async() => {
     await app.stop();
 
     // Reset global fetch. This is probably redundant, as jest clears the DOM after each file.
-    // eslint-disable-next-line no-undef
     globalThis.fetch = globalFetch;
   });
 

engines/query-sparql/test/QuerySparql-test.ts

@@ -1,7 +1,7 @@
 /** @jest-environment setup-polly-jest/jest-environment-node */
 
 // Needed to undo automock from actor-http-native, cleaner workarounds do not appear to be working.
-if (!global.window) {
+if (!globalThis.window) {
   jest.unmock('follow-redirects');
 }
 

packages/actor-dereference-http/test/ActorDereferenceHttp-test.ts

@@ -11,7 +11,7 @@ import { ActorDereferenceHttp } from '../lib/ActorDereferenceHttp';
 const streamifyString = require('streamify-string');
 
 // TODO: Remove when targeting NodeJS 18+
-global.ReadableStream = global.ReadableStream || require('web-streams-ponyfill').ReadableStream;
+globalThis.ReadableStream = globalThis.ReadableStream || require('web-streams-ponyfill').ReadableStream;
 
 describe('ActorDereferenceHttp', () => {
   let bus: any;

packages/actor-http-fetch/lib/ActorHttpFetch.ts

@@ -23,9 +23,9 @@ export class ActorHttpFetch extends ActorHttp {
   }
 
   public static createUserAgent(): string {
-    return `Comunica/actor-http-fetch (${typeof global.navigator === 'undefined' ?
+    return `Comunica/actor-http-fetch (${typeof globalThis.navigator === 'undefined' ?
       `Node.js ${process.version}; ${process.platform}` :
-      `Browser-${global.navigator.userAgent}`})`;
+      `Browser-${globalThis.navigator.userAgent}`})`;
   }
 
   public async test(action: IActionHttp): Promise<IMediatorTypeTime> {

packages/actor-http-fetch/lib/FetchInitPreprocessor.ts

@@ -28,7 +28,7 @@ export class FetchInitPreprocessor implements IFetchInitPreprocessor {
   public async createAbortController(): Promise<AbortController> {
     // Fallback to abort-controller for Node 14 backward compatibility
     /* istanbul ignore next */
-    const AbortController = global.AbortController || await import('abort-controller');
+    const AbortController = globalThis.AbortController || await import('abort-controller');
     return new AbortController();
   }
 }

packages/actor-http-fetch/test/ActorHttpFetch-test.ts

@@ -48,7 +48,7 @@ describe('ActorHttpFetch', () => {
     it('should create a user agent in the browser', () => {
       (<any> global).navigator = { userAgent: 'Dummy' };
       return expect(ActorHttpFetch.createUserAgent())
-        .toEqual(`Comunica/actor-http-fetch (Browser-${global.navigator.userAgent})`);
+        .toEqual(`Comunica/actor-http-fetch (Browser-${globalThis.navigator.userAgent})`);
     });
 
     it('should create a user agent in Node.js', () => {

packages/actor-http-native/lib/ActorHttpNative.ts

@@ -20,9 +20,9 @@ export class ActorHttpNative extends ActorHttp {
   }
 
   public static createUserAgent(): string {
-    return `Comunica/actor-http-native (${typeof global.navigator === 'undefined' ?
+    return `Comunica/actor-http-native (${typeof globalThis.navigator === 'undefined' ?
       `Node.js ${process.version}; ${process.platform}` :
-      `Browser-${global.navigator.userAgent}`})`;
+      `Browser-${globalThis.navigator.userAgent}`})`;
   }
 
   public async test(action: IActionHttp): Promise<IMediatorTypeTime> {

packages/actor-http-native/test/ActorHttpNative-test.ts

@@ -39,7 +39,7 @@ describe('ActorHttpNative', () => {
     it('should create a user agent in the browser', () => {
       (<any> global).navigator = { userAgent: 'Dummy' };
       return expect(ActorHttpNative.createUserAgent())
-        .toEqual(`Comunica/actor-http-native (Browser-${global.navigator.userAgent})`);
+        .toEqual(`Comunica/actor-http-native (Browser-${globalThis.navigator.userAgent})`);
     });
 
     it('should create a user agent in Node.js', () => {

packages/actor-init-query/lib/ActorInitQuery-browser.ts

@@ -5,7 +5,7 @@ import { ActorInitQueryBase } from './ActorInitQueryBase';
 /* istanbul ignore next */
 if (typeof process === 'undefined') {
   // Polyfills process.nextTick for readable-stream
-  global.process = require('process'); // eslint-disable-line import/no-nodejs-modules
+  globalThis.process = require('process'); // eslint-disable-line import/no-nodejs-modules
 }
 
 export class ActorInitQuery extends ActorInitQueryBase {}

packages/actor-rdf-resolve-hypermedia-sparql/test/RdfSourceSparql-test.ts

@@ -13,7 +13,7 @@ const streamifyString = require('streamify-string');
 const DF = new DataFactory();
 
 // TODO: Remove when targeting NodeJS 18+
-global.ReadableStream = global.ReadableStream || require('web-streams-ponyfill').ReadableStream;
+globalThis.ReadableStream = globalThis.ReadableStream || require('web-streams-ponyfill').ReadableStream;
 
 describe('RdfSourceSparql', () => {
   const context = new ActionContext({});

packages/bus-http/lib/ActorHttp.ts

@@ -2,8 +2,8 @@ import type { IAction, IActorArgs, IActorOutput, IActorTest, Mediate } from '@co
 import { Actor } from '@comunica/core';
 import { ReadableWebToNodeStream } from 'readable-web-to-node-stream';
 
-if (!global.ReadableStream) {
-  global.ReadableStream = require('web-streams-ponyfill').ReadableStream;
+if (!globalThis.ReadableStream) {
+  globalThis.ReadableStream = require('web-streams-ponyfill').ReadableStream;
 }
 
 const isStream = require('is-stream');