浏览代码

Merge branch 'dev/v1.0.90_yf' of jianyu/web into feature/v1.0.90

yangfeng 5 月之前
父节点
当前提交
fbd6d67272
共有 1 个文件被更改,包括 0 次插入114 次删除
  1. 0 114
      pnpm-lock.yaml

+ 0 - 114
pnpm-lock.yaml

@@ -310,12 +310,6 @@ importers:
         version: 3.2.8(vue@2.7.16)
         version: 3.2.8(vue@2.7.16)
       aliyun_numberauthsdk_web:
       aliyun_numberauthsdk_web:
         specifier: ^2.1.9
         specifier: ^2.1.9
-<<<<<<< HEAD
-        version: 2.1.10
-      dayjs:
-        specifier: ^1.11.8
-        version: 1.11.13
-=======
         version: 2.1.9
         version: 2.1.9
       canvas:
       canvas:
         specifier: 2.8.0
         specifier: 2.8.0
@@ -326,7 +320,6 @@ importers:
       dommatrix:
       dommatrix:
         specifier: ^1.0.3
         specifier: ^1.0.3
         version: 1.0.3
         version: 1.0.3
->>>>>>> main
       html2canvas:
       html2canvas:
         specifier: ^1.4.1
         specifier: ^1.4.1
         version: 1.4.1
         version: 1.4.1
@@ -341,14 +334,10 @@ importers:
         version: 5.12.2
         version: 5.12.2
       moment:
       moment:
         specifier: ^2.29.1
         specifier: ^2.29.1
-<<<<<<< HEAD
-        version: 2.30.1
-=======
         version: 2.29.1
         version: 2.29.1
       pdfh5:
       pdfh5:
         specifier: ^1.4.9
         specifier: ^1.4.9
         version: 1.4.9
         version: 1.4.9
->>>>>>> main
       qs:
       qs:
         specifier: ^6.11.2
         specifier: ^6.11.2
         version: 6.14.0
         version: 6.14.0
@@ -2487,14 +2476,6 @@ packages:
     resolution: {integrity: sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==}
     resolution: {integrity: sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==}
     engines: {node: '>=6.9.0'}
     engines: {node: '>=6.9.0'}
     dependencies:
     dependencies:
-<<<<<<< HEAD
-      '@babel/code-frame': 7.26.2
-      '@babel/generator': 7.26.9
-      '@babel/parser': 7.26.9
-      '@babel/template': 7.26.9
-      '@babel/types': 7.26.9
-      debug: 4.4.0
-=======
       '@babel/code-frame': 7.23.5
       '@babel/code-frame': 7.23.5
       '@babel/generator': 7.23.6
       '@babel/generator': 7.23.6
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-environment-visitor': 7.22.20
@@ -2504,7 +2485,6 @@ packages:
       '@babel/parser': 7.24.0
       '@babel/parser': 7.24.0
       '@babel/types': 7.24.0
       '@babel/types': 7.24.0
       debug: 4.3.7
       debug: 4.3.7
->>>>>>> main
       globals: 11.12.0
       globals: 11.12.0
     transitivePeerDependencies:
     transitivePeerDependencies:
       - supports-color
       - supports-color
@@ -3143,11 +3123,7 @@ packages:
     deprecated: Use @eslint/config-array instead
     deprecated: Use @eslint/config-array instead
     dependencies:
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
       '@humanwhocodes/object-schema': 1.2.1
-<<<<<<< HEAD
-      debug: 4.4.0
-=======
       debug: 4.3.7
       debug: 4.3.7
->>>>>>> main
       minimatch: 3.1.2
       minimatch: 3.1.2
     transitivePeerDependencies:
     transitivePeerDependencies:
       - supports-color
       - supports-color
@@ -3332,10 +3308,6 @@ packages:
     resolution: {integrity: sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==}
     resolution: {integrity: sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==}
     dev: true
     dev: true
 
 
-<<<<<<< HEAD
-  /@nabla/vite-plugin-eslint@2.0.5(eslint@8.57.1)(vite@4.5.9):
-    resolution: {integrity: sha512-m6Q8ZVM0ASZfYyfFbG661mDklhZQZEeBMQgtB26NhdadxPSctHzHsUbF87msdSb0V4Z8R1p/vRkB5SHNOpANAQ==}
-=======
   /@mapbox/node-pre-gyp@1.0.11:
   /@mapbox/node-pre-gyp@1.0.11:
     resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}
     resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}
     hasBin: true
     hasBin: true
@@ -3356,7 +3328,6 @@ packages:
 
 
   /@nabla/vite-plugin-eslint@2.0.2(eslint@8.57.0)(vite@4.5.3):
   /@nabla/vite-plugin-eslint@2.0.2(eslint@8.57.0)(vite@4.5.3):
     resolution: {integrity: sha512-bwOAkO3kdDyNvGNbIls9bLQHR1t/NKyCd/CSCP89rbmgmxScORq9O84TBc5t1Bh64UWSYmYM5j5HIjwuiVgtGQ==}
     resolution: {integrity: sha512-bwOAkO3kdDyNvGNbIls9bLQHR1t/NKyCd/CSCP89rbmgmxScORq9O84TBc5t1Bh64UWSYmYM5j5HIjwuiVgtGQ==}
->>>>>>> main
     peerDependencies:
     peerDependencies:
       eslint: ^8.45 || ^9
       eslint: ^8.45 || ^9
       vite: ^4 || ^5 || ^6
       vite: ^4 || ^5 || ^6
@@ -5119,8 +5090,6 @@ packages:
       html-tags: 2.0.0
       html-tags: 2.0.0
       lodash.kebabcase: 4.1.1
       lodash.kebabcase: 4.1.1
       svg-tags: 1.0.0
       svg-tags: 1.0.0
-<<<<<<< HEAD
-=======
     dev: true
     dev: true
 
 
   /@vue/babel-preset-app@5.0.8(@babel/core@7.24.0)(core-js@3.31.1)(vue@2.7.14):
   /@vue/babel-preset-app@5.0.8(@babel/core@7.24.0)(core-js@3.31.1)(vue@2.7.14):
@@ -5152,7 +5121,6 @@ packages:
       core-js-compat: 3.31.1
       core-js-compat: 3.31.1
       semver: 7.6.3
       semver: 7.6.3
       vue: 2.7.14
       vue: 2.7.14
->>>>>>> main
     transitivePeerDependencies:
     transitivePeerDependencies:
       - supports-color
       - supports-color
     dev: true
     dev: true
@@ -5182,15 +5150,9 @@ packages:
       '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.26.9)
       '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.26.9)
       '@vue/babel-preset-jsx': 1.4.0(@babel/core@7.26.9)(vue@2.7.16)
       '@vue/babel-preset-jsx': 1.4.0(@babel/core@7.26.9)(vue@2.7.16)
       babel-plugin-dynamic-import-node: 2.3.3
       babel-plugin-dynamic-import-node: 2.3.3
-<<<<<<< HEAD
-      core-js: 3.40.0
-      core-js-compat: 3.40.0
-      semver: 7.7.1
-=======
       core-js: 3.31.1
       core-js: 3.31.1
       core-js-compat: 3.31.1
       core-js-compat: 3.31.1
       semver: 7.6.3
       semver: 7.6.3
->>>>>>> main
       vue: 2.7.16
       vue: 2.7.16
     transitivePeerDependencies:
     transitivePeerDependencies:
       - supports-color
       - supports-color
@@ -5523,11 +5485,7 @@ packages:
       open: 8.4.2
       open: 8.4.2
       ora: 5.4.1
       ora: 5.4.1
       read-pkg: 5.2.0
       read-pkg: 5.2.0
-<<<<<<< HEAD
-      semver: 7.7.1
-=======
       semver: 7.6.3
       semver: 7.6.3
->>>>>>> main
       strip-ansi: 6.0.1
       strip-ansi: 6.0.1
     transitivePeerDependencies:
     transitivePeerDependencies:
       - encoding
       - encoding
@@ -7024,17 +6982,6 @@ packages:
       fsevents: 2.3.3
       fsevents: 2.3.3
     dev: true
     dev: true
 
 
-<<<<<<< HEAD
-  /chokidar@4.0.3:
-    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
-    engines: {node: '>= 14.16.0'}
-    dependencies:
-      readdirp: 4.1.2
-    dev: true
-
-  /chrome-trace-event@1.0.4:
-    resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
-=======
   /chownr@2.0.0:
   /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
     engines: {node: '>=10'}
@@ -7042,7 +6989,6 @@ packages:
 
 
   /chrome-trace-event@1.0.3:
   /chrome-trace-event@1.0.3:
     resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
     resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
->>>>>>> main
     engines: {node: '>=6.0'}
     engines: {node: '>=6.0'}
     dev: true
     dev: true
 
 
@@ -7899,10 +7845,6 @@ packages:
       character-entities: 2.0.2
       character-entities: 2.0.2
     dev: true
     dev: true
 
 
-<<<<<<< HEAD
-  /deep-eql@4.1.4:
-    resolution: {integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==}
-=======
   /decompress-response@4.2.1:
   /decompress-response@4.2.1:
     resolution: {integrity: sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==}
     resolution: {integrity: sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==}
     engines: {node: '>=8'}
     engines: {node: '>=8'}
@@ -7912,7 +7854,6 @@ packages:
 
 
   /deep-eql@4.1.3:
   /deep-eql@4.1.3:
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
     resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
->>>>>>> main
     engines: {node: '>=6'}
     engines: {node: '>=6'}
     dependencies:
     dependencies:
       type-detect: 4.1.0
       type-detect: 4.1.0
@@ -8002,20 +7943,10 @@ packages:
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
     dev: true
     dev: true
 
 
-<<<<<<< HEAD
-  /detect-libc@1.0.3:
-    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-    requiresBuild: true
-    dev: true
-    optional: true
-=======
   /detect-libc@2.0.3:
   /detect-libc@2.0.3:
     resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
     resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
     engines: {node: '>=8'}
     engines: {node: '>=8'}
     dev: false
     dev: false
->>>>>>> main
 
 
   /detect-node@2.1.0:
   /detect-node@2.1.0:
     resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
     resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
@@ -9915,10 +9846,6 @@ packages:
       universalify: 2.0.1
       universalify: 2.0.1
     dev: true
     dev: true
 
 
-<<<<<<< HEAD
-  /fs-monkey@1.0.6:
-    resolution: {integrity: sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==}
-=======
   /fs-minipass@2.1.0:
   /fs-minipass@2.1.0:
     resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
     resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
     engines: {node: '>= 8'}
     engines: {node: '>= 8'}
@@ -9928,7 +9855,6 @@ packages:
 
 
   /fs-monkey@1.0.4:
   /fs-monkey@1.0.4:
     resolution: {integrity: sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==}
     resolution: {integrity: sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==}
->>>>>>> main
     dev: true
     dev: true
 
 
   /fs.realpath@1.0.0:
   /fs.realpath@1.0.0:
@@ -10188,8 +10114,6 @@ packages:
     engines: {node: '>= 0.4'}
     engines: {node: '>= 0.4'}
     dependencies:
     dependencies:
       has-symbols: 1.1.0
       has-symbols: 1.1.0
-<<<<<<< HEAD
-=======
     dev: true
     dev: true
 
 
   /has-unicode@2.0.1:
   /has-unicode@2.0.1:
@@ -10201,7 +10125,6 @@ packages:
     engines: {node: '>= 0.4.0'}
     engines: {node: '>= 0.4.0'}
     dependencies:
     dependencies:
       function-bind: 1.1.2
       function-bind: 1.1.2
->>>>>>> main
 
 
   /hash-sum@1.0.2:
   /hash-sum@1.0.2:
     resolution: {integrity: sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==}
     resolution: {integrity: sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==}
@@ -10396,11 +10319,7 @@ packages:
     dependencies:
     dependencies:
       '@tootallnate/once': 2.0.0
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
       agent-base: 6.0.2
-<<<<<<< HEAD
-      debug: 4.4.0
-=======
       debug: 4.3.7
       debug: 4.3.7
->>>>>>> main
     transitivePeerDependencies:
     transitivePeerDependencies:
       - supports-color
       - supports-color
     dev: true
     dev: true
@@ -10440,11 +10359,7 @@ packages:
     engines: {node: '>= 6'}
     engines: {node: '>= 6'}
     dependencies:
     dependencies:
       agent-base: 6.0.2
       agent-base: 6.0.2
-<<<<<<< HEAD
-      debug: 4.4.0
-=======
       debug: 4.3.7
       debug: 4.3.7
->>>>>>> main
     transitivePeerDependencies:
     transitivePeerDependencies:
       - supports-color
       - supports-color
 
 
@@ -10975,11 +10890,7 @@ packages:
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==}
     engines: {node: '>=10'}
     engines: {node: '>=10'}
     dependencies:
     dependencies:
-<<<<<<< HEAD
-      debug: 4.4.0
-=======
       debug: 4.3.7
       debug: 4.3.7
->>>>>>> main
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
       source-map: 0.6.1
     transitivePeerDependencies:
     transitivePeerDependencies:
@@ -14344,11 +14255,7 @@ packages:
     dependencies:
     dependencies:
       '@kwsites/file-exists': 1.1.1
       '@kwsites/file-exists': 1.1.1
       '@kwsites/promise-deferred': 1.1.1
       '@kwsites/promise-deferred': 1.1.1
-<<<<<<< HEAD
-      debug: 4.4.0
-=======
       debug: 4.3.7
       debug: 4.3.7
->>>>>>> main
     transitivePeerDependencies:
     transitivePeerDependencies:
       - supports-color
       - supports-color
     dev: true
     dev: true
@@ -14849,10 +14756,6 @@ packages:
     engines: {node: '>=6'}
     engines: {node: '>=6'}
     dev: true
     dev: true
 
 
-<<<<<<< HEAD
-  /terser-webpack-plugin@5.3.11(webpack@5.98.0):
-    resolution: {integrity: sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==}
-=======
   /tar@6.2.1:
   /tar@6.2.1:
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
     engines: {node: '>=10'}
     engines: {node: '>=10'}
@@ -14867,7 +14770,6 @@ packages:
 
 
   /terser-webpack-plugin@5.3.9(webpack@5.88.2):
   /terser-webpack-plugin@5.3.9(webpack@5.88.2):
     resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==}
     resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==}
->>>>>>> main
     engines: {node: '>= 10.13.0'}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
     peerDependencies:
       '@swc/core': '*'
       '@swc/core': '*'
@@ -15655,19 +15557,11 @@ packages:
     hasBin: true
     hasBin: true
     dependencies:
     dependencies:
       cac: 6.7.14
       cac: 6.7.14
-<<<<<<< HEAD
-      debug: 4.4.0
-      mlly: 1.7.4
-      pathe: 1.1.2
-      picocolors: 1.1.1
-      vite: 5.4.14(@types/node@22.13.4)
-=======
       debug: 4.3.7
       debug: 4.3.7
       mlly: 1.4.2
       mlly: 1.4.2
       pathe: 1.1.1
       pathe: 1.1.1
       picocolors: 1.0.0
       picocolors: 1.0.0
       vite: 5.2.8(@types/node@20.4.5)(sass@1.63.2)
       vite: 5.2.8(@types/node@20.4.5)(sass@1.63.2)
->>>>>>> main
     transitivePeerDependencies:
     transitivePeerDependencies:
       - '@types/node'
       - '@types/node'
       - less
       - less
@@ -15686,19 +15580,11 @@ packages:
     hasBin: true
     hasBin: true
     dependencies:
     dependencies:
       cac: 6.7.14
       cac: 6.7.14
-<<<<<<< HEAD
-      debug: 4.4.0
-      mlly: 1.7.4
-      pathe: 1.1.2
-      picocolors: 1.1.1
-      vite: 4.5.9(@types/node@22.13.4)(sass@1.85.0)(terser@5.39.0)
-=======
       debug: 4.3.7
       debug: 4.3.7
       mlly: 1.4.2
       mlly: 1.4.2
       pathe: 1.1.1
       pathe: 1.1.1
       picocolors: 1.0.0
       picocolors: 1.0.0
       vite: 5.2.8(@types/node@20.4.5)(sass@1.71.1)(terser@5.19.2)
       vite: 5.2.8(@types/node@20.4.5)(sass@1.71.1)(terser@5.19.2)
->>>>>>> main
     transitivePeerDependencies:
     transitivePeerDependencies:
       - '@types/node'
       - '@types/node'
       - less
       - less