Skip to content

Commit

Permalink
fix: pnpm filter on windows (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
LemonNekoGH authored Feb 20, 2025
1 parent 55b65bb commit 97d829d
Show file tree
Hide file tree
Showing 28 changed files with 855 additions and 1,251 deletions.
6 changes: 3 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
5 changes: 3 additions & 2 deletions apps/moonshine-web/netlify.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion apps/moonshine-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
52 changes: 32 additions & 20 deletions apps/moonshine-web/uno.config.ts
Original file line number Diff line number Diff line change
@@ -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(' '),
})
12 changes: 6 additions & 6 deletions apps/stage-tamagotchi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions apps/stage-tamagotchi/src/renderer/src/pages/settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@ function handleQuit() {
<option disabled class="bg-white">
{{ t('stage.select-a-voice') }}
</option>
<option v-if="['en', 'en-US'].indexOf(locale) !== -1 && elevenlabsVoiceEnglish" :value="elevenlabsVoiceEnglish">
<option v-if="['en', 'en-US'].includes(locale) && elevenlabsVoiceEnglish" :value="elevenlabsVoiceEnglish">
{{ elevenlabsVoiceEnglish }}
</option>
<!-- TODO -->
<option v-if="['zh', 'zh-CN', 'zh-TW', 'zh-HK'].indexOf(locale) !== -1 && elevenlabsVoiceEnglish" :value="elevenlabsVoiceEnglish">
<option v-if="['zh', 'zh-CN', 'zh-TW', 'zh-HK'].includes(locale) && elevenlabsVoiceEnglish" :value="elevenlabsVoiceEnglish">
{{ elevenlabsVoiceEnglish }}
</option>
<option v-if="['jp', 'jp-JP'].indexOf(locale) !== -1 && elevenlabsVoiceJapanese" :value="elevenlabsVoiceJapanese">
<option v-if="['jp', 'jp-JP'].includes(locale) && elevenlabsVoiceJapanese" :value="elevenlabsVoiceJapanese">
{{ elevenlabsVoiceJapanese }}
</option>
<option v-for="(m, index) in voiceList[locale]" :key="index" :value="m">
Expand Down
5 changes: 3 additions & 2 deletions apps/stage-web/netlify.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[build]
publish = "apps/stage-web/dist"
command = "pnpm run packages:stub && pnpm -F @proj-airi/stage-web run build"
base = "/"
command = "pnpm -F @proj-airi/stage-web... run build"
publish = "/apps/stage-web/dist"

[build.environment]
NODE_VERSION = "23"
Expand Down
12 changes: 6 additions & 6 deletions apps/stage-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,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",
Expand All @@ -66,7 +66,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",
Expand All @@ -91,7 +91,7 @@
"@proj-airi/lobe-icons": "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",
Expand All @@ -101,9 +101,9 @@
"hfup": "workspace:^",
"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",
Expand Down
6 changes: 3 additions & 3 deletions apps/stage-web/src/components/Widgets/MobileSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,14 @@ onMounted(async () => {
<option disabled class="bg-white dark:bg-zinc-800">
{{ t('stage.select-a-voice') }}
</option>
<option v-if="['en', 'en-US'].indexOf(locale) !== -1 && elevenlabsVoiceEnglish" :value="elevenlabsVoiceEnglish">
<option v-if="['en', 'en-US'].includes(locale) && elevenlabsVoiceEnglish" :value="elevenlabsVoiceEnglish">
{{ elevenlabsVoiceEnglish }}
</option>
<!-- TODO -->
<option v-if="['zh', 'zh-CN', 'zh-TW', 'zh-HK'].indexOf(locale) !== -1 && elevenlabsVoiceEnglish" :value="elevenlabsVoiceEnglish">
<option v-if="['zh', 'zh-CN', 'zh-TW', 'zh-HK'].includes(locale) && elevenlabsVoiceEnglish" :value="elevenlabsVoiceEnglish">
{{ elevenlabsVoiceEnglish }}
</option>
<option v-if="['jp', 'jp-JP'].indexOf(locale) !== -1 && elevenlabsVoiceJapanese" :value="elevenlabsVoiceJapanese">
<option v-if="['jp', 'jp-JP'].includes(locale) && elevenlabsVoiceJapanese" :value="elevenlabsVoiceJapanese">
{{ elevenlabsVoiceJapanese }}
</option>
<option v-for="(m, index) in voiceList[locale]" :key="index" :value="m">
Expand Down
2 changes: 1 addition & 1 deletion apps/stage-web/src/layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { top, right, bottom, left } = useScreenSafeArea()

<template>
<main
text="gray-700 dark:gray-200" font-cuteen h-full
text="gray-700 dark:gray-200" h-full font-cuteen
:style="{
paddingTop: `${top}px`,
paddingRight: `${right}px`,
Expand Down
96 changes: 54 additions & 42 deletions apps/stage-web/uno.config.ts
Original file line number Diff line number Diff line change
@@ -1,47 +1,59 @@
import { createExternalPackageIconLoader } from '@iconify/utils/lib/loader/external-pkg'
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',
cute: 'Kiwi Maru',
cuteen: 'Sniglet',
},
}),
presetIcons({
scale: 1.2,
collections: {
...createExternalPackageIconLoader('@proj-airi/lobe-icons'),
},
}),
],
// hyoban/unocss-preset-shadcn: Use shadcn ui with UnoCSS
// https://github.com/hyoban/unocss-preset-shadcn
//
// Thanks to
// https://github.com/unovue/shadcn-vue/issues/34#issuecomment-2467318118
// https://github.com/hyoban-template/shadcn-vue-unocss-starter
//
// By default, `.ts` and `.js` files are NOT extracted.
// If you want to extract them, use the following configuration.
// It's necessary to add the following configuration if you use shadcn-vue or shadcn-svelte.
content: {
pipeline: {
include: [
// the default
/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/,
// include js/ts files
'(components|src)/**/*.{js,ts}',
],
export default defineConfig({
presets: [
presetWind3(),
presetAttributify(),
presetTypography(),
presetWebFonts({
fonts: {
sans: 'DM Sans',
serif: 'DM Serif Display',
mono: 'DM Mono',
cute: 'Kiwi Maru',
cuteen: 'Sniglet',
},
}),
presetIcons({
scale: 1.2,
collections: {
...createExternalPackageIconLoader('@proj-airi/lobe-icons'),
},
}),
],
transformers: [
transformerDirectives(),
transformerVariantGroup(),
],
safelist: 'prose prose-sm m-auto text-left'.split(' '),
// hyoban/unocss-preset-shadcn: Use shadcn ui with UnoCSS
// https://github.com/hyoban/unocss-preset-shadcn
//
// Thanks to
// https://github.com/unovue/shadcn-vue/issues/34#issuecomment-2467318118
// https://github.com/hyoban-template/shadcn-vue-unocss-starter
//
// By default, `.ts` and `.js` files are NOT extracted.
// If you want to extract them, use the following configuration.
// It's necessary to add the following configuration if you use shadcn-vue or shadcn-svelte.
content: {
pipeline: {
include: [
// the default
/\.(vue|svelte|[jt]sx|mdx?|astro|elm|php|phtml|html)($|\?)/,
// include js/ts files
'(components|src)/**/*.{js,ts}',
],
},
},
]))
})
5 changes: 3 additions & 2 deletions apps/whisper-webgpu/netlify.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[build]
publish = "apps/whisper-webgpu/dist"
command = "pnpm run packages:stub && pnpm -F @proj-airi/whisper-webgpu run build"
base = "/"
command = "pnpm -F @proj-airi/whisper-webgpu... run build"
publish = "/apps/whisper-webgpu/dist"

[build.environment]
NODE_VERSION = "23"
Expand Down
2 changes: 1 addition & 1 deletion apps/whisper-webgpu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"typecheck": "vue-tsc --noEmit"
},
"dependencies": {
"@unocss/reset": "^65.5.0",
"@unocss/reset": "^66.0.0",
"@vueuse/core": "^12.7.0",
"ofetch": "^1.4.1",
"vue": "^3.5.13"
Expand Down
Loading

0 comments on commit 97d829d

Please sign in to comment.