chore: upgrade deps & optimize agui

YunYouJun · Feb 14, 2024 · a66f1f4 · a66f1f4
1 parent 7b8b742
commit a66f1f4
Show file tree

Hide file tree

Showing 17 changed files with 1,268 additions and 679 deletions.
diff --git a/demo/use-dialog-box/package.json b/demo/use-dialog-box/package.json
@@ -10,11 +10,11 @@
   },
   "dependencies": {
     "@advjs/parser": "workspace:*",
-    "vue": "^3.4.15"
+    "vue": "^3.4.19"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.0.3",
-    "vite": "^5.0.12",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "vite": "^5.1.2",
     "vue-tsc": "^1.8.27"
   }
 }
diff --git a/docs/package.json b/docs/package.json
@@ -21,7 +21,7 @@
     "@iconify-json/vscode-icons": "^1.1.33",
     "unocss": "0.58.5",
     "unplugin-vue-components": "^0.26.0",
-    "vite-plugin-pwa": "^0.17.5",
-    "vitepress": "1.0.0-rc.41"
+    "vite-plugin-pwa": "^0.18.1",
+    "vitepress": "1.0.0-rc.42"
   }
 }
diff --git a/editor/core/package.json b/editor/core/package.json
@@ -2,7 +2,7 @@
   "name": "@advjs/editor",
   "version": "0.0.0",
   "private": true,
-  "packageManager": "[email protected].1",
+  "packageManager": "[email protected].2",
   "description": "ADV.JS Editor",
   "scripts": {
     "build": "nuxi build",
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@advjs/gui": "workspace:*",
-    "@iconify-json/carbon": "^1.1.28",
+    "@iconify-json/carbon": "^1.1.30",
     "@iconify-json/ep": "^1.1.14",
     "@iconify-json/mdi": "^1.1.64",
     "@iconify-json/twemoji": "^1.1.15",
@@ -30,11 +30,11 @@
     "@pinia/nuxt": "^0.5.1",
     "@unocss/eslint-config": "^0.58.5",
     "@unocss/nuxt": "^0.58.5",
-    "@vite-pwa/nuxt": "^0.4.0",
+    "@vite-pwa/nuxt": "^0.5.0",
     "@vueuse/nuxt": "^10.7.2",
-    "baklavajs": "2.3.0",
+    "baklavajs": "2.4.0",
     "consola": "^3.2.3",
-    "nuxt": "^3.10.0",
+    "nuxt": "^3.10.2",
     "nuxt-monaco-editor": "git+https://github.com/jontybrook/nuxt-monaco-editor.git#patch1",
     "pinia": "^2.1.7"
   }

diff --git a/editor/vrm/package.json b/editor/vrm/package.json
@@ -22,7 +22,7 @@
     "nprogress": "^0.2.0",
     "pinia": "^2.1.7",
     "prism-theme-vars": "^0.2.4",
-    "vue": "^3.4.15",
+    "vue": "^3.4.19",
     "vue-demi": "^0.14.7",
     "vue-i18n": "^9.9.1",
     "vue-router": "^4.2.5"
@@ -32,21 +32,21 @@
     "@advjs/shared": "workspace:*",
     "@advjs/types": "workspace:*",
     "@advjs/unocss": "workspace:*",
-    "@iconify-json/carbon": "^1.1.28",
+    "@iconify-json/carbon": "^1.1.30",
     "@intlify/unplugin-vue-i18n": "^2.0.0",
     "@types/markdown-it-link-attributes": "^3.0.4",
     "@types/nprogress": "^0.2.3",
-    "@vitejs/plugin-vue": "^5.0.3",
+    "@vitejs/plugin-vue": "^5.0.4",
     "critters": "^0.0.20",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-prism": "^2.3.0",
     "unocss": "^0.58.5",
     "unplugin-vue-components": "^0.26.0",
     "unplugin-vue-markdown": "^0.26.0",
     "unplugin-vue-router": "^0.7.0",
-    "vite": "^5.0.12",
+    "vite": "^5.1.2",
     "vite-plugin-inspect": "^0.8.3",
-    "vite-plugin-pwa": "^0.17.5",
+    "vite-plugin-pwa": "^0.18.1",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vite-ssg": "0.23.6"
   }

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "type": "module",
   "version": "0.0.1",
   "private": true,
-  "packageManager": "[email protected].1",
+  "packageManager": "[email protected].2",
   "description": "面向未来与前端的 ADV 文字冒险游戏引擎。",
   "author": {
     "name": "YunYouJun",
@@ -74,9 +74,9 @@
     "@antfu/ni": "^0.21.12",
     "@types/fs-extra": "^11.0.4",
     "@types/howler": "^2.2.11",
-    "@types/node": "^20.11.16",
+    "@types/node": "^20.11.17",
     "@types/prompts": "^2.4.9",
-    "@types/semver": "^7.5.6",
+    "@types/semver": "^7.5.7",
     "@types/unist": "^3.0.2",
     "@types/wicg-file-system-access": "^2023.10.4",
     "@types/yargs": "^17.0.32",
@@ -90,16 +90,16 @@
     "eslint": "8.56.0",
     "eslint-plugin-cypress": "^2.15.1",
     "eslint-plugin-format": "^0.1.0",
-    "husky": "^9.0.10",
-    "lint-staged": "^15.2.1",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.2",
     "npm-run-all": "^4.1.5",
     "rimraf": "^5.0.5",
-    "tsup": "^8.0.1",
-    "tsx": "^4.7.0",
-    "typedoc": "^0.25.7",
+    "tsup": "^8.0.2",
+    "tsx": "^4.7.1",
+    "typedoc": "^0.25.8",
     "typescript": "^5.3.3",
     "unbuild": "^2.0.0",
-    "vite": "^5.0.12",
+    "vite": "^5.1.2",
     "vitest": "^1.2.2",
     "vue-tsc": "^1.8.27"
   },

diff --git a/packages/advjs/package.json b/packages/advjs/package.json
@@ -50,12 +50,12 @@
     "@advjs/types": "workspace:*",
     "@antfu/ni": "^0.21.12",
     "@antfu/utils": "^0.7.7",
-    "@iconify-json/carbon": "^1.1.28",
+    "@iconify-json/carbon": "^1.1.30",
     "@iconify-json/ri": "^1.1.19",
     "@intlify/unplugin-vue-i18n": "^2.0.0",
     "@types/mdast": "4.0.3",
-    "@vitejs/plugin-vue": "^5.0.3",
-    "c12": "^1.6.1",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "c12": "^1.8.0",
     "consola": "^3.2.3",
     "debug": "^4.3.4",
     "defu": "^6.1.4",
@@ -75,15 +75,15 @@
     "resolve-from": "^5.0.0",
     "resolve-global": "^2.0.0",
     "sass": "^1.70.0",
-    "semver": "^7.5.4",
+    "semver": "^7.6.0",
     "unocss": "^0.58.5",
     "unplugin-vue-components": "^0.26.0",
     "unplugin-vue-markdown": "^0.26.0",
     "unplugin-vue-router": "^0.7.0",
-    "vite": "^5.0.12",
+    "vite": "^5.1.2",
     "vite-plugin-vue-devtools": "^7.0.14",
     "vite-plugin-vue-layouts": "^0.11.0",
-    "vue": "^3.4.15",
+    "vue": "^3.4.19",
     "vue-i18n": "^9.9.1",
     "vue-router": "^4.2.5",
     "yargs": "^17.7.2"

diff --git a/packages/benchmarks/package.json b/packages/benchmarks/package.json
@@ -7,7 +7,7 @@
     "generate:json-xml": "tsx src/json-xml/generate.ts --generate"
   },
   "devDependencies": {
-    "@faker-js/faker": "^8.4.0",
+    "@faker-js/faker": "^8.4.1",
     "@types/xml2js": "^0.4.14",
     "benny": "^3.7.1",
     "consola": "^3.2.3",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -42,8 +42,8 @@
     "pinia": "^2.1.7",
     "pixi.js": "8.0.0-beta.8",
     "resolve": "^1.22.8",
-    "swiper": "^11.0.5",
-    "vue": "^3.4.15",
+    "swiper": "^11.0.6",
+    "vue": "^3.4.19",
     "vue-router": "^4.2.5"
   },
   "optionalDependencies": {

diff --git a/packages/gui/client/components/accordion/AGUIAccordion.vue b/packages/gui/client/components/accordion/AGUIAccordion.vue
@@ -12,6 +12,7 @@ withDefaults(
   } & Partial<AccordionRootProps>>(),
   {
     type: 'multiple',
+    defaultValue: '',
   },
 )
 </script>

diff --git a/packages/gui/client/components/context-menu/AGUIContextMenuItem.vue b/packages/gui/client/components/context-menu/AGUIContextMenuItem.vue
@@ -41,7 +41,7 @@ defineProps<{
         :value="subItem.label"
       >
         <ContextMenuItemIndicator class="ContextMenuItemIndicator">
-          <Icon icon="radix-icons:dot-filled" />
+          <div class="i-radix-icons:dot-filled" />
         </ContextMenuItemIndicator>
         {{ subItem.label }}
       </ContextMenuRadioItem>
@@ -70,7 +70,7 @@ defineProps<{
     >
       {{ item.label }}
       <div class="RightSlot">
-        <Icon icon="radix-icons:chevron-right" />
+        <div class="i-radix-icons:chevron-right" />
       </div>
     </ContextMenuSubTrigger>
     <ContextMenuPortal>

diff --git a/packages/gui/client/components/menu/AGUIMenubar.vue b/packages/gui/client/components/menu/AGUIMenubar.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { Icon } from '@iconify/vue'
 import { ref } from 'vue'
 import {
   MenubarCheckboxItem,
@@ -91,7 +90,7 @@ export interface Menu {
               <div
                 class="RightSlot"
               >
-                <Icon icon="radix-icons:chevron-right" />
+                <div class="i-radix-icons:chevron-right" />
               </div>
             </MenubarSubTrigger>
             <MenubarPortal>
@@ -168,7 +167,7 @@ export interface Menu {
               <div
                 class="RightSlot"
               >
-                <Icon icon="radix-icons:chevron-right" />
+                <div class="i-radix-icons:chevron-right" />
               </div>
             </MenubarSubTrigger>
 
@@ -239,7 +238,7 @@ export interface Menu {
             class="MenubarCheckboxItem"
           >
             <MenubarItemIndicator class="MenubarItemIndicator">
-              <Icon icon="radix-icons:check" />
+              <div class="i-radix-icons:check" />
             </MenubarItemIndicator>
             Show Bookmarks
             <div
@@ -253,7 +252,7 @@ export interface Menu {
             class="MenubarCheckboxItem"
           >
             <MenubarItemIndicator class="MenubarItemIndicator">
-              <Icon icon="radix-icons:check" />
+              <div class="i-radix-icons:check" />
             </MenubarItemIndicator>
             Show Full URLs
           </MenubarCheckboxItem>
@@ -310,7 +309,7 @@ export interface Menu {
               value="pedro"
             >
               <MenubarItemIndicator class="MenubarItemIndicator">
-                <Icon icon="radix-icons:dot-filled" />
+                <div class="i-radix-icons:dot-filled" />
               </MenubarItemIndicator>
               Pedro Duarte
             </MenubarRadioItem>
@@ -319,7 +318,7 @@ export interface Menu {
               value="colm"
             >
               <MenubarItemIndicator class="MenubarItemIndicator">
-                <Icon icon="radix-icons:dot-filled" />
+                <div class="i-radix-icons:dot-filled" />
               </MenubarItemIndicator>
               Colm Tuite
             </MenubarRadioItem>

diff --git a/packages/gui/client/components/select/AGUISelect.vue b/packages/gui/client/components/select/AGUISelect.vue
@@ -15,7 +15,6 @@ import {
   SelectValue,
   SelectViewport,
 } from 'radix-vue'
-import { Icon } from '@iconify/vue'
 
 type OptionType = string | { value: string, label?: string, icon?: string }
 
@@ -43,7 +42,7 @@ function onUpdateModelValue(value: string) {
       :aria-label="placeholder"
     >
       <SelectValue :placeholder="placeholder" />
-      <Icon icon="radix-icons:chevron-down" op="60" />
+      <div class="i-radix-icons:chevron-down" op="60" />
     </SelectTrigger>
 
     <SelectPortal>
@@ -52,7 +51,7 @@ function onUpdateModelValue(value: string) {
         side="bottom"
       >
         <SelectScrollUpButton class="SelectScrollButton">
-          <Icon icon="radix-icons:chevron-up" />
+          <div class="i-radix-icons:chevron-up" />
         </SelectScrollUpButton>
 
         <SelectViewport class="agui-select-viewport">
@@ -70,7 +69,7 @@ function onUpdateModelValue(value: string) {
                 :value="option"
               >
                 <SelectItemIndicator class="agui-select-item-indicator">
-                  <Icon icon="radix-icons:check" />
+                  <div class="i-radix-icons:check" />
                 </SelectItemIndicator>
                 <SelectItemText>
                   {{ option }}
@@ -83,7 +82,7 @@ function onUpdateModelValue(value: string) {
                 :value="option.value"
               >
                 <SelectItemIndicator class="agui-select-item-indicator">
-                  <Icon icon="radix-icons:check" />
+                  <div class="i-radix-icons:check" />
                 </SelectItemIndicator>
                 <div mr-1 :class="option.icon" />
                 <SelectItemText>
@@ -95,7 +94,7 @@ function onUpdateModelValue(value: string) {
         </SelectViewport>
 
         <SelectScrollDownButton class="SelectScrollButton agui-select-scroll-button">
-          <Icon icon="radix-icons:chevron-down" />
+          <div class="i-radix-icons:chevron-down" />
         </SelectScrollDownButton>
       </SelectContent>
     </SelectPortal>

diff --git a/packages/gui/client/components/toolbar/AGUIToolbar.vue b/packages/gui/client/components/toolbar/AGUIToolbar.vue
@@ -1,10 +1,14 @@
 <script lang="ts" setup>
-import { ToolbarButton, ToolbarRoot, ToolbarSeparator } from 'radix-vue'
+import { ToggleGroupItem, ToggleGroupRoot, ToolbarButton, ToolbarRoot, ToolbarSeparator } from 'radix-vue'
+
 import type { ToolbarItem } from './types'
 
 defineProps<{
   items: ToolbarItem[]
 }>()
+
+const toggleGroupItemClasses
+  = 'cursor-pointer bg-dark-200 shadow hover:bg-dark-100 text-mauve11 flex w-8 items-center justify-center text-base leading-4 first:rounded-l last:rounded-r focus:z-10 shadow focus:shadow-[0_0_0_1px] focus:shadow-dark-600 focus:outline-none'
 </script>
 
 <template>
@@ -25,6 +29,7 @@ defineProps<{
         v-else-if="item.type === 'button'"
         :key="item.name"
         class="agui-button h-20px"
+        :title="item.title"
         @click="item.onClick"
       >
         <div
@@ -35,6 +40,24 @@ defineProps<{
           {{ item.name }}
         </span>
       </ToolbarButton>
+
+      <ToggleGroupRoot
+        v-else-if="item.type === 'toggle-group'"
+        :key="`group:${item.name}`"
+        v-model="item.value"
+        class="flex"
+      >
+        <ToggleGroupItem
+          v-for="bItem in item.children"
+          :key="bItem.value"
+          :value="bItem.value"
+          :aria-label="bItem.label"
+          :class="`${bItem.class} ${toggleGroupItemClasses}`"
+          @click="bItem.onClick"
+        >
+          <div :class="bItem.icon" class="h-[15px] w-[15px]" />
+        </ToggleGroupItem>
+      </ToggleGroupRoot>
     </template>
   </ToolbarRoot>
 </template>