From fd2f4542e787170a59ce3af39bb055bf363d0347 Mon Sep 17 00:00:00 2001 From: Rijk van Zanten Date: Tue, 5 Mar 2024 08:22:31 -0500 Subject: [PATCH] Revert "Various Marketplace UI fixes & enhancements (#21691)" (#21692) This reverts commit 39a2e4af5a846ac2b446a4f64ec205d96e1c1458. --- app/package.json | 9 +- app/src/components/v-pagination.test.ts | 2 - app/src/components/v-pagination.vue | 35 +- app/src/directives/markdown.ts | 42 +-- app/src/lang/translations/en-US.yaml | 8 +- .../extensions/components/extension-item.vue | 47 +-- .../components/extension-list-item.vue | 31 +- .../marketplace/components/metadata-item.vue | 11 +- .../account/components/account-banner.vue | 12 +- .../account/components/account-metadata.vue | 6 +- .../extension/components/extension-banner.vue | 4 +- .../components/extension-install.vue | 4 +- .../components/extension-metadata-author.vue | 15 +- .../extension-metadata-compatibility.vue | 1 - .../components/extension-metadata-date.vue | 2 +- .../extension-metadata-downloads.vue | 2 +- .../components/extension-metadata-license.vue | 6 +- .../components/extension-metadata-size.vue | 8 +- .../components/extension-metadata-version.vue | 5 +- .../components/extension-metadata.vue | 3 - .../extension/components/extension-readme.vue | 45 +-- .../routes/extension/extension.vue | 2 +- .../registry/components/inline-filter.vue | 6 +- .../marketplace/routes/registry/registry.vue | 22 +- app/src/styles/_markdown.scss | 88 +---- app/src/styles/lib/_highlight.scss | 6 +- app/src/utils/md.ts | 113 +----- pnpm-lock.yaml | 324 +----------------- 28 files changed, 109 insertions(+), 750 deletions(-) diff --git a/app/package.json b/app/package.json index 69d8018e74..bfdd73965e 100644 --- a/app/package.json +++ b/app/package.json @@ -73,7 +73,6 @@ "@mapbox/mapbox-gl-draw": "1.4.3", "@mapbox/mapbox-gl-draw-static-mode": "1.0.1", "@mapbox/mapbox-gl-geocoder": "5.0.2", - "@mdit/plugin-tasklist": "0.8.0", "@ngneat/falso": "7.2.0", "@pinia/testing": "0.1.3", "@popperjs/core": "2.11.8", @@ -93,7 +92,6 @@ "@types/lodash": "4.14.202", "@types/mapbox__mapbox-gl-draw": "1.4.6", "@types/mapbox__mapbox-gl-geocoder": "4.7.7", - "@types/markdown-it": "13.0.7", "@types/qrcode": "1.5.5", "@types/semver": "7.5.8", "@types/wellknown": "0.5.8", @@ -121,7 +119,6 @@ "flatpickr": "4.6.13", "geojson": "0.5.0", "happy-dom": "13.6.2", - "highlight.js": "11.9.0", "histoire": "0.17.9", "html-entities": "2.5.0", "json-to-graphql-query": "2.2.5", @@ -129,11 +126,7 @@ "lodash": "4.17.21", "mapbox-gl": "1.13.3", "maplibre-gl": "1.15.3", - "markdown-it": "14.0.0", - "markdown-it-anchor": "8.6.7", - "markdown-it-emoji": "3.0.0", - "mdast-util-from-markdown": "2.0.0", - "mdast-util-to-string": "4.0.0", + "marked": "12.0.0", "micromustache": "8.0.3", "mime": "4.0.1", "mitt": "3.0.1", diff --git a/app/src/components/v-pagination.test.ts b/app/src/components/v-pagination.test.ts index 47d063d85c..668fc96c33 100644 --- a/app/src/components/v-pagination.test.ts +++ b/app/src/components/v-pagination.test.ts @@ -25,7 +25,6 @@ test('Mount component', () => { test('length prop', async () => { const wrapper = mount(VPagination, { props: { - modelValue: 1, length: 5, }, global, @@ -41,7 +40,6 @@ test('length prop', async () => { test('totalVisible prop', async () => { const wrapper = mount(VPagination, { props: { - modelValue: 1, length: 5, totalVisible: 3, }, diff --git a/app/src/components/v-pagination.vue b/app/src/components/v-pagination.vue index 490f937637..0af221c1ec 100644 --- a/app/src/components/v-pagination.vue +++ b/app/src/components/v-pagination.vue @@ -1,18 +1,35 @@ -