From 752bbf1f32191d596d4252510bb5a21e950126a1 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 26 May 2023 08:53:44 +0900 Subject: [PATCH 1/4] [refactor] seperate polyfill --- src/main.ts | 28 ++-------------------------- src/ts/polyfill.ts | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 src/ts/polyfill.ts diff --git a/src/main.ts b/src/main.ts index 25899d8d..d5c8268d 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,34 +2,10 @@ import "./styles.css"; import "core-js/actual" import App from "./App.svelte"; import { loadData } from "./ts/globalApi"; -import { ReadableStream, WritableStream, TransformStream } from "web-streams-polyfill/ponyfill/es2018"; -import { Buffer as BufferPolyfill } from 'buffer' import { initHotkey } from "./ts/hotkey"; +import { polyfill } from "./ts/polyfill"; -const testDom = document.createElement('div'); -const supports = ('draggable' in testDom) || ('ondragstart' in testDom && 'ondrop' in testDom); -const isIos = navigator.userAgent ? (!!navigator.userAgent.match('iPhone OS') || !!navigator.userAgent.match('iPad')) : false -testDom.remove() - -if((!supports) || isIos){ - const dragDrop = await import("mobile-drag-drop") - const dragDropBehavior = await import("mobile-drag-drop/scroll-behaviour") - - dragDrop.polyfill({ - // use this to make use of the scroll behaviour - dragImageTranslateOverride: dragDropBehavior.scrollBehaviourDragImageTranslateOverride, - holdToDrag: 400, - forceApply: true - }); -} - -//Polyfills -declare var Buffer: typeof BufferPolyfill; -globalThis.Buffer = BufferPolyfill -//@ts-ignore -globalThis.WritableStream = globalThis.WritableStream ?? WritableStream -globalThis.ReadableStream = globalThis.ReadableStream ?? ReadableStream -globalThis.TransformStream = globalThis.TransformStream ?? TransformStream +polyfill() const app = new App({ target: document.getElementById("app"), diff --git a/src/ts/polyfill.ts b/src/ts/polyfill.ts new file mode 100644 index 00000000..66c01dcf --- /dev/null +++ b/src/ts/polyfill.ts @@ -0,0 +1,30 @@ +import { ReadableStream, WritableStream, TransformStream } from "web-streams-polyfill/ponyfill/es2018"; +import { Buffer as BufferPolyfill } from 'buffer' +import { polyfill as dragPolyfill} from "mobile-drag-drop" +import {scrollBehaviourDragImageTranslateOverride} from 'mobile-drag-drop/scroll-behaviour' + +export function polyfill() { + try { + const testDom = document.createElement('div'); + const supports = ('draggable' in testDom) || ('ondragstart' in testDom && 'ondrop' in testDom); + const isIos = navigator.userAgent ? (!!navigator.userAgent.match('iPhone OS') || !!navigator.userAgent.match('iPad')) : false + testDom.remove() + + if((!supports) || isIos){ + + dragPolyfill({ + // use this to make use of the scroll behaviour + dragImageTranslateOverride: scrollBehaviourDragImageTranslateOverride, + holdToDrag: 400, + forceApply: true + }); + } + } catch (error) { + + } + globalThis.Buffer = BufferPolyfill + //@ts-ignore + globalThis.WritableStream = globalThis.WritableStream ?? WritableStream + globalThis.ReadableStream = globalThis.ReadableStream ?? ReadableStream + globalThis.TransformStream = globalThis.TransformStream ?? TransformStream +} \ No newline at end of file From 29d8a2574bca1b5484111f6d0c519bee47e027f1 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 26 May 2023 08:58:25 +0900 Subject: [PATCH 2/4] [feat] add portuguese and german to translator --- src/lib/Setting/Pages/LanguageSettings.svelte | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/Setting/Pages/LanguageSettings.svelte b/src/lib/Setting/Pages/LanguageSettings.svelte index dfbf135c..ea143e04 100644 --- a/src/lib/Setting/Pages/LanguageSettings.svelte +++ b/src/lib/Setting/Pages/LanguageSettings.svelte @@ -28,6 +28,9 @@ import { changeLanguage, language } from "src/lang"; + + + {#if $DataBase.translator} From 1e49c38d9174cbb60f18aa63aded31663182c453 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 26 May 2023 09:04:33 +0900 Subject: [PATCH 3/4] [feat] translator post process --- src/ts/translator/translator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ts/translator/translator.ts b/src/ts/translator/translator.ts index 8dbfb8b5..5c995e9e 100644 --- a/src/ts/translator/translator.ts +++ b/src/ts/translator/translator.ts @@ -65,7 +65,7 @@ async function googleTrans(text:string, reverse:boolean) { } - const result = res[0].map((s) => s[0]).filter(Boolean).join(''); + const result = (res[0].map((s) => s[0]).filter(Boolean).join('') as string).replace(/\* ([^*]+)\*/g, '*$1*').replace(/\*([^*]+) \*/g, '*$1*'); cache.origin.push(reverse ? result : text) From 1969808b25bbe01e97be8d64d99d293e5943f01a Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 26 May 2023 09:05:07 +0900 Subject: [PATCH 4/4] bump version to 1.18.2 --- src-tauri/tauri.conf.json | 2 +- src/ts/database.ts | 2 +- version.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7e1b42ac..0b3a732f 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "1.18.1" + "version": "1.18.2" }, "tauri": { "allowlist": { diff --git a/src/ts/database.ts b/src/ts/database.ts index b1f4f8b2..488f3467 100644 --- a/src/ts/database.ts +++ b/src/ts/database.ts @@ -7,7 +7,7 @@ import { cloneDeep } from 'lodash'; export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = '1.18.1' +export let appVer = '1.18.2' export function setDatabase(data:Database){ diff --git a/version.json b/version.json index d620d307..730763c6 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"1.18.1"} \ No newline at end of file +{"version":"1.18.2"} \ No newline at end of file