From 5482581eb973f2385a9427a64c47659ce871261d Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Mon, 6 Jul 2020 00:27:54 +0200
Subject: [PATCH] chore: make everything work without warnings again

---
 angular.json                              | 24 +++++++++++-
 src/app/app.constants.ts                  | 45 +++++++----------------
 src/app/core/language/language.service.ts |  5 +--
 src/main.ts                               |  1 -
 4 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/angular.json b/angular.json
index e60b5dac4..52f196719 100644
--- a/angular.json
+++ b/angular.json
@@ -25,6 +25,27 @@
             "customWebpackConfig": {
               "path": "./extra-webpack.config.js"
             },
+            "allowedCommonJsDependencies": [
+              "shortid",
+              "dragula",
+              "crossvent",
+              "contra/emitter",
+              "file-saver",
+              "semver",
+              "debounce-fn",
+              "stack-generator",
+              "stacktrace-gps",
+              "error-stack-parser",
+              "stacktrace-js",
+              "helpful-decorators",
+              "pkce-challenge",
+              "moment-duration-format",
+              "axios",
+              "crypto",
+              "jira2md",
+              "query-string",
+              "chart.js"
+            ],
             "aot": true,
             "outputPath": "dist",
             "index": "src/index.html",
@@ -60,7 +81,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": true,
-              "evalSourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
@@ -162,4 +182,4 @@
       "style": "scss"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/app.constants.ts b/src/app/app.constants.ts
index ffd57cd65..12236dba1 100644
--- a/src/app/app.constants.ts
+++ b/src/app/app.constants.ts
@@ -4,37 +4,20 @@ export const TRACKING_INTERVAL = 1000;
 
 export const MODEL_VERSION_KEY = '__modelVersion';
 
-import en from '@angular/common/locales/en';
-import es from '@angular/common/locales/es';
-import de from '@angular/common/locales/de';
-import ar from '@angular/common/locales/ar';
-import fa from '@angular/common/locales/fa';
-import fr from '@angular/common/locales/fr';
-import ja from '@angular/common/locales/ja';
-import ko from '@angular/common/locales/ko';
-import ru from '@angular/common/locales/ru';
-import tr from '@angular/common/locales/tr';
-import zh from '@angular/common/locales/zh';
-import it from '@angular/common/locales/it';
-import pt from '@angular/common/locales/pt';
-import nl from '@angular/common/locales/nl';
-
-export const NG_LOCALES = {
-  en,
-  es,
-  de,
-  ar,
-  fa,
-  fr,
-  ja,
-  ko,
-  ru,
-  tr,
-  zh,
-  it,
-  pt,
-  nl,
-};
+import '@angular/common/locales/global/en';
+import '@angular/common/locales/global/es';
+import '@angular/common/locales/global/de';
+import '@angular/common/locales/global/ar';
+import '@angular/common/locales/global/fa';
+import '@angular/common/locales/global/fr';
+import '@angular/common/locales/global/ja';
+import '@angular/common/locales/global/ko';
+import '@angular/common/locales/global/ru';
+import '@angular/common/locales/global/tr';
+import '@angular/common/locales/global/zh';
+import '@angular/common/locales/global/it';
+import '@angular/common/locales/global/pt';
+import '@angular/common/locales/global/nl';
 
 export const ALL_THEMES = [
   'blue',
diff --git a/src/app/core/language/language.service.ts b/src/app/core/language/language.service.ts
index 33456c71f..f25274450 100644
--- a/src/app/core/language/language.service.ts
+++ b/src/app/core/language/language.service.ts
@@ -3,9 +3,8 @@ import { TranslateService } from '@ngx-translate/core';
 import { DateTimeAdapter } from 'ngx-date-time-picker-schedule';
 import { DateAdapter } from '@angular/material/core';
 import * as moment from 'moment';
-import { AUTO_SWITCH_LNGS, LanguageCode, LanguageCodeMomentMap, NG_LOCALES, RTL_LANGUAGES } from '../../app.constants';
+import { AUTO_SWITCH_LNGS, LanguageCode, LanguageCodeMomentMap, RTL_LANGUAGES } from '../../app.constants';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { registerLocaleData } from '@angular/common';
 
 @Injectable({providedIn: 'root'})
 export class LanguageService {
@@ -44,8 +43,6 @@ export class LanguageService {
 
   private _setFn(lng: LanguageCode) {
     const momLng = LanguageCodeMomentMap[lng];
-    const ngLocale = NG_LOCALES[lng];
-    registerLocaleData(ngLocale);
 
     this.isRTL.next(this._isRTL(lng));
     this._translateService.use(lng);
diff --git a/src/main.ts b/src/main.ts
index 0d3c2f019..f7fcb305f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,6 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 import { IS_ELECTRON } from './app/app.constants';
-import 'hammerjs';
 import { IS_ANDROID_WEB_VIEW } from './app/util/is-android-web-view';
 import { androidInterface } from './app/core/android/android-interface';