logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 9ddb43296f3fbb6621e646a20e86e05b6c730ad2
parent 1883f722f0d256f08c084cc4809da90173591a4d
Author: tusooa <tusooa@kazv.moe>
Date:   Mon, 18 Jul 2022 00:56:09 +0000

Merge branch 'from/develop/tusooa/export' into 'develop'

Fix non-8bit string export problem

Closes #1174

See merge request pleroma/pleroma-fe!1555

Diffstat:

Mpackage.json1+
Msrc/services/export_import/export_import.js4+++-
Myarn.lock5+++++
3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json @@ -38,6 +38,7 @@ "punycode.js": "2.1.0", "qrcode": "1", "ruffle-mirror": "2021.12.31", + "utf8": "^3.0.0", "vue": "^3.2.31", "vue-i18n": "^9.2.0-beta.34", "vue-router": "4.0.14", diff --git a/src/services/export_import/export_import.js b/src/services/export_import/export_import.js @@ -1,9 +1,11 @@ +import utf8 from 'utf8' + export const newExporter = ({ filename = 'data', getExportedObject }) => ({ exportData () { - const stringified = JSON.stringify(getExportedObject(), null, 2) // Pretty-print and indent with 2 spaces + const stringified = utf8.encode(JSON.stringify(getExportedObject(), null, 2)) // Pretty-print and indent with 2 spaces // Create an invisible link with a data url and simulate a click const e = document.createElement('a') diff --git a/yarn.lock b/yarn.lock @@ -10118,6 +10118,11 @@ use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" +utf8@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" + integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"