Merge branch 'timvisee:master' into master

Author: HrBingR

.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

.stylelintrc

@@ -11,3 +11,5 @@ rules:
   selector-list-comma-newline-after: null
   value-list-comma-newline-after: null
   at-rule-no-unknown: null
+  # Conflicts with prettier
+  string-quotes: null

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/locale.js

@@ -1,8 +1,8 @@
-import { FluentBundle } from '@fluent/bundle';
+import { FluentBundle, FluentResource } from '@fluent/bundle';
 
 function makeBundle(locale, ftl) {
   const bundle = new FluentBundle(locale, { useIsolating: false });
-  bundle.addMessages(ftl);
+  bundle.addResource(new FluentResource(ftl));
   return bundle;
 }
 
@@ -19,7 +19,7 @@ export async function getTranslator(locale) {
   return function(id, data) {
     for (let bundle of bundles) {
       if (bundle.hasMessage(id)) {
-        return bundle.format(bundle.getMessage(id), data);
+        return bundle.formatPattern(bundle.getMessage(id).value, data);
       }
     }
   };

app/main.css

@@ -7,17 +7,14 @@ html {
 @tailwind components;
 
 :not(input) {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
 }
 
 :root {
   --violet-gradient: linear-gradient(
     -180deg,
-    rgba(144, 89, 255, 0.8) 0%,
-    rgba(144, 89, 255, 0.4) 100%
+    rgb(144 89 255 / 80%) 0%,
+    rgb(144 89 255 / 40%) 100%
   );
 }
 
@@ -71,7 +68,7 @@ body {
 
 .checkbox > label::before {
   /* @apply bg-grey-10; */
-  @apply border;
+  @apply border-default;
   @apply rounded-sm;
 
   content: '';
@@ -204,32 +201,31 @@ progress::-webkit-progress-value {
   background-image: -webkit-linear-gradient(
       -45deg,
       transparent 20%,
-      rgba(255, 255, 255, 0.4) 20%,
-      rgba(255, 255, 255, 0.4) 40%,
+      rgb(255 255 255 / 40%) 20%,
+      rgb(255 255 255 / 40%) 40%,
       transparent 40%,
       transparent 60%,
-      rgba(255, 255, 255, 0.4) 60%,
-      rgba(255, 255, 255, 0.4) 80%,
+      rgb(255 255 255 / 40%) 60%,
+      rgb(255 255 255 / 40%) 80%,
       transparent 80%
     ),
     -webkit-linear-gradient(left, var(--color-primary), var(--color-primary));
   /* stylelint-enable */
   border-radius: 2px;
   background-size: 21px 20px, 100% 100%, 100% 100%;
-  -webkit-animation: animate-stripes 1s linear infinite;
 }
 
 progress::-moz-progress-bar {
   /* stylelint-disable */
   background-image: -moz-linear-gradient(
       135deg,
       transparent 20%,
-      rgba(255, 255, 255, 0.4) 20%,
-      rgba(255, 255, 255, 0.4) 40%,
+      rgb(255 255 255 / 40%) 20%,
+      rgb(255 255 255 / 40%) 40%,
       transparent 40%,
       transparent 60%,
-      rgba(255, 255, 255, 0.4) 60%,
-      rgba(255, 255, 255, 0.4) 80%,
+      rgb(255 255 255 / 40%) 60%,
+      rgb(255 255 255 / 40%) 80%,
       transparent 80%
     ),
     -moz-linear-gradient(left, var(--color-primary), var(--color-primary));
@@ -239,12 +235,6 @@ progress::-moz-progress-bar {
   animation: animate-stripes 1s linear infinite;
 }
 
-@-webkit-keyframes animate-stripes {
-  100% {
-    background-position: -21px 0;
-  }
-}
-
 @keyframes animate-stripes {
   100% {
     background-position: -21px 0;
@@ -313,7 +303,7 @@ select {
 
   @screen md {
     .main > section {
-      @apply border;
+      @apply border-default;
       @apply border-grey-80;
     }
   }
@@ -323,13 +313,12 @@ select {
 
 @responsive {
   .shadow-light {
-    box-shadow: 0 0 8px 0 rgba(12, 12, 13, 0.1);
+    box-shadow: 0 0 8px 0 rgb(12 12 13 / 10%);
   }
 
   .shadow-big {
-    box-shadow: 0 12px 18px 2px rgba(34, 0, 51, 0.04),
-      0 6px 22px 4px rgba(7, 48, 114, 0.12),
-      0 6px 10px -4px rgba(14, 13, 26, 0.12);
+    box-shadow: 0 12px 18px 2px rgb(34 0 51 / 4%),
+      0 6px 22px 4px rgb(7 48 114 / 12%), 0 6px 10px -4px rgb(14 13 26 / 12%);
   }
 }
 

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) {