update pnpm-lock.yaml

pnpm-lock.yaml

@@ -156,11 +156,7 @@ importers:
         specifier: ^1.0.1
         version: 1.0.1
       pnpm:
-<<<<<<< HEAD
-        specifier: ^8.3.1
-=======
         specifier: ^8.6.8
->>>>>>> upstream/develop
         version: 8.6.8
       prettier:
         specifier: ^2.8.8
@@ -196,19 +192,14 @@ importers:
   packages/mermaid:
     dependencies:
       '@braintree/sanitize-url':
-<<<<<<< HEAD
-        specifier: ^6.0.2
-        version: 6.0.3
-=======
         specifier: ^6.0.1
-        version: 6.0.1
+        version: 6.0.2
       '@types/d3-scale':
         specifier: ^4.0.3
         version: 4.0.3
       '@types/d3-scale-chromatic':
         specifier: ^3.0.0
         version: 3.0.0
->>>>>>> upstream/develop
       cytoscape:
         specifier: ^3.23.0
         version: 3.23.0
@@ -270,15 +261,9 @@ importers:
       '@types/d3':
         specifier: ^7.4.0
         version: 7.4.0
-<<<<<<< HEAD
-      '@types/d3-scale':
-        specifier: ^4.0.3
-        version: 4.0.3
-=======
       '@types/d3-sankey':
         specifier: ^0.12.1
         version: 0.12.1
->>>>>>> upstream/develop
       '@types/d3-selection':
         specifier: ^3.0.5
         version: 3.0.5
@@ -340,16 +325,11 @@ importers:
         specifier: ^3.7.5
         version: 3.7.5
       jsdom:
-<<<<<<< HEAD
-        specifier: ^21.1.1
-        version: 21.1.2
-=======
         specifier: ^22.0.0
         version: 22.0.0
       json-schema-to-typescript:
         specifier: ^11.0.3
         version: 11.0.3
->>>>>>> upstream/develop
       micromatch:
         specifier: ^4.0.5
         version: 4.0.5
@@ -402,13 +382,8 @@ importers:
   packages/mermaid-example-diagram:
     dependencies:
       '@braintree/sanitize-url':
-<<<<<<< HEAD
-        specifier: ^6.0.0
-        version: 6.0.2
-=======
         specifier: ^6.0.1
-        version: 6.0.1
+        version: 6.0.2
->>>>>>> upstream/develop
       cytoscape:
         specifier: ^3.23.0
         version: 3.23.0
@@ -444,11 +419,7 @@ importers:
   packages/mermaid-zenuml:
     dependencies:
       '@zenuml/core':
-<<<<<<< HEAD
-        specifier: ^3.0.0
-=======
         specifier: ^3.0.3
->>>>>>> upstream/develop
         version: 3.0.3(ts-node@10.9.1)
     devDependencies:
       mermaid:
@@ -489,30 +460,17 @@ importers:
         specifier: ^1.1.0
         version: 1.1.0
       unocss:
-<<<<<<< HEAD
-        specifier: ^0.53.0
-        version: 0.53.0(postcss@8.4.27)(rollup@2.79.1)(vite@4.3.9)
-=======
         specifier: ^0.54.0
         version: 0.54.0(postcss@8.4.27)(rollup@2.79.1)(vite@4.3.9)
->>>>>>> upstream/develop
       unplugin-vue-components:
         specifier: ^0.25.0
         version: 0.25.0(rollup@2.79.1)(vue@3.2.47)
       vite:
-<<<<<<< HEAD
-        specifier: ^4.3.3
-        version: 4.3.9(@types/node@18.16.0)
-      vite-plugin-pwa:
-        specifier: ^0.16.0
-        version: 0.16.0(vite@4.3.9)(workbox-build@7.0.0)(workbox-window@6.5.4)
-=======
         specifier: ^4.3.9
         version: 4.3.9(@types/node@18.16.0)
       vite-plugin-pwa:
         specifier: ^0.16.0
         version: 0.16.0(vite@4.3.9)(workbox-build@7.0.0)(workbox-window@7.0.0)
->>>>>>> upstream/develop
       vitepress:
         specifier: 1.0.0-beta.7
         version: 1.0.0-beta.7(@algolia/client-search@4.14.2)(@types/node@18.16.0)(search-insights@2.6.0)
@@ -2319,17 +2277,8 @@ packages:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-<<<<<<< HEAD
   /@braintree/sanitize-url@6.0.2:
     resolution: {integrity: sha512-Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg==}
-=======
-  /@braintree/sanitize-url@6.0.1:
-    resolution: {integrity: sha512-zr9Qs9KFQiEvMWdZesjcmRJlUck5NR+eKGS1uyKk+oYTWwlYrsoPEi6VmG6/TzBD1hKCGEimrhTgGS6hvn/xIQ==}
->>>>>>> upstream/develop
-    dev: false
-
-  /@braintree/sanitize-url@6.0.3:
-    resolution: {integrity: sha512-g2hMyGSFYOvt0eeY2c2wrG1B6dVWF1be4vGxG9mI1BEHJuQm4Hie2HrooxYHBDRDi8hANIzQ8cuvBgxSVlQOTQ==}
     dev: false
 
   /@colors/colors@1.5.0:
@@ -3921,13 +3870,10 @@ packages:
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.15
-<<<<<<< HEAD
-=======
 
   /@jsdevtools/ono@7.1.3:
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
     dev: true
->>>>>>> upstream/develop
 
   /@leichtgewicht/ip-codec@2.0.4:
     resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==}
@@ -4347,12 +4293,9 @@ packages:
       '@types/d3-shape': 1.3.8
     dev: true
 
-<<<<<<< HEAD
-=======
   /@types/d3-scale-chromatic@3.0.0:
     resolution: {integrity: sha512-dsoJGEIShosKVRBZB0Vo3C8nqSDqVGujJU6tPznsBJxNJNwMF8utmS83nvCBKQYPpjCzaaHcrf66iTRpZosLPw==}
 
->>>>>>> upstream/develop
   /@types/d3-scale@4.0.3:
     resolution: {integrity: sha512-PATBiMCpvHJSMtZAMEhc2WyL+hnzarKzI6wAHYjhsonjWJYGq5BXTzQjv4l8m2jO183/4wZ90rKvSeT7o72xNQ==}
     dependencies:
@@ -4362,19 +4305,14 @@ packages:
     resolution: {integrity: sha512-xCB0z3Hi8eFIqyja3vW8iV01+OHGYR2di/+e+AiOcXIOrY82lcvWW8Ke1DYE/EUVMsBl4Db9RppSBS3X1U6J0w==}
     dev: true
 
-<<<<<<< HEAD
-  /@types/d3-shape@3.1.1:
-    resolution: {integrity: sha512-6Uh86YFF7LGg4PQkuO2oG6EMBRLuW9cbavUW46zkIO5kuS2PfTqo2o9SkgtQzguBHbLgNnU90UNsITpsX1My+A==}
-=======
   /@types/d3-shape@1.3.8:
     resolution: {integrity: sha512-gqfnMz6Fd5H6GOLYixOZP/xlrMtJms9BaS+6oWxTKHNqPGZ93BkWWupQSCYm6YHqx6h9wjRupuJb90bun6ZaYg==}
     dependencies:
       '@types/d3-path': 1.0.9
     dev: true
 
-  /@types/d3-shape@3.1.0:
+  /@types/d3-shape@3.1.1:
-    resolution: {integrity: sha512-jYIYxFFA9vrJ8Hd4Se83YI6XF+gzDL1aC5DCsldai4XYYiVNdhtpGbA/GM6iyQ8ayhSp3a148LY34hy7A4TxZA==}
+    resolution: {integrity: sha512-6Uh86YFF7LGg4PQkuO2oG6EMBRLuW9cbavUW46zkIO5kuS2PfTqo2o9SkgtQzguBHbLgNnU90UNsITpsX1My+A==}
->>>>>>> upstream/develop
     dependencies:
       '@types/d3-path': 3.0.0
     dev: true
@@ -5018,21 +4956,12 @@ packages:
       eslint-visitor-keys: 3.4.0
     dev: true
 
-<<<<<<< HEAD
-  /@unocss/astro@0.53.0(rollup@2.79.1)(vite@4.3.9):
-    resolution: {integrity: sha512-8bR7ysIMZEOpcjd/cVmogcABSFDYPjUqMnbflv44p1A2/deemo9CIkpRARoq/96NQuzWJsKhKodcQodExZcqiA==}
-    dependencies:
-      '@unocss/core': 0.53.0
-      '@unocss/reset': 0.53.0
-      '@unocss/vite': 0.53.0(rollup@2.79.1)(vite@4.3.9)
-=======
   /@unocss/astro@0.54.0(rollup@2.79.1)(vite@4.3.9):
     resolution: {integrity: sha512-Zq4GGRiXbWCipN9lUKlu3fmlrqIYu3rFoGwjL+v7VJulP8tVhiqzfbLXFKQePOVvCmiSvCKr6leuqgFA7PlPBg==}
     dependencies:
       '@unocss/core': 0.54.0
       '@unocss/reset': 0.54.0
       '@unocss/vite': 0.54.0(rollup@2.79.1)(vite@4.3.9)
->>>>>>> upstream/develop
     transitivePeerDependencies:
       - rollup
       - vite
@@ -5085,13 +5014,8 @@ packages:
       sirv: 2.0.3
     dev: true
 
-<<<<<<< HEAD
-  /@unocss/postcss@0.53.0(postcss@8.4.27):
-    resolution: {integrity: sha512-q+5aDvkwP1eEhDmdz32WrwsGEEcJdQLy3apiU/df+CaL71HATvUfMZJVZbXZlFqoed703c+cGLHOhRHMPDk/dw==}
-=======
   /@unocss/postcss@0.54.0(postcss@8.4.27):
     resolution: {integrity: sha512-t1PmIkp2Qa9F/9swfCVCXMuheQxd1ddrcvf0+d4fOckpFF8YhvOi+WfMoZW4YFwoCmG5pvDg4VYgKbDunGHhRg==}
->>>>>>> upstream/develop
     engines: {node: '>=14'}
     peerDependencies:
       postcss: ^8.4.21
@@ -5114,11 +5038,7 @@ packages:
     resolution: {integrity: sha512-WHdkpMzj6tohIkCc/+mEOzn0Yppqoz3y5zbI3WsDqA2/QFNSXx4haWcjV5iJI42uGcLXRp4K3l9JV3EL+oAxbg==}
     dependencies:
       '@iconify/utils': 2.1.7
-<<<<<<< HEAD
-      '@unocss/core': 0.53.0
-=======
       '@unocss/core': 0.54.0
->>>>>>> upstream/develop
       ofetch: 1.1.1
     transitivePeerDependencies:
       - supports-color
@@ -5155,11 +5075,7 @@ packages:
   /@unocss/preset-web-fonts@0.54.0:
     resolution: {integrity: sha512-3x1SDbJ2omwNNc3eK19zOdNU6moJg4SEr09GkeV4MMHrMXM6BHW2mEJYFSVgmTVD1RN4LZuoy/gTHMWpJhTuzw==}
     dependencies:
-<<<<<<< HEAD
-      '@unocss/core': 0.53.0
-=======
       '@unocss/core': 0.54.0
->>>>>>> upstream/develop
       ofetch: 1.1.1
     dev: true
 
@@ -5209,13 +5125,8 @@ packages:
       '@unocss/core': 0.54.0
     dev: true
 
-<<<<<<< HEAD
-  /@unocss/vite@0.53.0(rollup@2.79.1)(vite@4.3.9):
-    resolution: {integrity: sha512-JoZhKVNruRjfySMVg/zNJbLEn/NTXj29Wf0SN4++xnGKrSapkPzYC46psL5bm5N5v4SHdpepTCoonC3FWCY6Fw==}
-=======
   /@unocss/vite@0.54.0(rollup@2.79.1)(vite@4.3.9):
     resolution: {integrity: sha512-lABmJKYs/yNfZZSs3xwVhBZwNhfLaYcdKxPAopJ8MKiUqECdWvHqLvklKQvLttZpN3dQUmGTQLblM+55IodKEw==}
->>>>>>> upstream/develop
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
     dependencies:
@@ -5239,11 +5150,7 @@ packages:
     peerDependencies:
       vite-plugin-pwa: '>=0.16.3 <1'
     dependencies:
-<<<<<<< HEAD
-      vite-plugin-pwa: 0.16.0(vite@4.3.9)(workbox-build@7.0.0)(workbox-window@6.5.4)
-=======
       vite-plugin-pwa: 0.16.0(vite@4.3.9)(workbox-build@7.0.0)(workbox-window@7.0.0)
->>>>>>> upstream/develop
     dev: true
 
   /@vitejs/plugin-vue@4.2.1(vite@4.3.9)(vue@3.2.47):
@@ -5335,15 +5242,9 @@ packages:
     peerDependencies:
       vitest: '>=0.30.1 <1'
     dependencies:
-<<<<<<< HEAD
-      '@vitest/utils': 0.32.2
-      fast-glob: 3.3.0
-      fflate: 0.7.4
-=======
       '@vitest/utils': 0.33.0
       fast-glob: 3.3.0
       fflate: 0.8.0
->>>>>>> upstream/develop
       flatted: 3.2.7
       pathe: 1.1.1
       picocolors: 1.0.0
@@ -5914,16 +5815,6 @@ packages:
       acorn-walk: 7.2.0
     dev: true
 
-<<<<<<< HEAD
-  /acorn-globals@7.0.1:
-    resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
-    dependencies:
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
-    dev: true
-
-=======
->>>>>>> upstream/develop
   /acorn-import-assertions@1.8.0(acorn@8.8.0):
     resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
     peerDependencies:
@@ -6840,11 +6731,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /ci-info@3.8.0:
-    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
-    engines: {node: '>=8'}
-    dev: true
-
   /cjs-module-lexer@1.2.2:
     resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
     dev: true
@@ -7111,23 +6997,6 @@ packages:
   /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
-<<<<<<< HEAD
-  /concordance@5.0.4:
-    resolution: {integrity: sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==}
-    engines: {node: '>=10.18.0 <11 || >=12.14.0 <13 || >=14'}
-    dependencies:
-      date-time: 3.1.0
-      esutils: 2.0.3
-      fast-diff: 1.3.0
-      js-string-escape: 1.0.1
-      lodash: 4.17.21
-      md5-hex: 3.0.1
-      semver: 7.5.3
-      well-known-symbols: 2.0.0
-    dev: true
-
-=======
->>>>>>> upstream/develop
   /concurrently@8.0.1:
     resolution: {integrity: sha512-Sh8bGQMEL0TAmAm2meAXMjcASHZa7V0xXQVDBLknCPa9TPtkY9yYs+0cnGGgfdkW0SV1Mlg+hVGfXcoI8d3MJA==}
     engines: {node: ^14.13.0 || >=16.0.0}
@@ -7286,21 +7155,6 @@ packages:
       path-type: 4.0.0
     dev: true
 
-<<<<<<< HEAD
-  /coveralls@3.1.1:
-    resolution: {integrity: sha512-+dxnG2NHncSD1NrqbSM3dn/lE57O6Qf/koe9+I7c+wzkqRmEvcp0kgJdxKInzYzkICKkFMZsX3Vct3++tsF9ww==}
-    engines: {node: '>=6'}
-    hasBin: true
-    dependencies:
-      js-yaml: 3.14.1
-      lcov-parse: 1.0.0
-      log-driver: 1.2.7
-      minimist: 1.2.8
-      request: 2.88.2
-    dev: true
-
-=======
->>>>>>> upstream/develop
   /cp-file@9.1.0:
     resolution: {integrity: sha512-3scnzFj/94eb7y4wyXRWwvzLFaQp87yyfTnChIjlfYrVqp5lVO3E2hIJMeQIltUT0K2ZAB3An1qXcBmwGyvuwA==}
     engines: {node: '>=10'}
@@ -9062,13 +8916,6 @@ packages:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
     dev: true
 
-<<<<<<< HEAD
-  /fast-diff@1.3.0:
-    resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
-    dev: true
-
-=======
->>>>>>> upstream/develop
   /fast-equals@4.0.3:
     resolution: {integrity: sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==}
     dev: true
@@ -11148,11 +10995,6 @@ packages:
         optional: true
     dependencies:
       abab: 2.0.6
-<<<<<<< HEAD
-      acorn: 8.10.0
-      acorn-globals: 7.0.1
-=======
->>>>>>> upstream/develop
       cssstyle: 3.0.0
       data-urls: 4.0.0
       decimal.js: 10.4.3
@@ -11163,50 +11005,6 @@ packages:
       https-proxy-agent: 5.0.1
       is-potential-custom-element-name: 1.0.1
       nwsapi: 2.2.5
-<<<<<<< HEAD
-      parse5: 7.1.2
-      rrweb-cssom: 0.6.0
-      saxes: 6.0.0
-      symbol-tree: 3.2.4
-      tough-cookie: 4.1.2
-      w3c-xmlserializer: 4.0.0
-      webidl-conversions: 7.0.0
-      whatwg-encoding: 2.0.0
-      whatwg-mimetype: 3.0.0
-      whatwg-url: 12.0.1
-      ws: 8.13.0
-      xml-name-validator: 4.0.0
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: true
-
-  /jsdom@21.1.2:
-    resolution: {integrity: sha512-sCpFmK2jv+1sjff4u7fzft+pUh2KSUbUrEHYHyfSIbGTIcmnjyp83qg6qLwdJ/I3LpTXx33ACxeRL7Lsyc6lGQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      canvas: ^2.5.0
-    peerDependenciesMeta:
-      canvas:
-        optional: true
-    dependencies:
-      abab: 2.0.6
-      acorn: 8.10.0
-      acorn-globals: 7.0.1
-      cssstyle: 3.0.0
-      data-urls: 4.0.0
-      decimal.js: 10.4.3
-      domexception: 4.0.0
-      escodegen: 2.0.0
-      form-data: 4.0.0
-      html-encoding-sniffer: 3.0.0
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
-      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.5
-=======
->>>>>>> upstream/develop
       parse5: 7.1.2
       rrweb-cssom: 0.6.0
       saxes: 6.0.0
@@ -12309,15 +12107,12 @@ packages:
       minimist: 1.2.8
     dev: true
 
-<<<<<<< HEAD
-=======
   /mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
     engines: {node: '>=10'}
     hasBin: true
     dev: true
 
->>>>>>> upstream/develop
   /mlly@1.4.0:
     resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==}
     dependencies:
@@ -13084,8 +12879,6 @@ packages:
     hasBin: true
     dev: true
 
-<<<<<<< HEAD
-=======
   /polka@0.5.2:
     resolution: {integrity: sha512-FVg3vDmCqP80tOrs+OeNlgXYmFppTXdjD5E7I4ET1NjvtNmQrb1/mJibybKkb/d4NA7YWAr1ojxuhpL3FHqdlw==}
     dependencies:
@@ -13093,7 +12886,6 @@ packages:
       trouter: 2.0.1
     dev: true
 
->>>>>>> upstream/develop
   /postcss-import@15.1.0(postcss@8.4.27):
     resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
     engines: {node: '>=14.0.0'}
@@ -15236,13 +15028,8 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-<<<<<<< HEAD
-  /unocss@0.53.0(postcss@8.4.27)(rollup@2.79.1)(vite@4.3.9):
-    resolution: {integrity: sha512-kY4h5ERiDYlSnL2X+hbDfh+uaF7QNouy7j51GOTUr3Q0aaWehaNd05b15SjHrab559dEC0mYfrSEdh/DnCK1cw==}
-=======
   /unocss@0.54.0(postcss@8.4.27)(rollup@2.79.1)(vite@4.3.9):
     resolution: {integrity: sha512-SXjyQqt/MP1uW8mjEmQaSa0zd+QB3FwaGD/ityNlu+zNRx1D03BPP9ACbJDB1zZKx4aodMVSsHZ3TV5wsu+VRQ==}
->>>>>>> upstream/develop
     engines: {node: '>=14'}
     peerDependencies:
       '@unocss/webpack': 0.54.0
@@ -15250,28 +15037,6 @@ packages:
       '@unocss/webpack':
         optional: true
     dependencies:
-<<<<<<< HEAD
-      '@unocss/astro': 0.53.0(rollup@2.79.1)(vite@4.3.9)
-      '@unocss/cli': 0.53.0(rollup@2.79.1)
-      '@unocss/core': 0.53.0
-      '@unocss/extractor-arbitrary-variants': 0.53.0
-      '@unocss/postcss': 0.53.0(postcss@8.4.27)
-      '@unocss/preset-attributify': 0.53.0
-      '@unocss/preset-icons': 0.53.0
-      '@unocss/preset-mini': 0.53.0
-      '@unocss/preset-tagify': 0.53.0
-      '@unocss/preset-typography': 0.53.0
-      '@unocss/preset-uno': 0.53.0
-      '@unocss/preset-web-fonts': 0.53.0
-      '@unocss/preset-wind': 0.53.0
-      '@unocss/reset': 0.53.0
-      '@unocss/transformer-attributify-jsx': 0.53.0
-      '@unocss/transformer-attributify-jsx-babel': 0.53.0
-      '@unocss/transformer-compile-class': 0.53.0
-      '@unocss/transformer-directives': 0.53.0
-      '@unocss/transformer-variant-group': 0.53.0
-      '@unocss/vite': 0.53.0(rollup@2.79.1)(vite@4.3.9)
-=======
       '@unocss/astro': 0.54.0(rollup@2.79.1)(vite@4.3.9)
       '@unocss/cli': 0.54.0(rollup@2.79.1)
       '@unocss/core': 0.54.0
@@ -15292,7 +15057,6 @@ packages:
       '@unocss/transformer-directives': 0.54.0
       '@unocss/transformer-variant-group': 0.54.0
       '@unocss/vite': 0.54.0(rollup@2.79.1)(vite@4.3.9)
->>>>>>> upstream/develop
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -15475,11 +15239,7 @@ packages:
       mlly: 1.4.0
       pathe: 1.1.1
       picocolors: 1.0.0
-<<<<<<< HEAD
       vite: 4.4.7(@types/node@18.16.0)
-=======
-      vite: 4.4.6(@types/node@18.16.0)
->>>>>>> upstream/develop
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -15505,11 +15265,7 @@ packages:
       - supports-color
     dev: true
 
-<<<<<<< HEAD
-  /vite-plugin-pwa@0.16.0(vite@4.3.9)(workbox-build@7.0.0)(workbox-window@6.5.4):
-=======
   /vite-plugin-pwa@0.16.0(vite@4.3.9)(workbox-build@7.0.0)(workbox-window@7.0.0):
->>>>>>> upstream/develop
     resolution: {integrity: sha512-E+AQRzHxqNU4ZhEeR8X37/foZB+ezJEhXauE/mcf1UITY6k2Pa1dtlFl+BQu57fTdiVlWim5S0Qy44Yap93Dkg==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
@@ -15593,45 +15349,6 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-<<<<<<< HEAD
-=======
-  /vite@4.4.6(@types/node@18.16.0):
-    resolution: {integrity: sha512-EY6Mm8vJ++S3D4tNAckaZfw3JwG3wa794Vt70M6cNJ6NxT87yhq7EC8Rcap3ahyHdo8AhCmV9PTk+vG1HiYn1A==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      '@types/node': 18.16.0
-      esbuild: 0.18.11
-      postcss: 8.4.27
-      rollup: 3.26.0
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
->>>>>>> upstream/develop
   /vite@4.4.7(@types/node@18.16.0):
     resolution: {integrity: sha512-6pYf9QJ1mHylfVh39HpuSfMPojPSKVxZvnclX1K1FyZ1PXDOcLBibdq5t1qxJSnL63ca8Wf4zts6mD8u8oc9Fw==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -15792,21 +15509,12 @@ packages:
       '@types/chai': 4.3.5
       '@types/chai-subset': 1.3.3
       '@types/node': 18.16.0
-<<<<<<< HEAD
-      '@vitest/expect': 0.32.2
-      '@vitest/runner': 0.32.2
-      '@vitest/snapshot': 0.32.2
-      '@vitest/spy': 0.32.2
-      '@vitest/ui': 0.32.2(vitest@0.32.2)
-      '@vitest/utils': 0.32.2
-=======
       '@vitest/expect': 0.33.0
       '@vitest/runner': 0.33.0
       '@vitest/snapshot': 0.33.0
       '@vitest/spy': 0.33.0
       '@vitest/ui': 0.33.0(vitest@0.33.0)
       '@vitest/utils': 0.33.0
->>>>>>> upstream/develop
       acorn: 8.10.0
       acorn-walk: 8.2.0
       cac: 6.7.14
@@ -15820,15 +15528,9 @@ packages:
       std-env: 3.3.3
       strip-literal: 1.0.1
       tinybench: 2.5.0
-<<<<<<< HEAD
-      tinypool: 0.5.0
-      vite: 4.4.7(@types/node@18.16.0)
-      vite-node: 0.32.2(@types/node@18.16.0)
-=======
       tinypool: 0.6.0
-      vite: 4.4.6(@types/node@18.16.0)
+      vite: 4.4.7(@types/node@18.16.0)
       vite-node: 0.33.0(@types/node@18.16.0)
->>>>>>> upstream/develop
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less