Merge pull request #1313 from remotestorage/chore/node-20

Support node.js 18, 20

Author: raucao

.browserslistrc

@@ -2,5 +2,4 @@
 
 cover 99.5%
 ie >= 11
-maintained node versions
 not dead

.github/workflows/test-and-lint.yml

@@ -12,11 +12,11 @@ jobs:
     strategy:
       matrix:
         # Support LTS versions based on https://nodejs.org/en/about/releases/
-        node-version: ['14', '16']
+        node-version: ['18', '20']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install dependencies

.nvmrc

@@ -0,0 +1 @@
+20

package-lock.json

@@ -53,11 +53,11 @@
     "ts-node": "^10.9.1",
     "typedoc": "^0.19.2",
     "typescript": "^4.8.3",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^4.10.0"
+    "webpack": "^5.92.0",
+    "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@types/node": "16.11.59",
+    "@types/node": "20.14.0",
     "@types/tv4": "^1.2.29",
     "esm": "^3.2.25",
     "tv4": "^1.3.0",

package.json

@@ -6,7 +6,7 @@ import log from './log';
 import { globalContext, localStorageAvailable } from './util';
 
 // feature detection flags
-let haveXMLHttpRequest, hasLocalStorage;
+let hasLocalStorage;
 
 // used to store settings in localStorage
 const SETTINGS_KEY = 'remotestorage:discover';
@@ -66,7 +66,7 @@ const Discover = function Discover(userAddress: string): Promise<StorageInfo> {
       };
 
       if (hasLocalStorage) {
-        localStorage[SETTINGS_KEY] = JSON.stringify({ cache: cachedInfo });
+        localStorage.setItem(SETTINGS_KEY, JSON.stringify({ cache: cachedInfo }));
       }
 
       return resolve(cachedInfo[userAddress]);
@@ -95,8 +95,8 @@ Discover._rs_init = function (/*remoteStorage*/): void {
 };
 
 Discover._rs_supported = function (): boolean {
-  haveXMLHttpRequest = Object.prototype.hasOwnProperty.call(globalContext, 'XMLHttpRequest');
-  return haveXMLHttpRequest;
+  return Object.prototype.hasOwnProperty.call(globalContext, 'fetch') ||
+         Object.prototype.hasOwnProperty.call(globalContext, 'XMLHttpRequest');
 };
 
 Discover._rs_cleanup = function (): void {

src/discover.ts

@@ -245,7 +245,7 @@ export const shouldBeTreatedAsBinary = (content: string | ArrayBuffer, mimeType:
  */
 export const getTextFromArrayBuffer = (arrayBuffer: ArrayBuffer, encoding): Promise<string | ArrayBuffer> => {
   return new Promise((resolve/*, reject*/) => {
-    if (typeof Blob === 'undefined') {
+    if (typeof Blob === 'undefined' || typeof FileReader === 'undefined') {
       const buffer = Buffer.from(arrayBuffer);
       resolve(buffer.toString(encoding));
     } else {

src/util.ts

@@ -84,10 +84,9 @@ class MockLocation {
   }
 }
 
-
 export default function locationFactory(url) {
-  if (!('document' in global)) {
-    global["document"] = {} as Document;
+  if (!('document' in globalThis)) {
+    globalThis["document"] = {} as Document;
   }
-  global.document.location = new MockLocation(url) as unknown as Location;
+  globalThis.document.location = new MockLocation(url) as unknown as Location;
 }

test/helpers/location.ts

@@ -40,8 +40,8 @@ class MockRemote extends RemoteBase implements Remote {
 }
 
 locationFactory('https://foo/bar');
-global.localStorageAvailable = localStorageAvailable;
-global["sessionStorage"] = sessionStorage;
+globalThis.localStorageAvailable = localStorageAvailable;
+globalThis["sessionStorage"] = sessionStorage;
 
 describe("authorization", () => {
   const sandbox = sinon.createSandbox();
@@ -54,7 +54,7 @@ describe("authorization", () => {
     sessionStorage.removeItem('remotestorage:codeVerifier');
     sessionStorage.removeItem('remotestorage:state');
 
-    global.document.location.href = 'https://foo/bar';
+    globalThis.document.location.href = 'https://foo/bar';
   });
 
   afterEach(() => {