Upgrade package.json.

8 files changed, 18 insertions, 35 deletions

diff --git a/ui/src/components/comment-form.tsx b/ui/src/components/comment-form.tsx
index bebe6269..f5816899 100644
--- a/ui/src/components/comment-form.tsx
+++ b/ui/src/components/comment-form.tsx
@@ -18,11 +18,11 @@ import {
   markdownHelpUrl,
 } from '../utils';
 import { WebSocketService, UserService } from '../services';
-import * as autosize from 'autosize';
+import autosize from 'autosize';
 import { i18n } from '../i18next';
 import { T } from 'inferno-i18next';
 import Tribute from 'tributejs/src/Tribute.js';
-import * as emojiShortName from 'emoji-short-name';
+import emojiShortName from 'emoji-short-name';
 
 interface CommentFormProps {
   postId?: number;
diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx
index 64bc7134..4d216f97 100644
--- a/ui/src/components/comment-node.tsx
+++ b/ui/src/components/comment-node.tsx
@@ -25,7 +25,7 @@ import {
   pictshareAvatarThumbnail,
   showAvatars,
 } from '../utils';
-import * as moment from 'moment';
+import moment from 'moment';
 import { MomentTime } from './moment-time';
 import { CommentForm } from './comment-form';
 import { CommentNodes } from './comment-nodes';
diff --git a/ui/src/components/post-form.tsx b/ui/src/components/post-form.tsx
index 7964a3ff..fe633a01 100644
--- a/ui/src/components/post-form.tsx
+++ b/ui/src/components/post-form.tsx
@@ -29,7 +29,7 @@ import {
   debounce,
   isImage,
 } from '../utils';
-import * as autosize from 'autosize';
+import autosize from 'autosize';
 import { i18n } from '../i18next';
 import { T } from 'inferno-i18next';
 
@@ -107,14 +107,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
     }
 
     this.subscription = WebSocketService.Instance.subject
-      .pipe(
-        retryWhen(errors =>
-          errors.pipe(
-            delay(3000),
-            take(10)
-          )
-        )
-      )
+      .pipe(retryWhen(errors => errors.pipe(delay(3000), take(10))))
       .subscribe(
         msg => this.parseMessage(msg),
         err => console.error(err),
diff --git a/ui/src/components/post.tsx b/ui/src/components/post.tsx
index a86ce2f4..d4869386 100644
--- a/ui/src/components/post.tsx
+++ b/ui/src/components/post.tsx
@@ -34,7 +34,7 @@ import { PostListings } from './post-listings';
 import { Sidebar } from './sidebar';
 import { CommentForm } from './comment-form';
 import { CommentNodes } from './comment-nodes';
-import * as autosize from 'autosize';
+import autosize from 'autosize';
 import { i18n } from '../i18next';
 import { T } from 'inferno-i18next';
 
@@ -76,14 +76,7 @@ export class Post extends Component<any, PostState> {
     }
 
     this.subscription = WebSocketService.Instance.subject
-      .pipe(
-        retryWhen(errors =>
-          errors.pipe(
-            delay(3000),
-            take(10)
-          )
-        )
-      )
+      .pipe(retryWhen(errors => errors.pipe(delay(3000), take(10))))
       .subscribe(
         msg => this.parseMessage(msg),
         err => console.error(err),
@@ -169,7 +162,6 @@ export class Post extends Component<any, PostState> {
                 post={this.state.post}
                 showBody
                 showCommunity
-                editable
                 moderators={this.state.moderators}
                 admins={this.state.admins}
               />
diff --git a/ui/src/components/site-form.tsx b/ui/src/components/site-form.tsx
index 283a87d2..5d8ff0b5 100644
--- a/ui/src/components/site-form.tsx
+++ b/ui/src/components/site-form.tsx
@@ -2,7 +2,7 @@ import { Component, linkEvent } from 'inferno';
 import { Site, SiteForm as SiteFormI } from '../interfaces';
 import { WebSocketService } from '../services';
 import { capitalizeFirstLetter } from '../utils';
-import * as autosize from 'autosize';
+import autosize from 'autosize';
 import { i18n } from '../i18next';
 import { T } from 'inferno-i18next';
 
diff --git a/ui/src/i18next.ts b/ui/src/i18next.ts
index 3dd152a4..aaaecd04 100644
--- a/ui/src/i18next.ts
+++ b/ui/src/i18next.ts
@@ -1,4 +1,4 @@
-import * as i18n from 'i18next';
+import i18next from 'i18next';
 import { getLanguage } from './utils';
 import { en } from './translations/en';
 import { eo } from './translations/eo';
@@ -30,7 +30,7 @@ function format(value: any, format: any, lng: any) {
   return value;
 }
 
-i18n.init({
+i18next.init({
   debug: false,
   // load: 'languageOnly',
 
@@ -43,4 +43,4 @@ i18n.init({
   },
 });
 
-export { i18n, resources };
+export { i18next as i18n, resources };
diff --git a/ui/src/services/UserService.ts b/ui/src/services/UserService.ts
index cdb340b6..03380e59 100644
--- a/ui/src/services/UserService.ts
+++ b/ui/src/services/UserService.ts
@@ -1,7 +1,7 @@
-import * as Cookies from 'js-cookie';
+import Cookies from 'js-cookie';
 import { User, LoginResponse } from '../interfaces';
 import { setTheme } from '../utils';
-import * as jwt_decode from 'jwt-decode';
+import jwt_decode from 'jwt-decode';
 import { Subject } from 'rxjs';
 
 export class UserService {
diff --git a/ui/src/utils.ts b/ui/src/utils.ts
index a45abdca..dc221716 100644
--- a/ui/src/utils.ts
+++ b/ui/src/utils.ts
@@ -17,9 +17,9 @@ import {
   SearchType,
 } from './interfaces';
 import { UserService } from './services/UserService';
-import * as markdown_it from 'markdown-it';
-import * as markdownitEmoji from 'markdown-it-emoji/light';
-import * as markdown_it_container from 'markdown-it-container';
+import markdown_it from 'markdown-it';
+import markdownitEmoji from 'markdown-it-emoji/light';
+import markdown_it_container from 'markdown-it-container';
 import * as twemoji from 'twemoji';
 import * as emojiShortName from 'emoji-short-name';
 
@@ -58,9 +58,7 @@ export const md = new markdown_it({
 
       if (tokens[idx].nesting === 1) {
         // opening tag
-        return (
-          '<details><summary>' + md.utils.escapeHtml(m[1]) + '</summary>\n'
-        );
+        return `<details><summary> ${md.utils.escapeHtml(m[1])} </summary>\n`;
       } else {
         // closing tag
         return '</details>\n';
@@ -266,7 +264,7 @@ export function getLanguage(): string {
 }
 
 export function getBrowserLanguage(): string {
-  return navigator.language || navigator.userLanguage;
+  return navigator.language;
 }
 
 export function getMomentLanguage(): string {