Merge branch 'release-5.12.0'

WISE-Community · Jun 12, 2020 · 093e38b · 093e38b
2 parents 6dbccd4 + 073ba12
commit 093e38b
Show file tree

Hide file tree

Showing 221 changed files with 17,716 additions and 7,442 deletions.
diff --git a/angular.json b/angular.json
@@ -4,13 +4,24 @@
   "newProjectRoot": "projects",
   "projects": {
     "wise": {
+      "i18n": {
+        "locales": {
+          "es": "src/main/webapp/site/src/locale/messages.es.xlf",
+          "zh-Hans": {
+            "translation": "src/main/webapp/site/src/locale/messages.zh-Hans.xlf",
+            "baseHref": "/"
+          },
+          "zh-Hant": "src/main/webapp/site/src/locale/messages.zh-Hant.xlf"
+        }
+      },
       "root": "src/main/webapp/site",
       "sourceRoot": "src/main/webapp/site/src",
       "projectType": "application",
       "architect": {
         "build": {
           "builder": "@angular-builders/custom-webpack:browser",
           "options": {
+            "aot": true,
             "customWebpackConfig": {
               "path": "./custom-webpack.config.js",
               "replaceDuplicatePlugins": true
@@ -21,7 +32,10 @@
             "tsConfig": "src/main/webapp/site/src/tsconfig.app.json",
             "polyfills": "src/main/webapp/site/src/polyfills.ts",
             "extractCss": true,
-            "assets": ["src/main/webapp/site/src/assets", "src/main/webapp/site/src/favicon.ico"],
+            "assets": [
+              "src/main/webapp/site/src/assets",
+              "src/main/webapp/site/src/favicon.ico"
+            ],
             "styles": [
               {
                 "input": "src/main/webapp/site/src/style/styles.scss",
@@ -32,6 +46,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": true,
@@ -52,6 +72,15 @@
               "baseHref": "/"
             },
             "production-es": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
+              "localize": [
+                "es"
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": true,
@@ -72,13 +101,15 @@
                   "with": "src/main/webapp/site/src/locale/messages.es.xlf"
                 }
               ],
-              "outputPath": "src/main/webapp/site/dist/es/",
-              "baseHref": "/es/",
-              "i18nFile": "src/main/webapp/site/src/locale/messages.es.xlf",
-              "i18nFormat": "xlf",
-              "i18nLocale": "es"
+              "outputPath": "src/main/webapp/site/dist"
             },
             "production-zh-Hans": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": true,
@@ -100,12 +131,19 @@
                 }
               ],
               "outputPath": "src/main/webapp/site/dist/",
-              "baseHref": "/",
               "i18nFile": "src/main/webapp/site/src/locale/messages.zh-Hans.xlf",
-              "i18nFormat": "xlf",
               "i18nLocale": "zh-Hans"
             },
             "production-zh-Hant": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
+              "localize": [
+                "zh-Hant"
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": true,
@@ -126,11 +164,7 @@
                   "with": "src/main/webapp/site/src/locale/messages.zh-Hant.xlf"
                 }
               ],
-              "outputPath": "src/main/webapp/site/dist/zh-Hant/",
-              "baseHref": "/zh-Hant/",
-              "i18nFile": "src/main/webapp/site/src/locale/messages.zh-Hant.xlf",
-              "i18nFormat": "xlf",
-              "i18nLocale": "zh-Hant"
+              "outputPath": "src/main/webapp/site/dist"
             }
           }
         },
@@ -159,15 +193,25 @@
             "polyfills": "src/main/webapp/site/src/polyfills.ts",
             "tsConfig": "src/main/webapp/site/src/tsconfig.spec.json",
             "scripts": [],
-            "styles": ["src/main/webapp/site/src/style/styles.scss"],
-            "assets": ["src/main/webapp/site/src/assets", "src/main/webapp/site/src/favicon.ico"]
+            "styles": [
+              "src/main/webapp/site/src/style/styles.scss"
+            ],
+            "assets": [
+              "src/main/webapp/site/src/assets",
+              "src/main/webapp/site/src/favicon.ico"
+            ]
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
-            "exclude": ["**/node_modules/**"]
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         }
       }
@@ -187,8 +231,12 @@
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": ["e2e/tsconfig.e2e.json"],
-            "exclude": ["**/node_modules/**"]
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         }
       }
@@ -198,10 +246,13 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "app"
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }