fix: issues with ui histoire building and modal not having close button

This commit is contained in:
Andrew Bastin
2023-02-24 14:35:42 +05:30
parent cae1840506
commit 90c8fbeee4
6 changed files with 211 additions and 598 deletions

View File

@@ -76,13 +76,21 @@ declare module '@vue/runtime-core' {
HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary'] HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary'] HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor'] HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete']
HoppSmartCheckbox: typeof import('@hoppscotch/ui')['HoppSmartCheckbox']
HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal'] 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'] HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink'] HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal'] HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
HoppSmartProgressRing: typeof import('@hoppscotch/ui')['HoppSmartProgressRing']
HoppSmartRadioGroup: typeof import('@hoppscotch/ui')['HoppSmartRadioGroup'] HoppSmartRadioGroup: typeof import('@hoppscotch/ui')['HoppSmartRadioGroup']
HoppSmartSlideOver: typeof import('@hoppscotch/ui')['HoppSmartSlideOver'] HoppSmartSlideOver: typeof import('@hoppscotch/ui')['HoppSmartSlideOver']
HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner'] 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'] HttpAuthorization: typeof import('./components/http/Authorization.vue')['default']
HttpBody: typeof import('./components/http/Body.vue')['default'] HttpBody: typeof import('./components/http/Body.vue')['default']
HttpBodyParameters: typeof import('./components/http/BodyParameters.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'] HttpTestResultReport: typeof import('./components/http/TestResultReport.vue')['default']
HttpTests: typeof import('./components/http/Tests.vue')['default'] HttpTests: typeof import('./components/http/Tests.vue')['default']
HttpURLEncodedParams: typeof import('./components/http/URLEncodedParams.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'] IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']
IconLucideGlobe: typeof import('~icons/lucide/globe')['default']
IconLucideInbox: typeof import('~icons/lucide/inbox')['default'] IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
IconLucideInfo: typeof import('~icons/lucide/info')['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'] IconLucideSearch: typeof import('~icons/lucide/search')['default']
IconLucideUser: typeof import('~icons/lucide/user')['default'] IconLucideUser: typeof import('~icons/lucide/user')['default']
IconLucideUsers: typeof import('~icons/lucide/users')['default'] IconLucideUsers: typeof import('~icons/lucide/users')['default']

View File

@@ -14,4 +14,7 @@ export default defineConfig({
}, },
setupFile: "histoire.setup.ts", setupFile: "histoire.setup.ts",
plugins: [HstVue()], plugins: [HstVue()],
viteIgnorePlugins: [
'vite:dts'
]
}) })

View File

@@ -68,7 +68,7 @@
"typescript": "^4.5.4", "typescript": "^4.5.4",
"unplugin-icons": "^0.15.3", "unplugin-icons": "^0.15.3",
"unplugin-vue-components": "^0.21.0", "unplugin-vue-components": "^0.21.0",
"vite": "^4.1.3", "vite": "^3.2.3",
"vite-plugin-checker": "^0.5.1", "vite-plugin-checker": "^0.5.1",
"vite-plugin-dts": "2.0.0-beta.3", "vite-plugin-dts": "2.0.0-beta.3",
"vite-plugin-fonts": "^0.6.0", "vite-plugin-fonts": "^0.6.0",
@@ -79,7 +79,9 @@
"vite-plugin-pwa": "^0.13.1", "vite-plugin-pwa": "^0.13.1",
"vite-plugin-vue-layouts": "^0.7.0", "vite-plugin-vue-layouts": "^0.7.0",
"vite-plugin-windicss": "^1.8.8", "vite-plugin-windicss": "^1.8.8",
"vue": "^3.2.25",
"vue-loader": "^16.8.3", "vue-loader": "^16.8.3",
"vue-router": "^4.0.16",
"vue-tsc": "^0.38.2", "vue-tsc": "^0.38.2",
"windicss": "^3.5.6" "windicss": "^3.5.6"
}, },

View File

@@ -45,7 +45,7 @@
<span class="flex items-center"> <span class="flex items-center">
<slot name="actions"></slot> <slot name="actions"></slot>
<kbd class="mr-2 shortcut-key">ESC</kbd> <kbd class="mr-2 shortcut-key">ESC</kbd>
<ButtonSecondary <HoppButtonSecondary
v-if="dimissible" v-if="dimissible"
v-tippy="{ theme: 'tooltip', delay: [500, 20] }" v-tippy="{ theme: 'tooltip', delay: [500, 20] }"
:title="closeText ?? t?.('action.close') ?? 'Close'" :title="closeText ?? t?.('action.close') ?? 'Close'"
@@ -92,6 +92,7 @@ const stack = (() => {
</script> </script>
<script setup lang="ts"> <script setup lang="ts">
import { HoppButtonSecondary } from "../button"
import IconX from "~icons/lucide/x" import IconX from "~icons/lucide/x"
import { import {
ref, ref,

View File

@@ -30,7 +30,7 @@
<div class="sticky right-0 flex items-center justify-center flex-shrink-0 overflow-x-auto z-8"> <div class="sticky right-0 flex items-center justify-center flex-shrink-0 overflow-x-auto z-8">
<slot name="actions"> <slot name="actions">
<span v-if="canAddNewTab" class="flex items-center justify-center px-2 py-1.5 bg-primaryLight z-8"> <span v-if="canAddNewTab" class="flex items-center justify-center px-2 py-1.5 bg-primaryLight z-8">
<ButtonSecondary v-tippy="{ theme: 'tooltip' }" :title="newText ?? t?.('action.new') ?? 'New'" <HoppButtonSecondary v-tippy="{ theme: 'tooltip' }" :title="newText ?? t?.('action.new') ?? 'New'"
:icon="IconPlus" class="rounded !p-1" filled @click="addTab" /> :icon="IconPlus" class="rounded !p-1" filled @click="addTab" />
</span> </span>
</slot> </slot>
@@ -52,7 +52,8 @@ import { pipe } from "fp-ts/function"
import { not } from "fp-ts/Predicate" import { not } from "fp-ts/Predicate"
import * as A from "fp-ts/Array" import * as A from "fp-ts/Array"
import * as O from "fp-ts/Option" import * as O from "fp-ts/Option"
import { ref, ComputedRef, computed, provide, inject, Slot } from "vue" import { ref, ComputedRef, computed, provide, inject } from "vue"
import type { Slot } from "vue"
import draggable from "vuedraggable-es" import draggable from "vuedraggable-es"
import { HoppUIPluginOptions, HOPP_UI_OPTIONS } from "./../../index" import { HoppUIPluginOptions, HOPP_UI_OPTIONS } from "./../../index"

781
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff