diff --git a/package-lock.json b/package-lock.json index 0e9dc480..46e407d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3286,6 +3286,12 @@ "is-glob": "^4.0.1" } }, + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true + }, "globals": { "version": "13.11.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", @@ -6416,36 +6422,14 @@ } }, "vue-loader": { - "version": "16.8.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz", - "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==", + "version": "17.1.2", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.1.2.tgz", + "integrity": "sha512-AxCiJ2aPPwJC5CWtsQH3d5WSw67v55oLFHBmzrc5kjSr6i1dn5uoj5QsuokApirvWBCegRmfnE/MYFyhKMUwxw==", "dev": true, "requires": { "chalk": "^4.1.0", "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } + "watchpack": "^2.4.0" } }, "vue-masonry": { @@ -6503,6 +6487,16 @@ } } }, + "watchpack": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "dev": true, + "requires": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index fcfd6748..aa76be2a 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "vite-plugin-fonts": "0.2.2", "vite-plugin-svg-icons": "1.0.5", "vite-plugin-windicss": "^1.7.0", - "vue-loader": "16.8.1", + "vue-loader": "17.1.2", "windicss": "^3.4.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 46f6167b..f86f8d2c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ specifiers: '@vue/compiler-sfc': 3.2.20 '@vue/eslint-config-prettier': 6.0.0 '@vueup/vue-quill': 1.0.0-beta.7 - '@vueuse/components': ^6.7.3 + '@vueuse/components': ^6.9.2 '@vueuse/core': 6.6.1 '@vueuse/gesture': ^1.0.0 '@vueuse/integrations': 6.6.1 @@ -25,7 +25,7 @@ specifiers: eslint-plugin-prettier-vue: 3.1.0 eslint-plugin-vue: 7.19.1 fastcomments-vue-next: 2.0.1 - html-to-text: ^8.0.0 + html-to-text: ^8.1.0 husky: 7.0.2 lint-staged: 11.2.3 lodash: 4.17.21 @@ -44,15 +44,15 @@ specifiers: vite: 2.6.7 vite-plugin-fonts: 0.2.2 vite-plugin-svg-icons: 1.0.5 - vite-plugin-windicss: ^1.4.12 + vite-plugin-windicss: ^1.7.0 vue: 3.2.20 vue-i18n: 9.1.9 - vue-loader: 16.8.1 + vue-loader: 17.1.2 vue-masonry: ^0.13.0 vue-nprogress: 0.2.0 vue-ripple-directive: ^2.0.1 vue-router: 4.0.12 - windicss: ^3.1.9 + windicss: ^3.4.3 yup: 0.32.11 dependencies: @@ -60,7 +60,7 @@ dependencies: '@ckeditor/ckeditor5-vue': 2.0.1 '@iconicicons/vue3': 1.5.0_vue@3.2.20 '@vueup/vue-quill': 1.0.0-beta.7_vue@3.2.20 - '@vueuse/components': 6.7.3_vue@3.2.20 + '@vueuse/components': 6.9.2_vue@3.2.20 '@vueuse/core': 6.6.1_vue@3.2.20 '@vueuse/integrations': 6.6.1_vue@3.2.20 '@vueuse/motion': 1.6.0_vue@3.2.20 @@ -68,7 +68,7 @@ dependencies: axios: 0.23.0 color: 4.0.1 fastcomments-vue-next: 2.0.1 - html-to-text: 8.0.0 + html-to-text: 8.2.1 lodash: 4.17.21 masonry-layout: 4.2.2 mitt: 3.0.0 @@ -108,9 +108,9 @@ devDependencies: vite: 2.6.7_sass@1.43.2 vite-plugin-fonts: 0.2.2_vite@2.6.7 vite-plugin-svg-icons: 1.0.5_vite@2.6.7 - vite-plugin-windicss: 1.4.12_vite@2.6.7 - vue-loader: 16.8.1 - windicss: 3.1.9 + vite-plugin-windicss: 1.9.0_vite@2.6.7 + vue-loader: 17.1.2_8612dc571a800641003b6ef0ef757662 + windicss: 3.5.6 packages: @@ -118,6 +118,11 @@ packages: resolution: {integrity: sha512-UU8TLr/EoXdg7OjMp0h9oDoIAVr+Z/oW9cpOxQQyrsz6Qzd2ms/1CdWx8fl2OQdFpxGmq5Vc4TwfLHId6nAZjA==} dependencies: '@types/throttle-debounce': 2.1.0 + dev: false + + /@antfu/utils/0.7.4: + resolution: {integrity: sha512-qe8Nmh9rYI/HIspLSTwtbMFPj6dISG6+dJnOguTlPNXtCvS2uezdxscVBb7/3DrmNbQK49TDqpkSQ1chbRGdpQ==} + dev: true /@babel/code-frame/7.15.8: resolution: {integrity: sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==} @@ -265,7 +270,6 @@ packages: /@babel/helper-validator-identifier/7.15.7: resolution: {integrity: sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==} engines: {node: '>=6.9.0'} - dev: true /@babel/helper-validator-option/7.14.5: resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==} @@ -296,6 +300,8 @@ packages: resolution: {integrity: sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==} engines: {node: '>=6.0.0'} hasBin: true + dependencies: + '@babel/types': 7.15.6 /@babel/runtime/7.15.4: resolution: {integrity: sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==} @@ -324,7 +330,7 @@ packages: '@babel/helper-split-export-declaration': 7.15.4 '@babel/parser': 7.15.8 '@babel/types': 7.15.6 - debug: 4.3.2 + debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -336,7 +342,6 @@ packages: dependencies: '@babel/helper-validator-identifier': 7.15.7 to-fast-properties: 2.0.0 - dev: true /@ckeditor/ckeditor5-adapter-ckfinder/30.0.0: resolution: {integrity: sha512-tfFCMI7RKlpop5FeFoiRRT8O9+2ps/DaFxXiYKsAcsPFdpS9ArQebV7qB634CRadhe1yXgDm6+XrEsxd0W/ZgQ==} @@ -619,7 +624,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.2 + debug: 4.3.4 espree: 9.0.0 globals: 13.11.0 ignore: 4.0.6 @@ -636,7 +641,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.0 - debug: 4.3.2 + debug: 4.3.4 minimatch: 3.0.4 transitivePeerDependencies: - supports-color @@ -740,6 +745,10 @@ packages: '@intlify/runtime': 9.1.9 '@intlify/shared': 9.1.9 + /@jridgewell/sourcemap-codec/1.4.15: + resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + dev: true + /@nodelib/fs.scandir/2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -763,7 +772,7 @@ packages: engines: {node: '>= 8.0.0'} dependencies: estree-walker: 2.0.2 - picomatch: 2.3.0 + picomatch: 2.3.1 /@selderee/plugin-htmlparser2/0.6.0: resolution: {integrity: sha512-J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA==} @@ -806,6 +815,7 @@ packages: /@types/throttle-debounce/2.1.0: resolution: {integrity: sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==} + dev: false /@vitejs/plugin-vue/1.9.3_vite@2.6.7: resolution: {integrity: sha512-yW6H/q+4Mc2PcVjSOelcsMrg/k15DnMUz8jyCFsI04emc3aLwo4AoofUfGnjHUkgirrDxSJLVqQVGhonQ3yykA==} @@ -852,7 +862,6 @@ packages: /@vue/devtools-api/6.0.0-beta.19: resolution: {integrity: sha512-ObzQhgkoVeoyKv+e8+tB/jQBL2smtk/NmC9OmFK8UqdDpoOdv/Kf9pyDWL+IFyM7qLD2C75rszJujvGSPSpGlw==} - dev: false /@vue/eslint-config-prettier/6.0.0_eslint@8.0.1+prettier@2.4.1: resolution: {integrity: sha512-wFQmv45c3ige5EA+ngijq40YpVcIkAy0Lihupnsnd1Dao5CBbPyfCzqtejFLZX1EwH/kCJdpz3t6s+5wd3+KxQ==} @@ -870,7 +879,6 @@ packages: resolution: {integrity: sha512-nSmoLojUTk+H8HNTAkrUduB4+yIUBK2HPihJo2uXVSH4Spry6oqN6lFzE5zpLK+F27Sja+UqR9R1+/kIOsHV5w==} dependencies: '@vue/shared': 3.2.20 - dev: false /@vue/ref-transform/3.2.20: resolution: {integrity: sha512-Y42d3PGlYZ1lXcF3dbd3+qU/C/a3wYEZ949fyOI5ptzkjDWlkfU6vn74fmOjsLjEcjs10BXK2qO99FqQIK2r1Q==} @@ -886,7 +894,6 @@ packages: dependencies: '@vue/reactivity': 3.2.20 '@vue/shared': 3.2.20 - dev: false /@vue/runtime-dom/3.2.20: resolution: {integrity: sha512-4TCvZMLhESWCFHFYgqN4QmMA/onnINAlUovhopjlS8ST27G1A8Z0tyxPzLoXLa+b5JrOpbMPheEMPvdKExTJig==} @@ -894,7 +901,6 @@ packages: '@vue/runtime-core': 3.2.20 '@vue/shared': 3.2.20 csstype: 2.6.18 - dev: false /@vue/server-renderer/3.2.20_vue@3.2.20: resolution: {integrity: sha512-viIbZGep9XabnrRcaxWIi00cOh1x21QYm2upIL5W0zqzTJ54VdTzpI+zi1osNp+VfRQDTHpV2U7H3Kn4ljYJvg==} @@ -904,7 +910,6 @@ packages: '@vue/compiler-ssr': 3.2.20 '@vue/shared': 3.2.20 vue: 3.2.20 - dev: false /@vue/shared/3.2.20: resolution: {integrity: sha512-FbpX+hD5BvXCQerEYO7jtAGHlhAkhTQ4KIV73kmLWNlawWhTiVuQxizgVb0BOkX5oG9cIRZ42EG++d/k/Efp0w==} @@ -919,11 +924,11 @@ packages: vue: 3.2.20 dev: false - /@vueuse/components/6.7.3_vue@3.2.20: - resolution: {integrity: sha512-pZmprJQVMazELQO12+LqDJqyhIti5n3ZYHbrE5BNQ1Jwwrf5XWUS+LohmLMwi2g6gLxA29UpOOkWLbULiFMIpg==} + /@vueuse/components/6.9.2_vue@3.2.20: + resolution: {integrity: sha512-FZj25O93hmnLE7U/2FVI0rKl3yw4bPXsOtJi3OHKfEdbyMnGohpbJ7FzfYnQj8L/fnJKtPQsISGfICx573hOQg==} dependencies: - '@vueuse/core': 6.7.3_vue@3.2.20 - '@vueuse/shared': 6.7.3_vue@3.2.20 + '@vueuse/core': 6.9.2_vue@3.2.20 + '@vueuse/shared': 6.9.2_vue@3.2.20 vue-demi: 0.11.4_vue@3.2.20 transitivePeerDependencies: - '@vue/composition-api' @@ -946,8 +951,8 @@ packages: vue-demi: 0.11.4_vue@3.2.20 dev: false - /@vueuse/core/6.7.3_vue@3.2.20: - resolution: {integrity: sha512-Cqvk/e4DbdfZlUmVRcxr4rkK5CMn6KqN7TLx2L1++F9HrvlD/FIET3KQ/W7+wHowhdKEjdOUCFJtyU0k65xH2g==} + /@vueuse/core/6.9.2_vue@3.2.20: + resolution: {integrity: sha512-FRwl4ccSFuHZBHLGgS9TMv/+Dd6XFaL4o9nph2qtgQIV+z29RBFokw08XjHfykiENRzB01MjYHJ7iRUnsIFQXg==} peerDependencies: '@vue/composition-api': ^1.1.0 vue: ^2.6.0 || ^3.2.0 @@ -957,7 +962,7 @@ packages: vue: optional: true dependencies: - '@vueuse/shared': 6.7.3_vue@3.2.20 + '@vueuse/shared': 6.9.2_vue@3.2.20 vue: 3.2.20 vue-demi: 0.11.4_vue@3.2.20 dev: false @@ -1038,8 +1043,8 @@ packages: vue-demi: 0.11.4_vue@3.2.20 dev: false - /@vueuse/shared/6.7.3_vue@3.2.20: - resolution: {integrity: sha512-6syKgXvdikcSEHJzF7iVyXMqe7y7C7pH35EhH70zQLPnLXH6op9OgD2u4Ro1zyxESRkotbFIsuQJghG5IzXbKA==} + /@vueuse/shared/6.9.2_vue@3.2.20: + resolution: {integrity: sha512-lAiMh6XROs0kSKVd0Yb/6GKoQMxC1fYrFDi6opvQWISPtcqRNluRrQxLUZ3WTI78ovtoKRLktjhkFAtydcfFDg==} peerDependencies: '@vue/composition-api': ^1.1.0 vue: ^2.6.0 || ^3.2.0 @@ -1053,12 +1058,12 @@ packages: vue-demi: 0.11.4_vue@3.2.20 dev: false - /@windicss/config/1.4.12: - resolution: {integrity: sha512-+ckfkRoWC8wia5o7iCyDmydiJEkjX6lVEb6a2QVPI9WQ9Mi7hqfgOoStijOsEn0wIz95FDiOfVe5aSb1V4jEtw==} + /@windicss/config/1.9.0: + resolution: {integrity: sha512-QO4+udbmDIgZwAi89tqUt5nGwBq3IgyELjLn83twZXiIqzOw+77ecCuM0oPSbzWmIbCqXq3wRQHd6Z1u5E/5zQ==} dependencies: - debug: 4.3.2 - jiti: 1.12.9 - windicss: 3.1.9 + debug: 4.3.4 + jiti: 1.18.2 + windicss: 3.5.6 transitivePeerDependencies: - supports-color dev: true @@ -1069,16 +1074,16 @@ packages: lodash: 4.17.21 dev: true - /@windicss/plugin-utils/1.4.12: - resolution: {integrity: sha512-ixYflwELxEjHyh0B9HqTwDp1d3v5IWtUucVY84o41ZU53BkuRw1lKbNlLMqbrtbk8p8rAQxjuwWZkWxFYi77tQ==} + /@windicss/plugin-utils/1.9.0: + resolution: {integrity: sha512-omAacM5ExIr9XBUI2z47CyCXJBke4imJZqXW41YgHhRLbahTngbScFk5yxa6dXivDXUpUKqasOPXBJgA4bhHCg==} dependencies: - '@antfu/utils': 0.3.0 - '@windicss/config': 1.4.12 - debug: 4.3.2 - fast-glob: 3.2.7 - magic-string: 0.25.7 - micromatch: 4.0.4 - windicss: 3.1.9 + '@antfu/utils': 0.7.4 + '@windicss/config': 1.9.0 + debug: 4.3.4 + fast-glob: 3.2.12 + magic-string: 0.30.0 + micromatch: 4.0.5 + windicss: 3.5.6 transitivePeerDependencies: - supports-color dev: true @@ -1165,7 +1170,7 @@ packages: dev: true /ansi-styles/2.2.1: - resolution: {integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=} + resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==} engines: {node: '>=0.10.0'} dev: true @@ -1187,8 +1192,7 @@ packages: engines: {node: '>= 8'} dependencies: normalize-path: 3.0.0 - picomatch: 2.3.0 - dev: false + picomatch: 2.3.1 /argparse/1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -1286,7 +1290,6 @@ packages: /binary-extensions/2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} - dev: false /bluebird/3.7.2: resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==} @@ -1316,6 +1319,8 @@ packages: snapdragon-node: 2.1.1 split-string: 3.1.0 to-regex: 3.0.2 + transitivePeerDependencies: + - supports-color dev: true /braces/3.0.2: @@ -1411,7 +1416,7 @@ packages: dev: true /chalk/1.1.3: - resolution: {integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=} + resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==} engines: {node: '>=0.10.0'} dependencies: ansi-styles: 2.2.1 @@ -1451,7 +1456,6 @@ packages: readdirp: 3.6.0 optionalDependencies: fsevents: 2.3.2 - dev: false /ckeditor5/30.0.0: resolution: {integrity: sha512-4JafDNyXwjMR/IoY8wUZqo/E3xNtYJQet4ghYp9t2ZgVjIK/CY2uuGaT9EbsyZXk0HlHWJSLh/h9x/rw7IL3GA==} @@ -1534,7 +1538,7 @@ packages: color-name: 1.1.4 /color-name/1.1.3: - resolution: {integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=} + resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} /color-name/1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} @@ -1672,10 +1676,14 @@ packages: /csstype/2.6.18: resolution: {integrity: sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==} - dev: false /debug/2.6.9: resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true dependencies: ms: 2.0.0 dev: true @@ -1704,6 +1712,18 @@ packages: supports-color: 8.1.1 dev: true + /debug/4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + dev: true + /decamelize/1.2.0: resolution: {integrity: sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=} engines: {node: '>=0.10.0'} @@ -1773,7 +1793,7 @@ packages: optional: true /discontinuous-range/1.0.0: - resolution: {integrity: sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=} + resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==} dev: false /doctrine/3.0.0: @@ -1887,7 +1907,6 @@ packages: cpu: [arm64] os: [android] requiresBuild: true - dev: true optional: true /esbuild-darwin-64/0.13.9: @@ -1895,7 +1914,6 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: true optional: true /esbuild-darwin-arm64/0.13.9: @@ -1903,7 +1921,6 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: true optional: true /esbuild-freebsd-64/0.13.9: @@ -1911,7 +1928,6 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true - dev: true optional: true /esbuild-freebsd-arm64/0.13.9: @@ -1919,7 +1935,6 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true - dev: true optional: true /esbuild-linux-32/0.13.9: @@ -1927,7 +1942,6 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true - dev: true optional: true /esbuild-linux-64/0.13.9: @@ -1935,7 +1949,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true optional: true /esbuild-linux-arm/0.13.9: @@ -1943,7 +1956,6 @@ packages: cpu: [arm] os: [linux] requiresBuild: true - dev: true optional: true /esbuild-linux-arm64/0.13.9: @@ -1951,7 +1963,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true optional: true /esbuild-linux-mips64le/0.13.9: @@ -1959,7 +1970,6 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true - dev: true optional: true /esbuild-linux-ppc64le/0.13.9: @@ -1967,7 +1977,6 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true - dev: true optional: true /esbuild-netbsd-64/0.13.9: @@ -1975,7 +1984,6 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true - dev: true optional: true /esbuild-openbsd-64/0.13.9: @@ -1983,7 +1991,6 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true - dev: true optional: true /esbuild-sunos-64/0.13.9: @@ -1991,7 +1998,6 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true - dev: true optional: true /esbuild-windows-32/0.13.9: @@ -1999,7 +2005,6 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - dev: true optional: true /esbuild-windows-64/0.13.9: @@ -2007,7 +2012,6 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: true optional: true /esbuild-windows-arm64/0.13.9: @@ -2015,7 +2019,6 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: true optional: true /esbuild/0.13.9: @@ -2040,7 +2043,6 @@ packages: esbuild-windows-32: 0.13.9 esbuild-windows-64: 0.13.9 esbuild-windows-arm64: 0.13.9 - dev: true /escalade/3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -2290,6 +2292,8 @@ packages: regex-not: 1.0.2 snapdragon: 0.8.2 to-regex: 3.0.2 + transitivePeerDependencies: + - supports-color dev: true /extend-shallow/2.0.1: @@ -2323,6 +2327,8 @@ packages: regex-not: 1.0.2 snapdragon: 0.8.2 to-regex: 3.0.2 + transitivePeerDependencies: + - supports-color dev: true /fast-deep-equal/3.1.3: @@ -2337,6 +2343,17 @@ packages: resolution: {integrity: sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==} dev: true + /fast-glob/3.2.12: + resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} + engines: {node: '>=8.6.0'} + dependencies: + '@nodelib/fs.stat': 2.0.5 + '@nodelib/fs.walk': 1.2.8 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.5 + dev: true + /fast-glob/3.2.7: resolution: {integrity: sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==} engines: {node: '>=8'} @@ -2345,7 +2362,7 @@ packages: '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.4 + micromatch: 4.0.5 /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -2375,7 +2392,7 @@ packages: dev: true /fill-range/4.0.0: - resolution: {integrity: sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=} + resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==} engines: {node: '>=0.10.0'} dependencies: extend-shallow: 2.0.1 @@ -2567,6 +2584,10 @@ packages: is-glob: 4.0.3 dev: true + /glob-to-regexp/0.4.1: + resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} + dev: true + /glob/7.2.0: resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==} dependencies: @@ -2602,12 +2623,12 @@ packages: dev: true /has-flag/1.0.0: - resolution: {integrity: sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=} + resolution: {integrity: sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==} engines: {node: '>=0.10.0'} dev: true /has-flag/3.0.0: - resolution: {integrity: sha1-tdRU3CGZriJWmfNGfloH87lVuv0=} + resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} dev: true @@ -2682,8 +2703,8 @@ packages: resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} dev: false - /html-to-text/8.0.0: - resolution: {integrity: sha512-fEtul1OerF2aMEV+Wpy+Ue20tug134jOY1GIudtdqZi7D0uTudB2tVJBKfVhTL03dtqeJoF8gk8EPX9SyMEvLg==} + /html-to-text/8.2.1: + resolution: {integrity: sha512-aN/3JvAk8qFsWVeE9InWAWueLXrbkoVZy0TkzaGhoRBC2gCFEeRLDDJN3/ijIGHohy6H+SZzUQWN/hcYtaPK8w==} engines: {node: '>=10.23.2'} hasBin: true dependencies: @@ -2691,7 +2712,7 @@ packages: deepmerge: 4.2.2 he: 1.2.0 htmlparser2: 6.1.0 - minimist: 1.2.5 + minimist: 1.2.8 selderee: 0.6.0 dev: false @@ -2818,7 +2839,6 @@ packages: engines: {node: '>=8'} dependencies: binary-extensions: 2.2.0 - dev: false /is-buffer/1.1.6: resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} @@ -2881,7 +2901,7 @@ packages: dev: true /is-extglob/2.1.1: - resolution: {integrity: sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=} + resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} /is-fullwidth-code-point/2.0.0: @@ -2902,7 +2922,7 @@ packages: is-extglob: 2.1.1 /is-number/3.0.0: - resolution: {integrity: sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=} + resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==} engines: {node: '>=0.10.0'} dependencies: kind-of: 3.2.2 @@ -2977,8 +2997,8 @@ packages: engines: {node: '>=0.10.0'} dev: true - /jiti/1.12.9: - resolution: {integrity: sha512-TdcJywkQtcwLxogc4rSMAi479G2eDPzfW0fLySks7TPhgZZ4s/tM6stnzayIh3gS/db3zExWJyUx4cNWrwAmoQ==} + /jiti/1.18.2: + resolution: {integrity: sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==} hasBin: true dev: true @@ -3027,7 +3047,7 @@ packages: resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==} hasBin: true dependencies: - minimist: 1.2.5 + minimist: 1.2.8 dev: true /json5/2.2.0: @@ -3035,7 +3055,7 @@ packages: engines: {node: '>=6'} hasBin: true dependencies: - minimist: 1.2.5 + minimist: 1.2.8 dev: true /jsonc-eslint-parser/1.4.1: @@ -3087,6 +3107,10 @@ packages: engines: {node: '>=0.10.0'} dev: true + /kolorist/1.8.0: + resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} + dev: true + /levn/0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} @@ -3144,15 +3168,6 @@ packages: json5: 1.0.1 dev: true - /loader-utils/2.0.0: - resolution: {integrity: sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==} - engines: {node: '>=8.9.0'} - dependencies: - big.js: 5.2.2 - emojis-list: 3.0.0 - json5: 2.2.0 - dev: true - /local-pkg/0.1.0: resolution: {integrity: sha512-WsR2tHvRGIxcC2clC30ECb5fjywzsjQagaHIy1+ykZaHz0ByoB0OL2riHqIYA5YYnensRXLszwbzHkhKzehZDg==} dependencies: @@ -3219,6 +3234,13 @@ packages: dependencies: sourcemap-codec: 1.4.8 + /magic-string/0.30.0: + resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + /make-dir/3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} @@ -3281,6 +3303,8 @@ packages: regex-not: 1.0.2 snapdragon: 0.8.2 to-regex: 3.0.2 + transitivePeerDependencies: + - supports-color dev: true /micromatch/4.0.4: @@ -3288,7 +3312,15 @@ packages: engines: {node: '>=8.6'} dependencies: braces: 3.0.2 - picomatch: 2.3.0 + picomatch: 2.3.1 + dev: true + + /micromatch/4.0.5: + resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + engines: {node: '>=8.6'} + dependencies: + braces: 3.0.2 + picomatch: 2.3.1 /mimic-fn/2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} @@ -3300,8 +3332,8 @@ packages: dependencies: brace-expansion: 1.1.11 - /minimist/1.2.5: - resolution: {integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==} + /minimist/1.2.8: + resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} /mitt/3.0.0: resolution: {integrity: sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==} @@ -3326,7 +3358,7 @@ packages: dev: false /ms/2.0.0: - resolution: {integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=} + resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} dev: true /ms/2.1.2: @@ -3360,6 +3392,8 @@ packages: regex-not: 1.0.2 snapdragon: 0.8.2 to-regex: 3.0.2 + transitivePeerDependencies: + - supports-color dev: true /natural-compare/1.4.0: @@ -3577,8 +3611,8 @@ packages: /picocolors/1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} - /picomatch/2.3.0: - resolution: {integrity: sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==} + /picomatch/2.3.1: + resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} /pinst/2.1.6: @@ -3777,7 +3811,7 @@ packages: dev: false /railroad-diagrams/1.0.0: - resolution: {integrity: sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=} + resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==} dev: false /randexp/0.4.6: @@ -3801,8 +3835,7 @@ packages: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} dependencies: - picomatch: 2.3.0 - dev: false + picomatch: 2.3.1 /regenerator-runtime/0.13.9: resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==} @@ -3900,7 +3933,6 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 - dev: true /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -3934,7 +3966,6 @@ packages: hasBin: true dependencies: chokidar: 3.5.2 - dev: false /schema-utils/2.7.1: resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==} @@ -4050,6 +4081,8 @@ packages: source-map: 0.5.7 source-map-resolve: 0.5.3 use: 3.1.1 + transitivePeerDependencies: + - supports-color dev: true /source-map-js/0.6.2: @@ -4214,12 +4247,12 @@ packages: dev: false /supports-color/2.0.0: - resolution: {integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=} + resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==} engines: {node: '>=0.8.0'} dev: true /supports-color/3.2.3: - resolution: {integrity: sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=} + resolution: {integrity: sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==} engines: {node: '>=0.8.0'} dependencies: has-flag: 1.0.0 @@ -4262,6 +4295,8 @@ packages: posthtml-svg-mode: 1.0.3 query-string: 4.3.4 traverse: 0.6.6 + transitivePeerDependencies: + - supports-color dev: true /svgo/2.7.0: @@ -4303,7 +4338,6 @@ packages: /to-fast-properties/2.0.0: resolution: {integrity: sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=} engines: {node: '>=4'} - dev: true /to-object-path/0.3.0: resolution: {integrity: sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=} @@ -4313,7 +4347,7 @@ packages: dev: true /to-regex-range/2.1.1: - resolution: {integrity: sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=} + resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==} engines: {node: '>=0.10.0'} dependencies: is-number: 3.0.0 @@ -4506,16 +4540,16 @@ packages: - supports-color dev: true - /vite-plugin-windicss/1.4.12_vite@2.6.7: - resolution: {integrity: sha512-5YLT7e72z1vCTSmprU/KxtRg22ySN+H19Qxy67lbG3mEbq8YbheOlmVhbqNqSv2MjFVhFqu72Q1FkkjyWENyQQ==} + /vite-plugin-windicss/1.9.0_vite@2.6.7: + resolution: {integrity: sha512-w0unPfcbVU5eaISAsFTLgIb41SLhmXoUF75Othu8NqFioe8+DEqiuvJ7/k/LRuEuvI8Rt/OKrY6cNzrB+dykaA==} peerDependencies: - vite: ^2.0.1 + vite: ^2.0.1 || ^3.0.0 || ^4.0.0 dependencies: - '@windicss/plugin-utils': 1.4.12 - chalk: 4.1.2 - debug: 4.3.2 + '@windicss/plugin-utils': 1.9.0 + debug: 4.3.4 + kolorist: 1.8.0 vite: 2.6.7_sass@1.43.2 - windicss: 3.1.9 + windicss: 3.5.6 transitivePeerDependencies: - supports-color dev: true @@ -4543,7 +4577,6 @@ packages: sass: 1.43.2 optionalDependencies: fsevents: 2.3.2 - dev: true /vue-demi/0.11.4_vue@3.2.20: resolution: {integrity: sha512-/3xFwzSykLW2HiiLie43a+FFgNOcokbBJ+fzvFXd0r2T8MYohqvphUyDQ8lbAwzQ3Dlcrb1c9ykifGkhSIAk6A==} @@ -4580,7 +4613,7 @@ packages: peerDependencies: eslint: '>=5.0.0' dependencies: - debug: 4.3.2 + debug: 4.3.4 eslint: 8.0.1 eslint-scope: 5.1.1 eslint-visitor-keys: 1.3.0 @@ -4603,16 +4636,24 @@ packages: '@intlify/vue-devtools': 9.1.9 '@vue/devtools-api': 6.0.0-beta.19 vue: 3.2.20 - dev: false - /vue-loader/16.8.1: - resolution: {integrity: sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==} + /vue-loader/17.1.2_8612dc571a800641003b6ef0ef757662: + resolution: {integrity: sha512-AxCiJ2aPPwJC5CWtsQH3d5WSw67v55oLFHBmzrc5kjSr6i1dn5uoj5QsuokApirvWBCegRmfnE/MYFyhKMUwxw==} peerDependencies: + '@vue/compiler-sfc': '*' + vue: '*' webpack: ^4.1.0 || ^5.0.0-0 + peerDependenciesMeta: + '@vue/compiler-sfc': + optional: true + vue: + optional: true dependencies: + '@vue/compiler-sfc': 3.2.20 chalk: 4.1.2 hash-sum: 2.0.0 - loader-utils: 2.0.0 + vue: 3.2.20 + watchpack: 2.4.0 dev: true /vue-masonry/0.13.0: @@ -4659,7 +4700,14 @@ packages: '@vue/runtime-dom': 3.2.20 '@vue/server-renderer': 3.2.20_vue@3.2.20 '@vue/shared': 3.2.20 - dev: false + + /watchpack/2.4.0: + resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==} + engines: {node: '>=10.13.0'} + dependencies: + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.8 + dev: true /webpack-virtual-modules/0.4.3: resolution: {integrity: sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw==} @@ -4678,8 +4726,8 @@ packages: isexe: 2.0.0 dev: true - /windicss/3.1.9: - resolution: {integrity: sha512-5YoKvXeCQXIdwc91BoOgpKbIImr2JS8I14rPMa/5dKDDPA4ot3NgICWKELkml39R/8rn4Q0BVUUTqN+w+hjDSA==} + /windicss/3.5.6: + resolution: {integrity: sha512-P1mzPEjgFMZLX0ZqfFht4fhV/FX8DTG7ERG1fBLiWvd34pTLVReS5CVsewKn9PApSgXnVfPWwvq+qUsRwpnwFA==} engines: {node: '>= 12'} hasBin: true dev: true diff --git a/src/components/widget/Editor.vue b/src/components/widget/Editor.vue index 7561b9f8..eaefb371 100644 --- a/src/components/widget/Editor.vue +++ b/src/components/widget/Editor.vue @@ -39,7 +39,7 @@ class UploadAdapter { try { const { data } = await uploadUserImage(file) return { - default: `${import.meta.env.VITE_API_BASE_URL}/image/${data.imagePath}`, + default: `${import.meta.env.VITE_API_BASE_URL}/files${data.imagePath}`, } } catch (e) { console.error(e) diff --git a/src/components/widget/Ideas/Filter.vue b/src/components/widget/Ideas/Filter.vue index dad161e5..35c610d7 100644 --- a/src/components/widget/Ideas/Filter.vue +++ b/src/components/widget/Ideas/Filter.vue @@ -6,11 +6,11 @@ :values="[ { title: t('commons.date', true), - value: 'date', + value: 'DATE', }, { title: t('commons.lastUpdate', true), - value: 'lastUpdate', + value: 'LAST_UPDATE', }, ]" /> diff --git a/src/composes/services/useFiles.js b/src/composes/services/useFiles.js index 5c0116e8..726c380a 100644 --- a/src/composes/services/useFiles.js +++ b/src/composes/services/useFiles.js @@ -6,13 +6,13 @@ export const useFiles = () => { const uploadUserPhoto = async (file) => { const data = new FormData() data.append('image', file, file.fileName) - return await request('photo/profile', { method: 'put', data }) + return await request('files/avatar', { method: 'put', data }) } const uploadUserImage = async (file) => { const data = new FormData() data.append('image', file, file.fileName) - return await request('image', { method: 'post', data }) + return await request('files/image', { method: 'post', data }) } return { uploadUserPhoto, uploadUserImage, ...rest } diff --git a/src/composes/services/useIdea.js b/src/composes/services/useIdea.js index 6c701f84..c71dbc75 100644 --- a/src/composes/services/useIdea.js +++ b/src/composes/services/useIdea.js @@ -13,32 +13,32 @@ export const useIdea = (id) => { const idea = ref({}) const publishedAgo = useTimeAgo(new Date(idea.value.lastUpdateDate)) const getIdea = async (uuid = id) => { - const { data } = await request(`idea/${uuid}`) + const { data } = await request(`ideas/${uuid}`) set(idea, data) return data } const pendingUsers = ref() const getPendingUsers = async (uuid = id) => { - const response = await request(`/idea/pending/${uuid}`) + const response = await request(`/ideas/pending/${uuid}`) pendingUsers.value = response.data return response } const statusPositions = ref([]) const getStatusPositions = async (uuid = id) => { - const { data } = await request(`/idea/${uuid}/statusPositions`) + const { data } = await request(`/ideas/${uuid}/statusPositions`) statusPositions.value = data return data } const joinToIdea = async (uuidIdea = id, uuidSpecialist) => { - await request(`/idea/join/${uuidIdea}/${uuidSpecialist}`, { + await request(`/ideas/join/${uuidIdea}/${uuidSpecialist}`, { method: 'put', }) } const changeStatusIdea = async (uuid = id, status) => { - await request(`/idea/${uuid}/status`, { + await request(`/ideas/${uuid}/status`, { method: 'PATCH', data: { status: status }, }) @@ -52,13 +52,13 @@ export const useIdea = (id) => { } const approveUser = async (uuidIdea = id, uuidSpecialisation, uuidUser) => { await request( - `/idea/approve/${uuidIdea}/${uuidSpecialisation}/${uuidUser}`, + `/ideas/approve/${uuidIdea}/${uuidSpecialisation}/${uuidUser}`, { method: 'PUT' }, ) } const deleteIdea = async (uuid = id) => { - await request(`/idea/${uuid}`, { + await request(`/ideas/${uuid}`, { method: 'DELETE', }) @@ -76,7 +76,7 @@ export const useIdea = (id) => { typeof data[key] === 'object' ? JSON.stringify(data[key]) : data[key], ) } - const response = await request(`/idea/`, { + const response = await request(`/ideas/`, { method: 'POST', data: formData, }) @@ -87,7 +87,7 @@ export const useIdea = (id) => { } const updateIdea = async (uuid, data) => { - await request(`/idea/${uuid}`, { + await request(`/ideas/${uuid}`, { method: 'PUT', data: data, }) diff --git a/src/composes/services/useIdeas.js b/src/composes/services/useIdeas.js index 9bd94c98..0b6f7311 100644 --- a/src/composes/services/useIdeas.js +++ b/src/composes/services/useIdeas.js @@ -6,7 +6,7 @@ export const useIdeas = () => { const idea = ref({}) const getIdea = async (uuid) => { - const response = await request(`idea/${uuid}`) + const response = await request(`ideas/${uuid}`) idea.value = response.data return response } @@ -18,7 +18,7 @@ export const useIdeas = () => { Object.keys(finalParams).forEach((param) => query.append(param, finalParams[param]), ) - const response = await request(`/idea/?${query}`, { method: 'get' }) + const response = await request(`/ideas/?${query}`, { method: 'get' }) ideas.value = response.data return response } @@ -26,7 +26,7 @@ export const useIdeas = () => { const userIdeas = ref([]) const getUserIdeas = async (UUID) => { userIdeas.value = [] - const response = await request(UUID ? `/idea/user/${UUID}` : '/idea/self') + const response = await request(UUID ? `/ideas/user/${UUID}` : '/ideas/self') userIdeas.value = response.data return response } diff --git a/src/composes/services/useModerator.js b/src/composes/services/useModerator.js index 2a1339ce..7de9e77d 100644 --- a/src/composes/services/useModerator.js +++ b/src/composes/services/useModerator.js @@ -6,17 +6,17 @@ const pendingIdeas = ref([]) export const useModeration = () => { const getPendingIdeas = async () => { - const data = await request('idea/moderator/waiting') + const data = await request('ideas/moderator/waiting') pendingIdeas.value = data.data } const approveIdea = async (uuid) => { - await request(`idea/moderator/submit/${uuid}`) + await request(`ideas/moderator/submit/${uuid}`) deleteIdeaFromRef(uuid) } const deleteIdea = async (uuid) => { - await request(`idea/moderator/delete/${uuid}`) + await request(`ideas/moderator/delete/${uuid}`) deleteIdeaFromRef(uuid) } diff --git a/src/composes/services/useNotifications.js b/src/composes/services/useNotifications.js index 65764fbf..63fbb9a9 100644 --- a/src/composes/services/useNotifications.js +++ b/src/composes/services/useNotifications.js @@ -8,13 +8,15 @@ export const useNotifications = () => { const { request, error, ...rest } = useApi() const getCountUnreadNotifications = async () => { - const response = await request(`/notification/unread`, { indicator: false }) + const response = await request(`/notifications/unread`, { + indicator: false, + }) countUnreadNotifications.value = response.data.count return countUnreadNotifications.value } const getNotifications = async (page) => { - const response = await request(`/notification?page=${page}`, { + const response = await request(`/notifications?page=${page}`, { indicator: false, }) notifications.value = notifications.value.concat( @@ -25,7 +27,9 @@ export const useNotifications = () => { } const confirmEmail = async (token) => { - const response = await request(`/notification/email/confirm?token=${token}`) + const response = await request( + `/notifications/email/confirm?token=${token}`, + ) if (error.value?.response?.status !== undefined) throw new Error("Can't confirm email") diff --git a/src/composes/services/useSkillManager.js b/src/composes/services/useSkillManager.js index 1439faba..a23cc59b 100644 --- a/src/composes/services/useSkillManager.js +++ b/src/composes/services/useSkillManager.js @@ -4,7 +4,7 @@ export const useSkillManager = () => { const { request, error, ...rest } = useApi() const updateLanguage = async (language, insert = true) => { - await request(`/skill/manager/language`, { + await request(`/skills/manager/language`, { indicator: false, method: insert ? 'patch' : 'delete', data: { @@ -14,7 +14,7 @@ export const useSkillManager = () => { } const updateSpecialist = async (specialist, insert = true) => { - await request(`/skill/manager/specialist`, { + await request(`/skills/manager/specialist`, { indicator: false, method: insert ? 'patch' : 'delete', data: { @@ -24,7 +24,7 @@ export const useSkillManager = () => { } const updateFramework = async (framework, insert = true) => { - await request(`/skill/manager/framework`, { + await request(`/skills/manager/framework`, { indicator: false, method: insert ? 'patch' : 'delete', data: { @@ -33,7 +33,7 @@ export const useSkillManager = () => { }) } const assignSpecialist = async (language, specialist, isAssign = true) => { - await request(`/skill/manager/tree/specialist`, { + await request(`/skills/manager/tree/specialist`, { indicator: false, method: isAssign ? 'patch' : 'delete', data: { @@ -49,7 +49,7 @@ export const useSkillManager = () => { framework, isAssign = true, ) => { - await request(`/skill/manager/tree/framework`, { + await request(`/skills/manager/tree/framework`, { indicator: false, method: isAssign ? 'patch' : 'delete', data: { @@ -61,7 +61,7 @@ export const useSkillManager = () => { } const getData = async () => { - return await request(`/skill/manager/data`, { + return await request(`/skills/manager/data`, { indicator: false, }) } diff --git a/src/composes/services/useSso.js b/src/composes/services/useSso.js index 32b64524..f8658da3 100644 --- a/src/composes/services/useSso.js +++ b/src/composes/services/useSso.js @@ -6,7 +6,7 @@ const ssoData = ref({}) export const useSso = () => { const getSsoData = async () => { - const response = await request('comment/sso') + const response = await request('comments/sso') ssoData.value = response.data return response.data } diff --git a/src/composes/services/useUser.js b/src/composes/services/useUser.js index 7531541a..a7eca191 100644 --- a/src/composes/services/useUser.js +++ b/src/composes/services/useUser.js @@ -16,7 +16,7 @@ export const useUser = () => { return rest } - const getUserProfileUrl = (uuid) => `${BASE_URL}/photo/profile/${uuid}` + const getUserProfileUrl = (uuid) => `${BASE_URL}/files/avatar/${uuid}` return { user, diff --git a/src/middlewares/getUser.js b/src/middlewares/getUser.js index 50c0d6dd..0d51b6b1 100644 --- a/src/middlewares/getUser.js +++ b/src/middlewares/getUser.js @@ -15,7 +15,7 @@ export default async () => { const { data: user } = await getUser() state.value.user = { ...user, - avatar: `${import.meta.env.VITE_API_BASE_URL}/photo/profile/${user.id}`, + avatar: `${import.meta.env.VITE_API_BASE_URL}/files/avatar/${user.id}`, } } catch (e) { state.value.user = {} diff --git a/src/pages/explore.vue b/src/pages/explore.vue index 1c0259f1..1d761d8e 100644 --- a/src/pages/explore.vue +++ b/src/pages/explore.vue @@ -69,7 +69,7 @@ export default defineComponent({ ) const page = filterQueryReactive('page', 1) - const sortBy = filterQueryReactive('sortBy', 'lastUpdate') + const sortBy = filterQueryReactive('sortBy', 'LAST_UPDATE') const specialists = filterQueryReactive('specialists') const languages = filterQueryReactive('languages') const filter = reactive({ page, specialists, languages, sortBy })