From 7ed23f1936d8e64c4dc1b21c69b43289930184bb Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sun, 7 May 2023 16:01:45 +0900 Subject: [PATCH 1/4] [chore] fix actions to use env --- .github/workflows/github-actions-builder.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/github-actions-builder.yml b/.github/workflows/github-actions-builder.yml index 6d051360..a51d6fcc 100644 --- a/.github/workflows/github-actions-builder.yml +++ b/.github/workflows/github-actions-builder.yml @@ -22,8 +22,9 @@ jobs: node-version: 18 - id: set_var run: | - content=`cat version.json` - echo "::set-output name=packageJson::$content" + echo 'VERSION_JSON<> $GITHUB_ENV + cat ./version.json >> $GITHUB_ENV + echo 'EOF' >> $GITHUB_ENV - name: install pnpm uses: pnpm/action-setup@v2 with: @@ -46,8 +47,8 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "latest" - tag_name: "${{fromJson(steps.set_var.outputs.packageJson).version}}" - name: "${{fromJson(steps.set_var.outputs.packageJson).version}}" + tag_name: "${{fromJson(env.VERSION_JSON).version}}" + name: "${{fromJson(env.VERSION_JSON).version}}" generate_release_notes: true files: | src-tauri/target/x86_64-unknown-linux-gnu/release/**/*.deb @@ -59,8 +60,8 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "latest" - tag_name: "${{fromJson(steps.set_var.outputs.packageJson).version}}" - name: "${{fromJson(steps.set_var.outputs.packageJson).version}}" + tag_name: "${{fromJson(env.VERSION_JSON).version}}" + name: "${{fromJson(env.VERSION_JSON).version}}" generate_release_notes: true files: | src-tauri/target/x86_64-apple-darwin/release/bundle/macos/*.app @@ -72,8 +73,8 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "latest" - tag_name: "${{fromJson(steps.set_var.outputs.packageJson).version}}" - name: "${{fromJson(steps.set_var.outputs.packageJson).version}}" + tag_name: "${{fromJson(env.VERSION_JSON).version}}" + name: "${{fromJson(env.VERSION_JSON).version}}" generate_release_notes: true files: | src-tauri/target/x86_64-pc-windows-msvc/release/**/*.msi \ No newline at end of file From b0b86978218f4ca2958e02c45476815d08497da0 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sun, 7 May 2023 16:21:33 +0900 Subject: [PATCH 2/4] fix charconfig --- src/lib/SideBars/CharConfig.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte index f2f1917d..b27a445a 100644 --- a/src/lib/SideBars/CharConfig.svelte +++ b/src/lib/SideBars/CharConfig.svelte @@ -78,6 +78,7 @@ } } } + currentChar = currentChar } From 35c52aff4079523cb7903e477632efe0011387a3 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sun, 7 May 2023 16:27:53 +0900 Subject: [PATCH 3/4] [fix] sw reloading when unregistered --- src/lib/SideBars/CharConfig.svelte | 2 +- src/ts/globalApi.ts | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte index b27a445a..3f9ee72f 100644 --- a/src/lib/SideBars/CharConfig.svelte +++ b/src/lib/SideBars/CharConfig.svelte @@ -196,7 +196,7 @@ {language.authorNote} {tokens.localNote} {language.tokens} - +
{language.jailbreakToggle} diff --git a/src/ts/globalApi.ts b/src/ts/globalApi.ts index c958a566..95a8ecd1 100644 --- a/src/ts/globalApi.ts +++ b/src/ts/globalApi.ts @@ -105,7 +105,7 @@ export async function getFileSrc(loc:string) { } return "/sw/img/" + encoded } catch (error) { - location.reload() + } } else{ @@ -252,9 +252,15 @@ export async function loadData() { } if(navigator.serviceWorker){ usingSw = true - const rej = await navigator.serviceWorker.register("/sw.js", { + await navigator.serviceWorker.register("/sw.js", { scope: "/" }); + + await sleep(100) + const da = await fetch('/sw/init') + if(!(da.status >= 200 && da.status < 300)){ + location.reload() + } } else{ usingSw = false From d6f441052424172f17f17d5705bf492fabb0ab29 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Sun, 7 May 2023 16:30:20 +0900 Subject: [PATCH 4/4] update version to 0.6.7 --- 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 6f569a94..7c2508a0 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "RisuAI", - "version": "0.6.6" + "version": "0.6.7" }, "tauri": { "allowlist": { diff --git a/src/ts/database.ts b/src/ts/database.ts index e28360c9..ef58e80b 100644 --- a/src/ts/database.ts +++ b/src/ts/database.ts @@ -6,7 +6,7 @@ import { saveImage as saveImageGlobal } from './globalApi'; export const DataBase = writable({} as any as Database) export const loadedStore = writable(false) -export let appVer = '0.6.6' +export let appVer = '0.6.7' export function setDatabase(data:Database){ diff --git a/version.json b/version.json index 2ab2aec2..9159daa1 100644 --- a/version.json +++ b/version.json @@ -1 +1 @@ -{"version":"0.6.6"} +{"version":"0.6.7"}