diff --git a/.vscode/settings.json b/.vscode/settings.json index 60f483623..11e98bb4e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,9 +2,9 @@ "i18n-ally.sourceLanguage": "en", "i18n-ally.keystyle": "nested", "i18n-ally.localesPaths": [ - "packages/stage-web/locales", - "packages/stage-tamagotchi/src/renderer/locales", - "packages/stage-tamagotchi/src/main/locales" + "apps/stage-web/locales", + "apps/stage-tamagotchi/src/renderer/locales", + "apps/stage-tamagotchi/src/main/locales" ], "i18n-ally.sortKeys": true, diff --git a/apps/moonshine-web/netlify.toml b/apps/moonshine-web/netlify.toml index 4d6bc4c13..f47c2b2f6 100755 --- a/apps/moonshine-web/netlify.toml +++ b/apps/moonshine-web/netlify.toml @@ -1,6 +1,7 @@ [build] -publish = "apps/moonshine-web/dist" -command = "pnpm run packages:stub && pnpm -F @proj-airi/moonshine-web run build" +base = "/" +command = "pnpm -F @proj-airi/moonshine-web... run build" +publish = "/apps/moonshine-web/dist" [build.environment] NODE_VERSION = "23" diff --git a/apps/moonshine-web/package.json b/apps/moonshine-web/package.json index a8e99b929..e24f71c60 100644 --- a/apps/moonshine-web/package.json +++ b/apps/moonshine-web/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@tresjs/core": "^4.3.3", - "@unocss/reset": "^65.5.0", + "@unocss/reset": "^66.0.0", "@vueuse/core": "^12.7.0", "@vueuse/motion": "^2.2.6", "ofetch": "^1.4.1", diff --git a/apps/moonshine-web/uno.config.ts b/apps/moonshine-web/uno.config.ts index cfcbf99fc..a80859ddc 100644 --- a/apps/moonshine-web/uno.config.ts +++ b/apps/moonshine-web/uno.config.ts @@ -1,21 +1,33 @@ -import { defineConfig, mergeConfigs, presetIcons, presetWebFonts } from 'unocss' +import { + defineConfig, + presetAttributify, + presetIcons, + presetTypography, + presetWebFonts, + presetWind3, + transformerDirectives, + transformerVariantGroup, +} from 'unocss' -import UnoCSSConfig from '../../uno.config' - -export default defineConfig(mergeConfigs([ - UnoCSSConfig, - { - presets: [ - presetWebFonts({ - fonts: { - sans: 'DM Sans', - serif: 'DM Serif Display', - mono: 'DM Mono', - }, - }), - presetIcons({ - scale: 1.2, - }), - ], - }, -])) +export default defineConfig({ + presets: [ + presetWind3(), + presetAttributify(), + presetTypography(), + presetWebFonts({ + fonts: { + sans: 'DM Sans', + serif: 'DM Serif Display', + mono: 'DM Mono', + }, + }), + presetIcons({ + scale: 1.2, + }), + ], + transformers: [ + transformerDirectives(), + transformerVariantGroup(), + ], + safelist: 'prose prose-sm m-auto text-left'.split(' '), +}) diff --git a/apps/stage-tamagotchi/package.json b/apps/stage-tamagotchi/package.json index 78b00ac94..f29bac0da 100644 --- a/apps/stage-tamagotchi/package.json +++ b/apps/stage-tamagotchi/package.json @@ -48,8 +48,8 @@ "@tresjs/core": "^4.3.3", "@types/yauzl": "^2.10.3", "@typeschema/valibot": "^0.14.0", - "@unhead/vue": "^1.11.19", - "@unocss/reset": "^65.5.0", + "@unhead/vue": "^2.0.0-alpha.16", + "@unocss/reset": "^66.0.0", "@vueuse/core": "^12.7.0", "@vueuse/head": "^2.0.0", "@vueuse/shared": "^12.7.0", @@ -71,7 +71,7 @@ "rehype-stringify": "^10.0.1", "remark-parse": "^11.0.0", "remark-rehype": "^11.1.1", - "shiki": "^2.4.2", + "shiki": "^2.5.0", "three": "^0.173.0", "unified": "^11.0.5", "valibot": "1.0.0-beta.9", @@ -95,7 +95,7 @@ "@proj-airi/elevenlabs": "workspace:^", "@proj-airi/unplugin-download": "workspace:^", "@proj-airi/unplugin-live2d-sdk": "workspace:^", - "@shikijs/markdown-it": "^2.4.2", + "@shikijs/markdown-it": "^2.5.0", "@types/markdown-it-link-attributes": "^3.0.5", "@types/nprogress": "^0.2.3", "@types/three": "^0.173.0", @@ -107,9 +107,9 @@ "electron-vite": "^2.3.0", "markdown-it-link-attributes": "^4.0.1", "unplugin-auto-import": "^19.1.0", - "unplugin-vue-components": "^28.2.0", + "unplugin-vue-components": "^28.4.0", "unplugin-vue-macros": "^2.14.2", - "unplugin-vue-markdown": "^28.3.0", + "unplugin-vue-markdown": "^28.3.1", "unplugin-vue-router": "^0.11.2", "vite-bundle-visualizer": "^1.2.1", "vite-plugin-pwa": "^0.21.1", diff --git a/apps/stage-tamagotchi/src/renderer/src/pages/settings.vue b/apps/stage-tamagotchi/src/renderer/src/pages/settings.vue index 538acbf96..530a94cda 100644 --- a/apps/stage-tamagotchi/src/renderer/src/pages/settings.vue +++ b/apps/stage-tamagotchi/src/renderer/src/pages/settings.vue @@ -160,14 +160,14 @@ function handleQuit() { - - - - - -