From 8f66e2ff07fe6a89792e93da91caeebd945067c9 Mon Sep 17 00:00:00 2001
From: icebergtsn <zyh2433219116@gmail.com>
Date: Thu, 26 Sep 2024 22:00:28 +0800
Subject: [PATCH] feat: update app dependencies and try catch i18n error

---
 frontend/package-lock.json                    | 23 +++--
 frontend/package.json                         | 20 ++--
 frontend/quasar.config.js                     | 20 ++--
 .../components/appintro/ExpendTextView.vue    |  5 +-
 frontend/src/constants/constants.ts           | 97 ++++++++++---------
 frontend/src/pages/application/HomePage.vue   |  2 +-
 frontend/src/stores/user.ts                   |  5 +-
 frontend/yarn.lock                            |  5 +
 8 files changed, 100 insertions(+), 77 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 3a96267..e3958dc 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -12,10 +12,11 @@
         "@bytetrade/ui": "^0.1.12",
         "@quasar/extras": "^1.16.9",
         "axios": "^0.21.1",
+        "dompurify": "^3.1.7",
         "fetch": "1.1.0",
+        "he": "^1.2.0",
         "highlight.js": "^11.9.0",
         "js-base64": "^3.7.5",
-        "lodash": "^4.17.21",
         "lodash.throttle": "^4.1.1",
         "markdown-it": "^14.1.0",
         "markdown-it-mark": "^4.0.0",
@@ -6393,6 +6394,11 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
+    "node_modules/dompurify": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz",
+      "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ=="
+    },
     "node_modules/domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
@@ -8205,7 +8211,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true,
       "bin": {
         "he": "bin/he"
       }
@@ -9709,7 +9714,8 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
@@ -19881,6 +19887,11 @@
         "domelementtype": "^2.2.0"
       }
     },
+    "dompurify": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz",
+      "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ=="
+    },
     "domutils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
@@ -21239,8 +21250,7 @@
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
     },
     "highlight.js": {
       "version": "11.9.0",
@@ -22348,7 +22358,8 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
     },
     "lodash.debounce": {
       "version": "4.0.8",
diff --git a/frontend/package.json b/frontend/package.json
index 6df8ab9..4a88e9e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -9,18 +9,20 @@
     "lint": "eslint --ext .js,.ts,.vue ./ --fix",
     "format": "prettier --write \"**/*.{js,ts,vue,scss,html,md,json}\" --ignore-path .gitignore",
     "test": "echo \"No test specified\" && exit 0",
-		"dev": "quasar dev",
-		"dev:public": "PUBLIC_URL=https://app-test.jointerminus.com quasar dev",
-		"dev:public:prd": "PUBLIC_URL=https://app.jointerminus.com quasar dev",
-		"build": "quasar build",
-		"build:pwa": "quasar build -m pwa"
+    "dev": "quasar dev",
+    "dev:public": "PUBLIC_URL=https://app-test.jointerminus.com quasar dev",
+    "dev:public:prd": "PUBLIC_URL=https://app.jointerminus.com quasar dev",
+    "build": "quasar build",
+    "build:pwa": "quasar build -m pwa"
   },
   "dependencies": {
     "@bytetrade/core": "^0.3.53",
-		"@bytetrade/ui": "^0.1.12",
+    "@bytetrade/ui": "^0.1.12",
     "@quasar/extras": "^1.16.9",
     "axios": "^0.21.1",
+    "dompurify": "^3.1.7",
     "fetch": "1.1.0",
+    "he": "^1.2.0",
     "highlight.js": "^11.9.0",
     "js-base64": "^3.7.5",
     "lodash.throttle": "^4.1.1",
@@ -39,13 +41,12 @@
     "vue-router": "^4.0.0"
   },
   "devDependencies": {
-		"css-minimizer-webpack-plugin": "^7.0.0",
-		"terser-webpack-plugin": "^5.3.10",
-		"@quasar/app-webpack": "^3.0.0",
+    "@quasar/app-webpack": "^3.0.0",
     "@types/node": "^12.20.21",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
     "autoprefixer": "^10.4.2",
+    "css-minimizer-webpack-plugin": "^7.0.0",
     "dotenv": "^16.3.1",
     "eslint": "^8.10.0",
     "eslint-config-prettier": "^8.10.0",
@@ -53,6 +54,7 @@
     "eslint-plugin-vue": "^9.0.0",
     "prettier": "^3.2.5",
     "sass": "1.33.0",
+    "terser-webpack-plugin": "^5.3.10",
     "typescript": "^4.5.4",
     "workbox-build": "^6.5.0",
     "workbox-cacheable-response": "^6.5.0",
diff --git a/frontend/quasar.config.js b/frontend/quasar.config.js
index 411924a..7a3d70d 100644
--- a/frontend/quasar.config.js
+++ b/frontend/quasar.config.js
@@ -113,16 +113,16 @@ module.exports = configure(function (/* ctx */) {
 						}
 					]);
 				}
-				chain.plugin('terser').use(TerserPlugin, [
-					{
-						terserOptions: {
-							compress: {
-								drop_console: true,
-								pure_funcs: ['console.log']
-							}
-						}
-					}
-				]);
+				// chain.plugin('terser').use(TerserPlugin, [
+				// 	{
+				// 		terserOptions: {
+				// 			compress: {
+				// 				drop_console: true,
+				// 				pure_funcs: ['console.log']
+				// 			}
+				// 		}
+				// 	}
+				// ]);
 				chain.optimization.splitChunks({
 					chunks: 'all', // The type of chunk that requires code segmentation
 					minSize: 20000, // Minimum split file size
diff --git a/frontend/src/components/appintro/ExpendTextView.vue b/frontend/src/components/appintro/ExpendTextView.vue
index 9b69f9f..6719b27 100644
--- a/frontend/src/components/appintro/ExpendTextView.vue
+++ b/frontend/src/components/appintro/ExpendTextView.vue
@@ -18,8 +18,9 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, computed, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { i18n } from 'src/boot/i18n';
+import { encode } from 'he';
 
 const props = defineProps({
 	text: {
@@ -47,7 +48,7 @@ const showDescription = ref(false);
 const needMore = ref(false);
 
 const formattedDescription = computed(() => {
-	return props.text.replace(/(\r\n|\n|\r)/gm, '<br/>');
+	return encode(props.text).replace(/\r\n|\n|\r/g, '<br/>');
 });
 
 const multiRow = ref<HTMLElement | null>(null);
diff --git a/frontend/src/constants/constants.ts b/frontend/src/constants/constants.ts
index b0827b9..45ae63a 100644
--- a/frontend/src/constants/constants.ts
+++ b/frontend/src/constants/constants.ts
@@ -348,52 +348,59 @@ export function getAppFieldI18n(
 	field: APP_FIELD,
 	index = -1
 ) {
-	let key = '';
-	switch (field) {
-		case APP_FIELD.DESCRIPTION:
-		case APP_FIELD.TITLE:
-		case APP_FIELD.FULL_DESCRIPTION:
-		case APP_FIELD.UPGRADE_DESCRIPTION:
-			key = app.name + '_' + field;
-			break;
-		case APP_FIELD.ENTRANCES_NAME:
-		case APP_FIELD.ENTRANCES_TITLE:
-			if (index !== -1) {
-				key =
-					app.name +
-					'_' +
-					APP_FIELD.ENTRANCES_NAME.replace('?', index.toString());
-			}
-			break;
-	}
-	if (key) {
-		const exist = i18n.global.te(key);
-		// console.log(key, exist);
-		if (exist) {
-			return i18n.global.t(key);
+	const defaultConfig = () => {
+		switch (field) {
+			case APP_FIELD.DESCRIPTION:
+				return app.desc;
+			case APP_FIELD.TITLE:
+			case APP_FIELD.FULL_DESCRIPTION:
+			case APP_FIELD.UPGRADE_DESCRIPTION:
+				return app[field];
+			case APP_FIELD.ENTRANCES_NAME:
+				if (index !== -1) {
+					const array1 = app.entrances;
+					return array1[index].name;
+				} else {
+					return '';
+				}
+			case APP_FIELD.ENTRANCES_TITLE:
+				if (index !== -1) {
+					const array2 = app.entrances;
+					return array2[index].title;
+				} else {
+					return '';
+				}
 		}
-	}
-
-	switch (field) {
-		case APP_FIELD.DESCRIPTION:
-			return app.desc;
-		case APP_FIELD.TITLE:
-		case APP_FIELD.FULL_DESCRIPTION:
-		case APP_FIELD.UPGRADE_DESCRIPTION:
-			return app[field];
-		case APP_FIELD.ENTRANCES_NAME:
-			if (index !== -1) {
-				const array1 = app.entrances;
-				return array1[index].name;
-			} else {
-				return '';
-			}
-		case APP_FIELD.ENTRANCES_TITLE:
-			if (index !== -1) {
-				const array2 = app.entrances;
-				return array2[index].title;
-			} else {
-				return '';
+	};
+	try {
+		let key = '';
+		switch (field) {
+			case APP_FIELD.DESCRIPTION:
+			case APP_FIELD.TITLE:
+			case APP_FIELD.FULL_DESCRIPTION:
+			case APP_FIELD.UPGRADE_DESCRIPTION:
+				key = app.name + '_' + field;
+				break;
+			case APP_FIELD.ENTRANCES_NAME:
+			case APP_FIELD.ENTRANCES_TITLE:
+				if (index !== -1) {
+					key =
+						app.name +
+						'_' +
+						APP_FIELD.ENTRANCES_NAME.replace('?', index.toString());
+				}
+				break;
+		}
+		if (key) {
+			const exist = i18n.global.te(key);
+			if (exist) {
+				return i18n.global.t(key);
 			}
+		}
+		return defaultConfig();
+	} catch (e) {
+		console.log(`${app.name} ${field} i18n config error`);
+		console.log(e);
+		return defaultConfig();
 	}
 }
diff --git a/frontend/src/pages/application/HomePage.vue b/frontend/src/pages/application/HomePage.vue
index 4f54d74..1450379 100644
--- a/frontend/src/pages/application/HomePage.vue
+++ b/frontend/src/pages/application/HomePage.vue
@@ -176,7 +176,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, watch } from 'vue';
+import { ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import {
 	AppStoreInfo,
diff --git a/frontend/src/stores/user.ts b/frontend/src/stores/user.ts
index 049862b..77f8714 100644
--- a/frontend/src/stores/user.ts
+++ b/frontend/src/stores/user.ts
@@ -262,10 +262,7 @@ export const useUserStore = defineStore('userStore', {
 
 				for (let i = 0; i < app.options.dependencies.length; i++) {
 					const dependency = app.options.dependencies[i];
-					if (
-						dependency.type === DEPENDENCIES_TYPE.application ||
-						dependency.type === DEPENDENCIES_TYPE.middleware
-					) {
+					if (dependency.type === DEPENDENCIES_TYPE.middleware) {
 						this._saveDependencies(app, dependency);
 
 						if (!nameList.includes(dependency.name)) {
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 6badc57..7c41f61 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -3452,6 +3452,11 @@ domhandler@^5.0.2, domhandler@^5.0.3:
   dependencies:
     domelementtype "^2.3.0"
 
+dompurify@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz"
+  integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==
+
 domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"