From a2d8a588c6a925cc71db95c01e6ce72b105c0341 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Fri, 14 Mar 2025 20:24:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 68 ----------------------------------------------- 1 file changed, 68 deletions(-) diff --git a/package-lock.json b/package-lock.json index bce2a89..317b102 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,10 +27,6 @@ "pinia": "^2.2.4", "pinia-plugin-persistedstate": "^4.1.1", "quill": "^2.0.3", -<<<<<<< HEAD - "quill-blot-formatter": "^1.0.5", -======= ->>>>>>> qin_v8_isTrue "sass": "^1.80.3", "scss": "^0.2.4", "spark-md5": "^3.0.2", @@ -1848,15 +1844,9 @@ "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==" }, "node_modules/@vueup/vue-quill/node_modules/fast-diff": { -<<<<<<< HEAD - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz", - "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" -======= "version": "1.2.0", "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz", "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==" ->>>>>>> qin_v8_isTrue }, "node_modules/@vueup/vue-quill/node_modules/parchment": { "version": "1.1.4", @@ -1876,8 +1866,6 @@ "quill-delta": "^3.6.2" } }, -<<<<<<< HEAD -======= "node_modules/@vueup/vue-quill/node_modules/quill-delta": { "version": "4.2.2", "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-4.2.2.tgz", @@ -1893,7 +1881,6 @@ "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz", "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" }, ->>>>>>> qin_v8_isTrue "node_modules/@vueup/vue-quill/node_modules/quill/node_modules/quill-delta": { "version": "3.6.3", "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz", @@ -3744,8 +3731,6 @@ "node": ">= 0.6" } }, -<<<<<<< HEAD -======= "node_modules/event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz", @@ -3755,7 +3740,6 @@ "es5-ext": "~0.10.14" } }, ->>>>>>> qin_v8_isTrue "node_modules/eventemitter3": { "version": "5.0.1", "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-5.0.1.tgz", @@ -3850,12 +3834,6 @@ "node": ">=6" } }, -<<<<<<< HEAD - "node_modules/exsolve": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/exsolve/-/exsolve-1.0.4.tgz", - "integrity": "sha512-xsZH6PXaER4XoV+NiT7JHp1bJodJVT+cxeSH1G0f0tlT0lJqYuHUP3bUx2HtfTDvOagMINYp8rsqusxud3RXhw==" -======= "node_modules/ext": { "version": "1.7.0", "resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz", @@ -3863,7 +3841,6 @@ "dependencies": { "type": "^2.7.2" } ->>>>>>> qin_v8_isTrue }, "node_modules/extend": { "version": "3.0.2", @@ -3902,15 +3879,9 @@ } }, "node_modules/fast-diff": { -<<<<<<< HEAD - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==" -======= "version": "1.3.0", "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.3.0.tgz", "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==" ->>>>>>> qin_v8_isTrue }, "node_modules/fast-glob": { "version": "3.3.3", @@ -5209,21 +5180,16 @@ "lodash-es": "*" } }, -<<<<<<< HEAD -======= "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==" }, ->>>>>>> qin_v8_isTrue "node_modules/lodash.clonedeep": { "version": "4.5.0", "resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==" }, -<<<<<<< HEAD -======= "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -5234,15 +5200,12 @@ "resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==" }, ->>>>>>> qin_v8_isTrue "node_modules/lodash.isequal": { "version": "4.5.0", "resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead." }, -<<<<<<< HEAD -======= "node_modules/lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz", @@ -5253,7 +5216,6 @@ "resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz", "integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==" }, ->>>>>>> qin_v8_isTrue "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz", @@ -6469,37 +6431,7 @@ "npm": ">=8.2.3" } }, -<<<<<<< HEAD - "node_modules/quill-blot-formatter": { - "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/quill-blot-formatter/-/quill-blot-formatter-1.0.5.tgz", - "integrity": "sha512-iVmuEdmMIpvERBnnDfosWul6VAVN6tqQRruUzAEwA9ZbQ/Ef7DTHGZDUR4KklXpxM+z50opFp6m1NhNdN6HJhw==", - "dependencies": { - "deepmerge": "^2.0.0" - }, - "peerDependencies": { - "quill": "^1.3.4" - } - }, - "node_modules/quill-delta": { - "version": "4.2.2", - "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-4.2.2.tgz", - "integrity": "sha512-qjbn82b/yJzOjstBgkhtBjN2TNK+ZHP/BgUQO+j6bRhWQQdmj2lH6hXG7+nwwLF41Xgn//7/83lxs9n2BkTtTg==", - "dependencies": { - "fast-diff": "1.2.0", - "lodash.clonedeep": "^4.5.0", - "lodash.isequal": "^4.5.0" - } - }, - "node_modules/quill/node_modules/fast-diff": { - "version": "1.3.0", - "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.3.0.tgz", - "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==" - }, - "node_modules/quill/node_modules/quill-delta": { -======= "node_modules/quill-delta": { ->>>>>>> qin_v8_isTrue "version": "5.1.0", "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-5.1.0.tgz", "integrity": "sha512-X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA==",