Merge branch 'release/4.0.0' into develop

[github/Chocobozzz/PeerTube.git] / client / angular.json

diff --git a/client/angular.json b/client/angular.json
index 0ec6f68bb39a4cedae4d2b5760b9a73f4a3125ef..455c9fbde3da317c22d9bfbabd6caa2f9493192d 100644 (file)
--- a/client/angular.json
+++ b/client/angular.json
@@ -138,7 +138,6 @@
             "tsConfig": "tsconfig.json",
             "polyfills": "src/polyfills.ts",
             "baseHref": "/",
-            "deployUrl": "",
             "stylePreprocessorOptions": {
               "includePaths": [
                 "src/sass/include"
@@ -156,6 +155,8 @@
               "chart.js",
               "htmlparser2",
               "markdown-it-emoji/light",
+              "linkifyjs/lib/linkify-html",
+              "linkifyjs/lib/plugins/mention",
               "sanitize-html",
               "debug",
               "@peertube/p2p-media-loader-hlsjs",
@@ -281,65 +282,11 @@
           "builder": "@angular-eslint/builder:lint",
           "options": {
             "lintFilePatterns": [
+              "e2e/**/*.ts",
               "src/**/*.ts",
               "src/**/*.html"
             ]
           }
-        },
-        "xliffmerge": {
-          "builder": "@ngx-i18nsupport/tooling:xliffmerge",
-          "options": {
-            "xliffmergeOptions": {
-              "i18nFormat": "xlf",
-              "srcDir": "src/locale",
-              "genDir": "src/locale",
-              "i18nBaseFile": "angular",
-              "defaultLanguage": "en-US",
-              "languages": [
-                "ar",
-                "ca-ES",
-                "gl-ES",
-                "cs-CZ",
-                "da-DK",
-                "de-DE",
-                "el-GR",
-                "en-GB",
-                "en-US",
-                "eo",
-                "es-ES",
-                "eu-ES",
-                "fa-IR",
-                "fi-FI",
-                "fr-FR",
-                "gd",
-                "gl-ES",
-                "hu-HU",
-                "it-IT",
-                "ja-JP",
-                "jbo",
-                "kab",
-                "ko-KR",
-                "lt-LT",
-                "nb-NO",
-                "nl-NL",
-                "oc",
-                "pl-PL",
-                "pt-BR",
-                "pt-PT",
-                "ru-RU",
-                "sk-SK",
-                "sl-SI",
-                "sv-SE",
-                "ta",
-                "th-TH",
-                "tr-TR",
-                "uk-UA",
-                "vi-VN",
-                "zh-Hans-CN",
-                "zh-Hant-TW"
-              ]
-            }
-          }
         }
       }
     }