feat: replace he with entities to decode html

shopware · Nov 21, 2022 · d7da2c1 · d7da2c1
1 parent cae882b
commit d7da2c1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/.changeset/tidy-games-grow.md b/.changeset/tidy-games-grow.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/cms-base": minor
+---
+
+change of html entites parser library
diff --git a/packages/cms-base/components/public/cms/element/CmsElementText.vue b/packages/cms-base/components/public/cms/element/CmsElementText.vue
@@ -1,13 +1,12 @@
 <script setup lang="ts">
 import type { CmsElementText } from "@shopware-pwa/composables-next";
 import { useCmsElementConfig } from "@shopware-pwa/composables-next";
+import { h } from "vue";
 import { CSSProperties } from "vue";
+import { decodeHTML } from "entities";
 // @ts-ignore
 import htmlToVue from "html-to-vue";
 // @ts-ignore
-import he from "he";
-const { decode } = he;
-// @ts-ignore
 const { renderHtml, getOptionsFromNode } = htmlToVue;
 const props = defineProps<{
   content: CmsElementText;
@@ -27,7 +26,7 @@ const hasVerticalAlignment = computed(() => !!style.value.alignItems);
 
 const CmsTextRender = () => {
   const config = {
-    textTransformer: (text: string) => decode(text),
+    textTransformer: (text: string) => decodeHTML(text),
     extraComponentsMap: {
       link: {
         conditions(node: any) {

diff --git a/packages/cms-base/package.json b/packages/cms-base/package.json
@@ -23,7 +23,7 @@
     "@shopware-pwa/api-client": "workspace:*",
     "@shopware-pwa/composables-next": "workspace:*",
     "@shopware-pwa/helpers-next": "workspace:*",
-    "he": "^1.2.0",
+    "entities": "^4.4.0",
     "html-to-vue": "^1.4.0"
   },
   "devDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/templates/vue-demo-store/package.json b/templates/vue-demo-store/package.json
@@ -7,7 +7,8 @@
     "build": "NITRO_PRESET=vercel nuxi build",
     "lint": "eslint ./**/*.vue* app.vue --fix --max-warnings=0",
     "generate": "nuxt generate",
-    "preview": "nuxt preview"
+    "preview": "nuxt preview",
+    "analyze": "nuxi analyze"
   },
   "dependencies": {
     "@shopware-pwa/cms-base": "0.1.22",
@@ -27,8 +28,8 @@
     "eslint-plugin-vue": "^9.6.0",
     "nuxt": "3.0.0-rc.11",
     "typescript": "^4.8.4",
-    "vue-tsc": "^0.40.13",
-    "vue-eslint-parser": "^9.1.0"
+    "vue-eslint-parser": "^9.1.0",
+    "vue-tsc": "^0.40.13"
   },
   "engines": {
     "node": "^16.x || ^18.x"