diff --git a/src/config/index.ts b/src/config/index.ts index efe50ec..90f4c9e 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -3,7 +3,7 @@ const config = { title: "后台管理系统", //网站默认标题 version: "1.6.0", //版本号 baseUrl: `${ - import.meta.env.VITE_APP_BASE_URL + import.meta.env.VITE_APP_BASE_URL||'https://ceshi-worker-task.lihaink.cn' }/`, //请求接口域名 urlPrefix: "adminapi", //请求默认前缀 timeout: 20 * 1000, //请求超时时长 diff --git a/src/views/examined/components/audit_town_market.vue b/src/views/examined/components/audit_town_market.vue index 3df9ed3..3416246 100644 --- a/src/views/examined/components/audit_town_market.vue +++ b/src/views/examined/components/audit_town_market.vue @@ -18,7 +18,7 @@ > - + @@ -61,7 +61,7 @@ - + >>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.22.13" @@ -229,21 +222,12 @@ chalk "^2.4.2" js-tokens "^4.0.0" -<<<<<<< HEAD -"@babel/parser@^7.18.10", "@babel/parser@^7.20.15", "@babel/parser@^7.21.3": -======= -"@babel/parser@^7.15.8", "@babel/parser@^7.20.15", "@babel/parser@^7.21.3": ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 +"@babel/parser@^7.20.15", "@babel/parser@^7.21.3": version "7.22.10" resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.10.tgz" integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ== -"@babel/parser@^7.22.15": - version "7.23.0" - resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.0.tgz" - integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== - -"@babel/parser@^7.23.0": +"@babel/parser@^7.22.15", "@babel/parser@^7.23.0": version "7.23.0" resolved "https://registry.npmmirror.com/@babel/parser/-/parser-7.23.0.tgz" integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== @@ -300,17 +284,10 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -<<<<<<< HEAD -"@babel/traverse@^7.0.0", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.9": - version "7.18.10" - resolved "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.18.10.tgz" - integrity sha512-J7ycxg0/K9XCtLyHf0cz2DqDihonJeIo+z+HEdRe9YuT8TY4A66i+Ab2/xZCEW7Ro60bPCBBfqqboHSamoV3+g== -======= -"@babel/traverse@^7.15.4", "@babel/traverse@^7.22.5", "@babel/traverse@^7.23.0": +"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.0": version "7.23.0" resolved "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.23.0.tgz" integrity sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 dependencies: "@babel/code-frame" "^7.22.13" "@babel/generator" "^7.23.0" @@ -342,7 +319,6 @@ resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.6.tgz" integrity sha512-lPpG8hYkjL/Z97DH5Ei6w6o22Z4YdNglWCNYOPcB33JCF2A4wye6HFgSI7hEt9zdLyxlSpiqtgf9XcYU+m5mew== -<<<<<<< HEAD "@esbuild/android-arm@0.15.18": version "0.15.18" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz#266d40b8fdcf87962df8af05b76219bc786b4f80" @@ -352,7 +328,7 @@ version "0.15.18" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz#128b76ecb9be48b60cf5cfc1c63a4f00691a3239" integrity sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ== -======= + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.npmmirror.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz" @@ -364,7 +340,6 @@ version "4.9.1" resolved "https://registry.npmmirror.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz" integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 "@eslint/eslintrc@^1.3.0": version "1.4.1" @@ -417,37 +392,19 @@ resolved "https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -<<<<<<< HEAD -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.2" - resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== -======= "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz" integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 dependencies: "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -<<<<<<< HEAD -======= "@jridgewell/resolve-uri@^3.1.0": version "3.1.1" resolved "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz" integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 "@jridgewell/set-array@^1.0.1": version "1.1.2" @@ -670,17 +627,10 @@ "@uppy/utils" "^4.1.2" namespace-emitter "^2.0.1" -<<<<<<< HEAD "@uppy/core@^2.1.1": - version "2.3.2" - resolved "https://registry.npmmirror.com/@uppy/core/-/core-2.3.2.tgz" - integrity sha512-CHNWn5B9trBw28SWO/BQnQzhKne/U5npSnfK9SZfnAL4A/nTFX9jrznBkmS8wulVarDpavfj8+BA9kjzExFBfg== -======= -"@uppy/core@^2.0.3", "@uppy/core@^2.1.1", "@uppy/core@^2.1.4", "@uppy/core@^2.3.3": version "2.3.4" resolved "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz" integrity sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 dependencies: "@transloadit/prettier-bytes" "0.0.7" "@uppy/store-default" "^2.1.1" @@ -703,17 +653,10 @@ dependencies: lodash.throttle "^4.1.1" -<<<<<<< HEAD "@uppy/xhr-upload@^2.0.3": - version "2.1.2" - resolved "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.2.tgz" - integrity sha512-VCsb7J5yHsof49nnUa+Y1n27UMtqHPttQmmoCa5hmjqa9R7ZISpBkXKOQmZo526eopKNuAKSAdkHWfCm8efJTA== -======= -"@uppy/xhr-upload@^2.0.3", "@uppy/xhr-upload@^2.0.7": version "2.1.3" resolved "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz" integrity sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 dependencies: "@uppy/companion-client" "^2.2.2" "@uppy/utils" "^4.1.2" @@ -938,17 +881,10 @@ dependencies: vue-demi "*" -<<<<<<< HEAD "@wangeditor/basic-modules@^1.1.3": - version "1.1.3" - resolved "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.3.tgz" - integrity sha512-TGJix4UelO46yAgwI946ctx4lSIJbYBwNvjSJ9Tf8mKr0WMCeLVBV+MV85rXPsfcmWtR4wBNwSg648Z+RbqRUg== -======= -"@wangeditor/basic-modules@^1.1.3", "@wangeditor/basic-modules@1.x": version "1.1.7" resolved "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz" integrity sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 dependencies: is-url "^1.2.4" @@ -959,17 +895,10 @@ dependencies: prismjs "^1.23.0" -<<<<<<< HEAD "@wangeditor/core@^1.1.11": - version "1.1.11" - resolved "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.11.tgz" - integrity sha512-BwHVRJzESnkjKikTc2U2zsbd06l1pSo7qKy5+SpZLudYWrFxmd85VN+5GxM57FodogkNw/k04DFHcFSUfXcaKA== -======= -"@wangeditor/core@^1.1.11", "@wangeditor/core@1.x": version "1.1.19" resolved "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz" integrity sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 dependencies: "@types/event-emitter" "^0.3.3" event-emitter "^0.3.5" @@ -1049,20 +978,12 @@ acorn-walk@^7.0.0: resolved "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -<<<<<<< HEAD -======= -"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.10.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.9.0: - version "8.10.0" - resolved "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz" - integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== - ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 acorn@^7.0.0: version "7.4.1" resolved "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.9.0: +acorn@^8.10.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.9.0: version "8.10.0" resolved "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz" integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== @@ -1270,17 +1191,10 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -<<<<<<< HEAD -browserslist@^4.20.2, browserslist@^4.21.3: - version "4.21.3" - resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.3.tgz" - integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== -======= -browserslist@^4.21.3, browserslist@^4.21.9, "browserslist@>= 4.21.0": +browserslist@^4.21.3, browserslist@^4.21.9: version "4.22.1" resolved "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.1.tgz" integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 dependencies: caniuse-lite "^1.0.30001541" electron-to-chromium "^1.4.535" @@ -2094,11 +2008,7 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: resolved "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -<<<<<<< HEAD eslint@^8.5.0: -======= -eslint@*, "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^6.2.0 || ^7.0.0 || ^8.0.0", eslint@^8.5.0, "eslint@>= 7.28.0", eslint@>=5, eslint@>=6.0.0, eslint@>=7.0.0, eslint@>=7.28.0: ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 version "8.21.0" resolved "https://registry.npmmirror.com/eslint/-/eslint-8.21.0.tgz" integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA== @@ -2392,19 +2302,11 @@ fs.realpath@^1.0.0: resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -<<<<<<< HEAD fsevents@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -======= ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.npmmirror.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz" @@ -2456,14 +2358,7 @@ globals@^11.1.0: resolved "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.15.0: - version "13.23.0" - resolved "https://registry.npmmirror.com/globals/-/globals-13.23.0.tgz" - integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA== - dependencies: - type-fest "^0.20.2" - -globals@^13.19.0: +globals@^13.15.0, globals@^13.19.0: version "13.23.0" resolved "https://registry.npmmirror.com/globals/-/globals-13.23.0.tgz" integrity sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA== @@ -2721,16 +2616,7 @@ is-descriptor@^0.1.0: is-data-descriptor "^0.1.4" kind-of "^5.0.0" -is-descriptor@^1.0.0: - version "1.0.2" - resolved "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-descriptor@^1.0.2: +is-descriptor@^1.0.0, is-descriptor@^1.0.2: version "1.0.2" resolved "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz" integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== @@ -2829,16 +2715,6 @@ isobject@^2.0.0, isobject@^2.1.0: dependencies: isarray "1.0.0" -<<<<<<< HEAD -======= -isobject@^2.1.0: - version "2.1.0" - resolved "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz" - integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== - dependencies: - isarray "1.0.0" - ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz" @@ -2907,9 +2783,6 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -<<<<<<< HEAD -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: -======= keyv@^4.5.3: version "4.5.4" resolved "https://registry.npmmirror.com/keyv/-/keyv-4.5.4.tgz" @@ -2917,22 +2790,7 @@ keyv@^4.5.3: dependencies: json-buffer "3.0.1" -kind-of@^3.0.2: - version "3.2.2" - resolved "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz" - integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== - dependencies: - is-buffer "^1.1.5" - -kind-of@^3.0.3: - version "3.2.2" - resolved "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz" - integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== - dependencies: - is-buffer "^1.1.5" - -kind-of@^3.2.0: ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz" integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== @@ -3075,11 +2933,7 @@ magic-string@^0.25.7: magic-string@^0.26.2, magic-string@^0.26.7: version "0.26.7" -<<<<<<< HEAD - resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.26.7.tgz" -======= resolved "https://registry.npmmirror.com/magic-string/-/magic-string-0.26.7.tgz" ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow== dependencies: sourcemap-codec "^1.4.8" @@ -3582,11 +3436,7 @@ postcss@^5.2.17: source-map "^0.5.6" supports-color "^3.2.3" -<<<<<<< HEAD postcss@^8.1.10, postcss@^8.4.14, postcss@^8.4.18: -======= -postcss@^8.0.0, postcss@^8.1.0, postcss@^8.1.10, postcss@^8.2.14, postcss@^8.4.14, postcss@^8.4.18, postcss@^8.4.21, postcss@>=8.0.9, "postcss@>4 <9": ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 version "8.4.27" resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz" integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ== @@ -3842,25 +3692,7 @@ semver@^6.3.1: resolved "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -<<<<<<< HEAD semver@^7.3.5, semver@^7.3.6, semver@^7.3.7: -======= -semver@^7.3.5: - version "7.5.4" - resolved "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.6: - version "7.5.4" - resolved "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.7: ->>>>>>> 66e6c3889c11cec6c6f9c07c943b9b37156876a8 version "7.5.4" resolved "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==