From 90c8fbeee4851b3a99ffc33e73d611695e374193 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Fri, 24 Feb 2023 14:35:42 +0530 Subject: [PATCH] fix: issues with ui histoire building and modal not having close button --- .../hoppscotch-common/src/components.d.ts | 13 + packages/hoppscotch-ui/histoire.config.ts | 3 + packages/hoppscotch-ui/package.json | 4 +- .../src/components/smart/Modal.vue | 3 +- .../src/components/smart/Windows.vue | 5 +- pnpm-lock.yaml | 781 +++++------------- 6 files changed, 211 insertions(+), 598 deletions(-) diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts index 72ac2df75..d456c35a0 100644 --- a/packages/hoppscotch-common/src/components.d.ts +++ b/packages/hoppscotch-common/src/components.d.ts @@ -76,13 +76,21 @@ declare module '@vue/runtime-core' { HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary'] HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary'] HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor'] + HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete'] + HoppSmartCheckbox: typeof import('@hoppscotch/ui')['HoppSmartCheckbox'] HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal'] + HoppSmartExpand: typeof import('@hoppscotch/ui')['HoppSmartExpand'] + HoppSmartFileChip: typeof import('@hoppscotch/ui')['HoppSmartFileChip'] + HoppSmartIntersection: typeof import('@hoppscotch/ui')['HoppSmartIntersection'] HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem'] HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink'] HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal'] + HoppSmartProgressRing: typeof import('@hoppscotch/ui')['HoppSmartProgressRing'] HoppSmartRadioGroup: typeof import('@hoppscotch/ui')['HoppSmartRadioGroup'] HoppSmartSlideOver: typeof import('@hoppscotch/ui')['HoppSmartSlideOver'] HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner'] + HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab'] + HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs'] HttpAuthorization: typeof import('./components/http/Authorization.vue')['default'] HttpBody: typeof import('./components/http/Body.vue')['default'] HttpBodyParameters: typeof import('./components/http/BodyParameters.vue')['default'] @@ -105,9 +113,14 @@ declare module '@vue/runtime-core' { HttpTestResultReport: typeof import('./components/http/TestResultReport.vue')['default'] HttpTests: typeof import('./components/http/Tests.vue')['default'] HttpURLEncodedParams: typeof import('./components/http/URLEncodedParams.vue')['default'] + IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'] + IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default'] IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default'] + IconLucideGlobe: typeof import('~icons/lucide/globe')['default'] IconLucideInbox: typeof import('~icons/lucide/inbox')['default'] IconLucideInfo: typeof import('~icons/lucide/info')['default'] + IconLucideLayers: typeof import('~icons/lucide/layers')['default'] + IconLucideMinus: typeof import('~icons/lucide/minus')['default'] IconLucideSearch: typeof import('~icons/lucide/search')['default'] IconLucideUser: typeof import('~icons/lucide/user')['default'] IconLucideUsers: typeof import('~icons/lucide/users')['default'] diff --git a/packages/hoppscotch-ui/histoire.config.ts b/packages/hoppscotch-ui/histoire.config.ts index 01ca4e3c6..5ba0ebc71 100644 --- a/packages/hoppscotch-ui/histoire.config.ts +++ b/packages/hoppscotch-ui/histoire.config.ts @@ -14,4 +14,7 @@ export default defineConfig({ }, setupFile: "histoire.setup.ts", plugins: [HstVue()], + viteIgnorePlugins: [ + 'vite:dts' + ] }) diff --git a/packages/hoppscotch-ui/package.json b/packages/hoppscotch-ui/package.json index be066920b..4a3c91c89 100644 --- a/packages/hoppscotch-ui/package.json +++ b/packages/hoppscotch-ui/package.json @@ -68,7 +68,7 @@ "typescript": "^4.5.4", "unplugin-icons": "^0.15.3", "unplugin-vue-components": "^0.21.0", - "vite": "^4.1.3", + "vite": "^3.2.3", "vite-plugin-checker": "^0.5.1", "vite-plugin-dts": "2.0.0-beta.3", "vite-plugin-fonts": "^0.6.0", @@ -79,7 +79,9 @@ "vite-plugin-pwa": "^0.13.1", "vite-plugin-vue-layouts": "^0.7.0", "vite-plugin-windicss": "^1.8.8", + "vue": "^3.2.25", "vue-loader": "^16.8.3", + "vue-router": "^4.0.16", "vue-tsc": "^0.38.2", "windicss": "^3.5.6" }, diff --git a/packages/hoppscotch-ui/src/components/smart/Modal.vue b/packages/hoppscotch-ui/src/components/smart/Modal.vue index 1400d0edd..12c5eef1f 100644 --- a/packages/hoppscotch-ui/src/components/smart/Modal.vue +++ b/packages/hoppscotch-ui/src/components/smart/Modal.vue @@ -45,7 +45,7 @@ ESC - {