nanakura/moeka-project
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: pnpm filter on windows (#26)

Browse Source
This commit is contained in:
LemonNeko
2025-02-20 16:16:47 +08:00
committed by GitHub
parent 55b65bbabe
commit 97d829df7a
28 changed files with 1105 additions and 1501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+3 -3
View File
@@ -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,
apps/moonshine-web/netlify.toml
+3 -2
View File
@@ -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"
apps/moonshine-web/package.json
+1 -1
View File
@@ -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",
apps/moonshine-web/uno.config.ts
+32 -20
View File
@@ -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(' '),
})
apps/stage-tamagotchi/package.json
+6 -6
View File
@@ -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",
apps/stage-tamagotchi/src/renderer/src/pages/settings.vue
+3 -3
View File
@@ -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">
apps/stage-web/netlify.toml
+3 -2
View File
@@ -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"
apps/stage-web/package.json
+6 -6
View File
@@ -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",
@@ -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",
@@ -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",
@@ -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",
apps/stage-web/src/components/Widgets/MobileSettings.vue
+3 -3
View File
@@ -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">
apps/stage-web/src/layouts/default.vue
+1 -1
View File
@@ -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`,
apps/stage-web/uno.config.ts
+54 -42
View File
@@ -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}',
],
},
},
]))
})
apps/whisper-webgpu/netlify.toml
+3 -2
View File
@@ -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"
apps/whisper-webgpu/package.json
+1 -1
View File
@@ -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"
apps/whisper-webgpu/uno.config.ts
+34 -22
View File
@@ -1,23 +1,35 @@
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,
}),
],
},
]))
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,
}),
],
transformers: [
transformerDirectives(),
transformerVariantGroup(),
],
safelist: 'prose prose-sm m-auto text-left'.split(' '),
})
docs/package.json
+1 -1
View File
@@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/starlight": "^0.32.0",
"@astrojs/starlight": "^0.32.1",
"astro": "^5.3.0",
"sharp": "^0.33.5",
"starlight-theme-catppuccin": "^2.0.0"
package.json
+16 -16
View File
@@ -12,31 +12,31 @@
"license": "MIT",
"scripts": {
"postinstall": "npx simple-git-hooks",
"dev": "pnpm -r --filter './packages/*' --filter './apps/*' run --parallel dev",
"build": "pnpm -r --filter './packages/*' --filter './apps/*' run build",
"apps:dev": "pnpm packages:stub && pnpm -r --filter './apps/*' run --parallel dev",
"apps:tamagotchi:dev": "pnpm packages:stub && pnpm -r --filter=@proj-airi/stage-tamagotchi run dev",
"apps:tamagotchi:build": "pnpm packages:build && pnpm -r --filter=@proj-airi/stage-tamagotchi run build",
"apps:build": "pnpm packages:build && pnpm -r --filter './apps/*' run build",
"packages:dev": "pnpm packages:stub && pnpm -r --filter './packages/*' --parallel run dev",
"packages:stub": "pnpm -r --filter './packages/*' run --parallel stub",
"packages:build": "pnpm -r --filter './packages/*' run build",
"dev": "pnpm -rF=\"./packages/*\" -F=\"./apps/*\" run --parallel dev",
"build": "pnpm -rF=\"./packages/*\" -F=\"./apps/*\" run build",
"apps:dev": "pnpm packages:stub && pnpm -rF=\"./apps/*\" run --parallel dev",
"apps:tamagotchi:dev": "pnpm packages:stub && pnpm -rF @proj-airi/stage-tamagotchi run dev",
"apps:tamagotchi:build": "pnpm packages:build && pnpm -rF @proj-airi/stage-tamagotchi run build",
"apps:build": "pnpm packages:build && pnpm -rF=\"./apps/*\" run build",
"packages:dev": "pnpm packages:stub && pnpm -rF=\"./packages/*\" --parallel run dev",
"packages:stub": "pnpm -rF=\"./packages/*\" run --parallel stub",
"packages:build": "pnpm -rF=\"./packages/*\" run build",
"test": "vitest --coverage",
"test:run": "vitest run",
"lint": "eslint --cache .",
"lint:fix": "eslint --cache --fix .",
"typecheck": "pnpm -r --filter './packages/*' --filter './apps/*' --filter run --parallel typecheck",
"typecheck": "pnpm -rF=\"./packages/*\" -F=\"./apps/*\" -F run --parallel typecheck",
"sizecheck": "npx vite-bundle-visualizer",
"up": "taze major -I",
"changelogithub": "changelogithub"
},
"devDependencies": {
"@antfu/eslint-config": "^4.2.1",
"@antfu/eslint-config": "^4.3.0",
"@antfu/ni": "^23.3.1",
"@cspell/dict-ru_ru": "^2.2.4",
"@types/node": "^22.13.4",
"@unocss/eslint-config": "^65.5.0",
"@unocss/eslint-plugin": "^65.5.0",
"@unocss/eslint-config": "^66.0.0",
"@unocss/eslint-plugin": "^66.0.0",
"@vitest/coverage-v8": "3.0.5",
"bumpp": "^10.0.3",
"changelogithub": "^13.12.1",
@@ -50,10 +50,10 @@
"taze": "^18.6.0",
"typescript": "~5.7.3",
"unbuild": "3.0.0-rc.11",
"unocss": "^65.5.0",
"vite": "^6.1.0",
"unocss": "^66.0.0",
"vite": "^6.1.1",
"vite-plugin-inspect": "^10.2.1",
"vitest": "^3.0.5"
"vitest": "^3.0.6"
},
"workspaces": [
"packages/**",
packages/drizzle-duckdb-wasm/netlify.toml
+3 -2
View File
@@ -1,6 +1,7 @@
[build]
publish = "packages/memory-driver-duckdb/playground/dist"
command = "pnpm run build"
base = "/"
command = "pnpm -F @proj-airi/drizzle-duckdb-wasm... run build"
publish = "/packages/drizzle-duckdb-wasm/playground/dist"
[build.environment]
NODE_VERSION = "23"
packages/drizzle-duckdb-wasm/package.json
+3 -3
View File
@@ -69,19 +69,19 @@
"@date-fns/tz": "^1.2.0",
"@duckdb/duckdb-wasm": "^1.29.0",
"@proj-airi/duckdb-wasm": "workspace:^",
"apache-arrow": "^19.0.0",
"apache-arrow": "^19.0.1",
"date-fns": "^4.1.0",
"defu": "^6.1.4",
"drizzle-orm": "^0.39.3",
"es-toolkit": "^1.32.0"
},
"devDependencies": {
"@unocss/reset": "^65.5.0",
"@unocss/reset": "^66.0.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vueuse/core": "^12.7.0",
"drizzle-kit": "^0.30.4",
"superjson": "^2.2.2",
"vite": "^6.1.0",
"vite": "^6.1.1",
"vue": "^3.5.13",
"vue-tsc": "^2.2.2"
}
packages/drizzle-duckdb-wasm/uno.config.ts
+32 -6
View File
@@ -1,7 +1,33 @@
import { defineConfig, mergeConfigs } from 'unocss'
import {
defineConfig,
presetAttributify,
presetIcons,
presetTypography,
presetWebFonts,
presetWind3,
transformerDirectives,
transformerVariantGroup,
} from 'unocss'
import UnoCSSConfig from '../../uno.config'
export default defineConfig(mergeConfigs([
UnoCSSConfig,
]))
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(' '),
})
packages/duckdb-wasm/package.json
+1 -1
View File
@@ -64,7 +64,7 @@
"dependencies": {
"@date-fns/tz": "^1.2.0",
"@duckdb/duckdb-wasm": "^1.29.0",
"apache-arrow": "^19.0.0",
"apache-arrow": "^19.0.1",
"date-fns": "^4.1.0",
"defu": "^6.1.4",
"drizzle-orm": "^0.39.3",
packages/hfup/package.json
+1 -1
View File
@@ -43,6 +43,6 @@
"dependencies": {
"defu": "^6.1.4",
"gray-matter": "^4.0.3",
"vite": "^6.1.0"
"vite": "^6.1.1"
}
}
packages/unplugin-download/package.json
+1 -1
View File
@@ -41,6 +41,6 @@
},
"dependencies": {
"ofetch": "^1.4.1",
"vite": "^6.1.0"
"vite": "^6.1.1"
}
}
packages/unplugin-live2d-sdk/package.json
+1 -1
View File
@@ -41,7 +41,7 @@
},
"dependencies": {
"ofetch": "^1.4.1",
"vite": "^6.1.0",
"vite": "^6.1.1",
"yauzl": "^3.2.0"
}
}
pnpm-lock.yaml
Generated
+874 -1350
View File
File diff suppressed because it is too large Load Diff
services/discord-bot/package.json
+1 -1
View File
@@ -32,7 +32,7 @@
"discord.js": "^14.18.0",
"libsodium-wrappers": "^0.7.15",
"opusscript": "^0.1.1",
"tsx": "^4.19.2",
"tsx": "^4.19.3",
"wavefile": "^11.0.0"
}
}
services/minecraft/package.json
+1 -1
View File
@@ -13,7 +13,7 @@
},
"dependencies": {
"@guiiai/logg": "^1.0.7",
"@proj-airi/server-sdk": "^0.1.4",
"@proj-airi/server-sdk": "^0.3.1",
"@typeschema/zod": "^0.14.0",
"awilix": "^12.0.4",
"es-toolkit": "^1.32.0",
services/telegram-bot/package.json
+1 -1
View File
@@ -41,6 +41,6 @@
"devDependencies": {
"@types/pg": "^8.11.11",
"drizzle-kit": "^0.30.4",
"tsx": "^4.19.2"
"tsx": "^4.19.3"
}
}
uno.config.ts
+16 -2
View File
@@ -1,17 +1,31 @@
import {
defineConfig,
presetAttributify,
presetIcons,
presetTypography,
presetUno,
presetWebFonts,
presetWind3,
transformerDirectives,
transformerVariantGroup,
} from 'unocss'
export default defineConfig({
presets: [
presetUno(),
presetWind3(),
presetAttributify(),
presetTypography(),
presetWebFonts({
fonts: {
sans: 'DM Sans',
serif: 'DM Serif Display',
mono: 'DM Mono',
cute: 'Kiwi Maru',
cuteen: 'Sniglet',
},
}),
presetIcons({
scale: 1.2,
}),
],
transformers: [
transformerDirectives(),