diff --git a/apps/stage-pocket/package.json b/apps/stage-pocket/package.json index cbcfe9996..fd4d5a873 100644 --- a/apps/stage-pocket/package.json +++ b/apps/stage-pocket/package.json @@ -25,6 +25,7 @@ "@capacitor/ios": "catalog:", "@capacitor/local-notifications": "catalog:", "@date-fns/utc": "^2.1.1", + "@fontsource-variable/nunito": "catalog:", "@formkit/auto-animate": "^0.9.0", "@huggingface/transformers": "^3.8.1", "@moeru/eventa": "catalog:", @@ -32,6 +33,7 @@ "@proj-airi/audio": "workspace:^", "@proj-airi/ccc": "workspace:^", "@proj-airi/drizzle-duckdb-wasm": "catalog:", + "@proj-airi/font-chillroundm": "workspace:^", "@proj-airi/font-cjkfonts-allseto": "workspace:^", "@proj-airi/font-xiaolai": "workspace:^", "@proj-airi/i18n": "workspace:^", diff --git a/apps/stage-tamagotchi/package.json b/apps/stage-tamagotchi/package.json index ac61583c1..038200120 100644 --- a/apps/stage-tamagotchi/package.json +++ b/apps/stage-tamagotchi/package.json @@ -36,6 +36,7 @@ "@fontsource-variable/comfortaa": "^5.2.8", "@fontsource-variable/dm-sans": "^5.2.8", "@fontsource-variable/jura": "^5.2.7", + "@fontsource-variable/nunito": "catalog:", "@fontsource-variable/quicksand": "^5.2.10", "@fontsource-variable/urbanist": "^5.2.7", "@fontsource/dm-mono": "^5.2.7", @@ -43,7 +44,6 @@ "@fontsource/gugi": "^5.2.7", "@fontsource/kiwi-maru": "^5.2.8", "@fontsource/m-plus-rounded-1c": "^5.2.10", - "@fontsource/sniglet": "^5.2.8", "@formkit/auto-animate": "^0.9.0", "@guiiai/logg": "catalog:", "@huggingface/transformers": "^3.8.1", @@ -53,6 +53,7 @@ "@proj-airi/audio": "workspace:^", "@proj-airi/ccc": "workspace:^", "@proj-airi/drizzle-duckdb-wasm": "catalog:", + "@proj-airi/font-chillroundm": "workspace:^", "@proj-airi/font-cjkfonts-allseto": "workspace:^", "@proj-airi/font-xiaolai": "workspace:^", "@proj-airi/i18n": "workspace:^", diff --git a/apps/stage-tamagotchi/src/renderer/main.ts b/apps/stage-tamagotchi/src/renderer/main.ts index 8d170bbad..f3bda046f 100644 --- a/apps/stage-tamagotchi/src/renderer/main.ts +++ b/apps/stage-tamagotchi/src/renderer/main.ts @@ -23,17 +23,17 @@ import 'uno.css' // Fonts import '@proj-airi/font-cjkfonts-allseto/index.css' import '@proj-airi/font-xiaolai/index.css' -import '@fontsource-variable/dm-sans' -import '@fontsource-variable/jura' -import '@fontsource-variable/quicksand' -import '@fontsource-variable/urbanist' -import '@fontsource-variable/comfortaa' -import '@fontsource/dm-mono' -import '@fontsource/dm-serif-display' -import '@fontsource/gugi' -import '@fontsource/kiwi-maru' -import '@fontsource/m-plus-rounded-1c' -import '@fontsource/sniglet' +import '@fontsource-variable/dm-sans/index.css' +import '@fontsource-variable/jura/index.css' +import '@fontsource-variable/quicksand/index.css' +import '@fontsource-variable/urbanist/index.css' +import '@fontsource-variable/comfortaa/index.css' +import '@fontsource/dm-mono/index.css' +import '@fontsource/dm-serif-display/index.css' +import '@fontsource/gugi/index.css' +import '@fontsource/kiwi-maru/index.css' +import '@fontsource/m-plus-rounded-1c/index.css' +import '@fontsource-variable/nunito/index.css' const pinia = createPinia() diff --git a/apps/stage-tamagotchi/tsconfig.web.json b/apps/stage-tamagotchi/tsconfig.web.json index 8dfa8ae0c..ab1075eff 100644 --- a/apps/stage-tamagotchi/tsconfig.web.json +++ b/apps/stage-tamagotchi/tsconfig.web.json @@ -11,7 +11,6 @@ "DOM.AsyncIterable" ], "useDefineForClassFields": true, - "baseUrl": "./src/renderer", "paths": { "@proj-airi/stage-pages/*.vue": [ "../../packages/stage-pages/src/*.vue" diff --git a/apps/stage-web/package.json b/apps/stage-web/package.json index 95ff0bf8a..45e7a08e7 100644 --- a/apps/stage-web/package.json +++ b/apps/stage-web/package.json @@ -18,6 +18,7 @@ }, "dependencies": { "@date-fns/utc": "^2.1.1", + "@fontsource-variable/nunito": "catalog:", "@formkit/auto-animate": "^0.9.0", "@huggingface/transformers": "^3.8.1", "@moeru/eventa": "catalog:", @@ -25,6 +26,7 @@ "@proj-airi/audio": "workspace:^", "@proj-airi/ccc": "workspace:^", "@proj-airi/drizzle-duckdb-wasm": "catalog:", + "@proj-airi/font-chillroundm": "workspace:^", "@proj-airi/font-cjkfonts-allseto": "workspace:^", "@proj-airi/font-xiaolai": "workspace:^", "@proj-airi/i18n": "workspace:^", diff --git a/cspell.config.yaml b/cspell.config.yaml index 2cf9eee8e..c932c5364 100644 --- a/cspell.config.yaml +++ b/cspell.config.yaml @@ -41,6 +41,7 @@ words: - catppuccin - cdylib - cerebras + - chillroundm - cientos - cjkfonts - clippy @@ -198,6 +199,7 @@ words: - novita - nprogress - nsis + - Nunito - nuxi - nuxt - nuxtjs diff --git a/packages/stage-ui/package.json b/packages/stage-ui/package.json index 928b436b3..880bc860b 100644 --- a/packages/stage-ui/package.json +++ b/packages/stage-ui/package.json @@ -57,6 +57,7 @@ }, "dependencies": { "@date-fns/utc": "^2.1.1", + "@fontsource-variable/nunito": "catalog:", "@formkit/auto-animate": "^0.9.0", "@huggingface/transformers": "^3.8.1", "@moeru/eventa": "catalog:", @@ -65,6 +66,7 @@ "@proj-airi/chromatic": "^1.0.2", "@proj-airi/core-character": "workspace:^", "@proj-airi/drizzle-duckdb-wasm": "catalog:", + "@proj-airi/font-chillroundm": "workspace:^", "@proj-airi/font-cjkfonts-allseto": "workspace:^", "@proj-airi/font-xiaolai": "workspace:^", "@proj-airi/i18n": "workspace:^", @@ -149,7 +151,6 @@ "@fontsource/gugi": "^5.2.7", "@fontsource/kiwi-maru": "^5.2.8", "@fontsource/m-plus-rounded-1c": "^5.2.10", - "@fontsource/sniglet": "^5.2.8", "@histoire/plugin-vue": "catalog:", "@iconify-json/carbon": "^1.2.19", "@iconify-json/eos-icons": "^1.2.4", diff --git a/packages/stage-ui/stories/setup.ts b/packages/stage-ui/stories/setup.ts index ce1fd0a90..43ca0a244 100644 --- a/packages/stage-ui/stories/setup.ts +++ b/packages/stage-ui/stories/setup.ts @@ -24,7 +24,7 @@ import '@fontsource/dm-serif-display' import '@fontsource/gugi' import '@fontsource/kiwi-maru' import '@fontsource/m-plus-rounded-1c' -import '@fontsource/sniglet' +import '@fontsource-variable/nunito' export const setupVue3 = defineSetupVue3(({ app }) => { app.use(MotionPlugin) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2d1162db1..403161f3c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,6 +33,9 @@ catalogs: '@electron/notarize': specifier: ^3.1.1 version: 3.1.1 + '@fontsource-variable/nunito': + specifier: ^5.2.7 + version: 5.2.7 '@guiiai/logg': specifier: ^1.2.11 version: 1.2.11 @@ -672,6 +675,9 @@ importers: '@date-fns/utc': specifier: ^2.1.1 version: 2.1.1 + '@fontsource-variable/nunito': + specifier: 'catalog:' + version: 5.2.7 '@formkit/auto-animate': specifier: ^0.9.0 version: 0.9.0(vue@3.5.30(typescript@5.9.3)) @@ -693,6 +699,9 @@ importers: '@proj-airi/drizzle-duckdb-wasm': specifier: 'catalog:' version: 0.4.29(drizzle-orm@0.45.1(@electric-sql/pglite@0.4.1)(@opentelemetry/api@1.9.1)(@prisma/client@5.22.0)(@types/pg@8.20.0)(better-sqlite3@12.5.0)(kysely@0.28.14)(pg@8.20.0)(postgres@3.4.8)) + '@proj-airi/font-chillroundm': + specifier: workspace:^ + version: link:../../packages/font-chillroundm '@proj-airi/font-cjkfonts-allseto': specifier: workspace:^ version: link:../../packages/font-cjkfonts-allseto @@ -1039,6 +1048,9 @@ importers: '@fontsource-variable/jura': specifier: ^5.2.7 version: 5.2.7 + '@fontsource-variable/nunito': + specifier: 'catalog:' + version: 5.2.7 '@fontsource-variable/quicksand': specifier: ^5.2.10 version: 5.2.10 @@ -1060,9 +1072,6 @@ importers: '@fontsource/m-plus-rounded-1c': specifier: ^5.2.10 version: 5.2.10 - '@fontsource/sniglet': - specifier: ^5.2.8 - version: 5.2.8 '@formkit/auto-animate': specifier: ^0.9.0 version: 0.9.0(vue@3.5.30(typescript@5.9.3)) @@ -1090,6 +1099,9 @@ importers: '@proj-airi/drizzle-duckdb-wasm': specifier: 'catalog:' version: 0.4.29(drizzle-orm@0.45.1(@electric-sql/pglite@0.4.1)(@opentelemetry/api@1.9.1)(@prisma/client@5.22.0)(@types/pg@8.20.0)(better-sqlite3@12.5.0)(kysely@0.28.14)(pg@8.20.0)(postgres@3.4.8)) + '@proj-airi/font-chillroundm': + specifier: workspace:^ + version: link:../../packages/font-chillroundm '@proj-airi/font-cjkfonts-allseto': specifier: workspace:^ version: link:../../packages/font-cjkfonts-allseto @@ -1493,6 +1505,9 @@ importers: '@date-fns/utc': specifier: ^2.1.1 version: 2.1.1 + '@fontsource-variable/nunito': + specifier: 'catalog:' + version: 5.2.7 '@formkit/auto-animate': specifier: ^0.9.0 version: 0.9.0(vue@3.5.30(typescript@5.9.3)) @@ -1514,6 +1529,9 @@ importers: '@proj-airi/drizzle-duckdb-wasm': specifier: 'catalog:' version: 0.4.29(drizzle-orm@0.45.1(@electric-sql/pglite@0.4.1)(@opentelemetry/api@1.9.1)(@prisma/client@5.22.0)(@types/pg@8.20.0)(better-sqlite3@12.5.0)(kysely@0.28.14)(pg@8.20.0)(postgres@3.4.8)) + '@proj-airi/font-chillroundm': + specifier: workspace:^ + version: link:../../packages/font-chillroundm '@proj-airi/font-cjkfonts-allseto': specifier: workspace:^ version: link:../../packages/font-cjkfonts-allseto @@ -2196,6 +2214,8 @@ importers: specifier: workspace:^ version: link:../electron-eventa + packages/font-chillroundm: {} + packages/font-cjkfonts-allseto: {} packages/font-departure-mono: {} @@ -2620,6 +2640,9 @@ importers: '@date-fns/utc': specifier: ^2.1.1 version: 2.1.1 + '@fontsource-variable/nunito': + specifier: 'catalog:' + version: 5.2.7 '@formkit/auto-animate': specifier: ^0.9.0 version: 0.9.0(vue@3.5.30(typescript@5.9.3)) @@ -2644,6 +2667,9 @@ importers: '@proj-airi/drizzle-duckdb-wasm': specifier: 'catalog:' version: 0.4.29(drizzle-orm@0.45.1(@electric-sql/pglite@0.4.1)(@opentelemetry/api@1.9.1)(@prisma/client@5.22.0)(@types/pg@8.20.0)(better-sqlite3@12.5.0)(kysely@0.28.14)(pg@8.20.0)(postgres@3.4.8)) + '@proj-airi/font-chillroundm': + specifier: workspace:^ + version: link:../font-chillroundm '@proj-airi/font-cjkfonts-allseto': specifier: workspace:^ version: link:../font-cjkfonts-allseto @@ -2891,9 +2917,6 @@ importers: '@fontsource/m-plus-rounded-1c': specifier: ^5.2.10 version: 5.2.10 - '@fontsource/sniglet': - specifier: ^5.2.8 - version: 5.2.8 '@histoire/plugin-vue': specifier: 'catalog:' version: 1.0.0-beta.1(histoire@1.0.0-beta.1(@types/node@24.12.0)(bufferutil@4.1.0)(canvas@3.2.2)(less@4.6.4)(lightningcss@1.32.0)(terser@5.46.1)(tsx@4.21.0)(utf-8-validate@5.0.10)(vite@6.4.1(@types/node@24.12.0)(jiti@2.6.1)(less@4.6.4)(lightningcss@1.32.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.3))(yaml@2.8.3))(vite@6.4.1(@types/node@24.12.0)(jiti@2.6.1)(less@4.6.4)(lightningcss@1.32.0)(terser@5.46.1)(tsx@4.21.0)(yaml@2.8.3))(vue@3.5.30(typescript@5.9.3)) @@ -5455,6 +5478,9 @@ packages: '@fontsource-variable/jura@5.2.7': resolution: {integrity: sha512-zx/W8gmHn4m0SubAZvmq19/MEWLt2tf45bB3nHEdr354RRGGFSrMT/KiWQ6RTYM3P7uvlj621FnYR3PQcToo0g==} + '@fontsource-variable/nunito@5.2.7': + resolution: {integrity: sha512-2N8QhatkyKgSUbAGZO2FYLioxA32+RyI1EplVLawbpkGjUeui9Qg9VMrpkCaik1ydjFjfLV+kzQ0cGEsMrMenQ==} + '@fontsource-variable/quicksand@5.2.10': resolution: {integrity: sha512-1uzkzGDwWgtFnxquAXuD7fZV9wHkALb49UPzRXxGTVeeLsNrGnIU0O/pcz6m1U7RDtpHz2qx77JhCpKaq7FrUg==} @@ -5476,9 +5502,6 @@ packages: '@fontsource/m-plus-rounded-1c@5.2.10': resolution: {integrity: sha512-PLrYoJHCBMApU8zioMT+Un6TLr6JTI7lBJWXo+t2ZNdpEn1XqZG3Y3XvNuIxdX1F3m0UqvtEbtBMHgAbTdefOw==} - '@fontsource/sniglet@5.2.8': - resolution: {integrity: sha512-K2ESFqkw2AxBCu5Ar//ixp5el8lEcdmk8uDWj0jT1uiC82RFjQXq+PFvAA64Nd2TpHygafH7lY9K9493dzPXqw==} - '@formkit/auto-animate@0.9.0': resolution: {integrity: sha512-VhP4zEAacXS3dfTpJpJ88QdLqMTcabMg0jwpOSxZ/VzfQVfl3GkZSCZThhGC5uhq/TxPHPzW0dzr4H9Bb1OgKA==} peerDependencies: @@ -19441,6 +19464,8 @@ snapshots: '@fontsource-variable/jura@5.2.7': {} + '@fontsource-variable/nunito@5.2.7': {} + '@fontsource-variable/quicksand@5.2.10': {} '@fontsource-variable/urbanist@5.2.7': {} @@ -19455,8 +19480,6 @@ snapshots: '@fontsource/m-plus-rounded-1c@5.2.10': {} - '@fontsource/sniglet@5.2.8': {} - '@formkit/auto-animate@0.9.0(vue@3.5.30(typescript@5.9.3))': dependencies: vue: 3.5.30(typescript@5.9.3) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 96c8a951d..9cf5390be 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -36,6 +36,7 @@ catalog: '@electric-sql/pglite': ^0.4.1 '@electron-toolkit/preload': ^3.0.2 '@electron/notarize': ^3.1.1 + '@fontsource-variable/nunito': ^5.2.7 '@guiiai/logg': ^1.2.11 '@histoire/plugin-vue': 1.0.0-beta.1 '@hono/node-ws': ^1.3.0 diff --git a/uno.config.ts b/uno.config.ts index 17497418f..b1be7ec17 100644 --- a/uno.config.ts +++ b/uno.config.ts @@ -48,6 +48,7 @@ export function presetStoryMockHover(): PresetOrFactoryAwaitable { return { matcher, selector: (s) => { + // eslint-disable-next-line e18e/prefer-static-regex return `${s}, ${s.replace(/:hover$/, '')}._hover` }, } @@ -86,7 +87,7 @@ export function presetWebFontsFonts(provider: 'fontsource' | 'none'): Record ({ '-webkit-mask-image': suffix.replace(/_/g, ' ') })], + // eslint-disable-next-line e18e/prefer-static-regex [/^bg-dotted-\[(.*)\]$/, ([, color], { theme }) => { const parsedColor = parseColor(color, theme) // Util usage: https://github.com/unocss/unocss/blob/f57ef6ae50006a92f444738e50f3601c0d1121f2/packages-presets/preset-mini/src/_utils/utilities.ts#L186 @@ -191,15 +196,16 @@ export function sharedUnoConfig() { '--un-background-opacity': parsedColor?.cssColor?.alpha ?? parsedColor?.alpha ?? 1, } }], + // eslint-disable-next-line e18e/prefer-static-regex [/drag-region/, () => ({ 'app-region': 'drag' })], ], theme: { fontFamily: { 'sans': `"DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, 'sans-rounded': `"Comfortaa Variable", "Comfortaa", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, - 'cute': `"Sniglet", "Kiwi Maru", "Comfortaa Variable", "Comfortaa", "xiaolai", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, - 'cuteen': `"Sniglet", "Kiwi Maru", "Comfortaa Variable", "Comfortaa", "xiaolai", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, - 'cutejp': `"Sniglet", "Kiwi Maru", "Comfortaa Variable", "Comfortaa", "xiaolai", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, + 'cute': `"Nunito Variable", "ChillRoundM", "Kiwi Maru", "Comfortaa Variable", "Comfortaa", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, + 'cuteen': `"Nunito Variable", "ChillRoundM", "Kiwi Maru", "Comfortaa Variable", "Comfortaa", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, + 'cutejp': `"Nunito Variable", "ChillRoundM", "Kiwi Maru", "Comfortaa Variable", "Comfortaa", "DM Sans Variant", "DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";`, }, /** * https://github.com/unocss/unocss/blob/1031312057a3bea1082b7d938eb2ad640f57613a/packages-presets/preset-wind4/src/theme/animate.ts