Merge branch 'AaronDewes-chore/cleanup-dependencies' into master

See #101

Author: timvisee

.eslintrc.yml

@@ -5,21 +5,24 @@ env:
 extends:
   - eslint:recommended
   - prettier
-  - plugin:node/recommended
+  - plugin:n/recommended
   - plugin:security/recommended
 
 plugins:
-  - node
+  - n
   - security
 
 root: true
 
 rules:
-  node/no-deprecated-api: off
-  node/no-unsupported-features/es-syntax: off
-  node/no-unsupported-features/node-builtins: off
-  node/no-unpublished-require: off
-  node/no-unpublished-import: off
+  n/no-deprecated-api: off
+  n/no-unsupported-features/es-syntax: off
+  n/no-unsupported-features/node-builtins: off
+  n/no-unpublished-require: off
+  n/no-unpublished-import: off
+  n/no-process-exit: off
+  # This forces using file extensions in imports, which is a best practice, but refactoring would take some time
+  n/no-missing-import: off
 
   security/detect-non-literal-fs-filename: off
   security/detect-object-injection: off

Dockerfile

@@ -63,7 +63,6 @@ COPY --chown=app:app server server
 COPY --chown=app:app --from=builder /app/dist dist
 
 RUN npm ci --production && npm cache clean --force
-RUN mkdir -p /app/.config/configstore
 RUN ln -s dist/version.json version.json
 
 ENV PORT=1443

app/.eslintrc.yml

@@ -6,4 +6,4 @@ parserOptions:
   sourceType: module
 
 rules:
-  node/no-unsupported-features: off
+  n/no-unsupported-features: off

app/capabilities.js

@@ -45,13 +45,7 @@ async function checkCrypto() {
     );
     return true;
   } catch (err) {
-    try {
-      window.asmCrypto = await import('asmcrypto.js');
-      await import('@dannycoates/webcrypto-liner/build/shim');
-      return true;
-    } catch (e) {
-      return false;
-    }
+    return false;
   }
 }
 
@@ -66,25 +60,12 @@ function checkStreams() {
   }
 }
 
-async function polyfillStreams() {
-  try {
-    await import('@mattiasbuelens/web-streams-polyfill');
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
 export default async function getCapabilities() {
   const browser = browserName();
   const isMobile = /mobi|android/i.test(navigator.userAgent);
   const serviceWorker = 'serviceWorker' in navigator && browser !== 'edge';
   let crypto = await checkCrypto();
   const nativeStreams = checkStreams();
-  let polyStreams = false;
-  if (!nativeStreams) {
-    polyStreams = await polyfillStreams();
-  }
   let account = typeof AUTH_CONFIG !== 'undefined';
   try {
     account = account && !!localStorage;
@@ -106,10 +87,10 @@ export default async function getCapabilities() {
     account,
     crypto,
     serviceWorker,
-    streamUpload: nativeStreams || polyStreams,
+    streamUpload: nativeStreams,
     streamDownload:
       nativeStreams && serviceWorker && browser !== 'safari' && !mobileFirefox,
-    multifile: nativeStreams || polyStreams,
+    multifile: nativeStreams,
     share,
     standalone
   };

app/ece.js

@@ -48,7 +48,7 @@ class ECETransformer {
         name: 'AES-GCM',
         length: 128
       },
-      true, // Edge polyfill requires key to be extractable to encrypt :/
+      false,
       ['encrypt', 'decrypt']
     );
   }

app/main.js

@@ -1,6 +1,5 @@
 /* global DEFAULTS LIMITS WEB_UI PREFS */
 import 'core-js';
-import 'fast-text-encoding'; // MS Edge support
 import 'intl-pluralrules';
 import choo from 'choo';
 import nanotiming from 'nanotiming';

app/storage.js

@@ -110,7 +110,7 @@ class Storage {
   }
 
   set user(info) {
-    return this.engine.setItem('user', JSON.stringify(info));
+    this.engine.setItem('user', JSON.stringify(info));
   }
 
   getFileById(id) {

app/streams.js

@@ -1,5 +1,3 @@
-/* global TransformStream */
-
 export function transformStream(readable, transformer, oncancel) {
   try {
     return readable.pipeThrough(new TransformStream(transformer));

app/utils.js

@@ -23,39 +23,34 @@ function locale() {
   return document.querySelector('html').lang;
 }
 
-function loadShim(polyfill) {
-  return new Promise((resolve, reject) => {
-    const shim = document.createElement('script');
-    shim.src = polyfill;
-    shim.addEventListener('load', () => resolve(true));
-    shim.addEventListener('error', () => resolve(false));
-    document.head.appendChild(shim);
-  });
-}
-
 function isFile(id) {
   return /^[0-9a-fA-F]{10,16}$/.test(id);
 }
 
-function copyToClipboard(str) {
-  const aux = document.createElement('input');
-  aux.setAttribute('value', str);
-  aux.contentEditable = true;
-  aux.readOnly = true;
-  document.body.appendChild(aux);
-  if (navigator.userAgent.match(/iphone|ipad|ipod/i)) {
-    const range = document.createRange();
-    range.selectNodeContents(aux);
-    const sel = getSelection();
-    sel.removeAllRanges();
-    sel.addRange(range);
-    aux.setSelectionRange(0, str.length);
-  } else {
-    aux.select();
+async function copyToClipboard(str) {
+  try {
+    await navigator.clipboard.writeText(str);
+  } catch {
+    // Older browsers or the clipboard API fails because of a missing permission
+    const aux = document.createElement('input');
+    aux.setAttribute('value', str);
+    aux.contentEditable = true;
+    aux.readOnly = true;
+    document.body.appendChild(aux);
+    if (navigator.userAgent.match(/iphone|ipad|ipod/i)) {
+      const range = document.createRange();
+      range.selectNodeContents(aux);
+      const sel = getSelection();
+      sel.removeAllRanges();
+      sel.addRange(range);
+      aux.setSelectionRange(0, str.length);
+    } else {
+      aux.select();
+    }
+    const result = document.execCommand('copy');
+    document.body.removeChild(aux);
+    return result;
   }
-  const result = document.execCommand('copy');
-  document.body.removeChild(aux);
-  return result;
 }
 
 const LOCALIZE_NUMBERS = !!(
@@ -287,7 +282,6 @@ module.exports = {
   copyToClipboard,
   arrayToB64,
   b64ToArray,
-  loadShim,
   isFile,
   openLinksInNewTab,
   browserName,

common/assets.js

@@ -3,7 +3,7 @@ const isServer = typeof genmap === 'function';
 let prefix = '';
 let manifest = {};
 try {
-  //eslint-disable-next-line node/no-missing-require
+  //eslint-disable-next-line n/no-missing-require
   manifest = require('../dist/manifest.json');
 } catch (e) {
   // use middleware