btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: merge hoppscotch/release/2023.8.3 into hoppscotch/release/2023.12.0

Browse Source
This commit is contained in:
Andrew Bastin
2023-11-06 18:56:01 +05:30
parent 507fe69efe 4ebf850cb6
commit 93ce86f32d
20 changed files with 121 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/codemirror-lang-graphql/package.json
View File

@@ -17,8 +17,8 @@
"types": "dist/index.d.ts",
"sideEffects": false,
"dependencies": {
"@codemirror/language": "^6.9.1",
"@lezer/highlight": "^1.1.6",
"@codemirror/language": "^6.9.2",
"@lezer/highlight": "1.1.4",
"@lezer/lr": "^1.3.13"
},
"devDependencies": {

2
packages/hoppscotch-backend/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "hoppscotch-backend",
"version": "2023.8.2",
"version": "2023.8.3",
"description": "",
"author": "",
"private": true,

2
packages/hoppscotch-backend/src/admin/admin.service.ts
View File

@@ -74,7 +74,7 @@ export class AdminService {
try {
await this.mailerService.sendUserInvitationEmail(inviteeEmail, {
template: 'code-your-own',
template: 'user-invitation',
variables: {
inviteeEmail: inviteeEmail,
magicLink: `${process.env.VITE_BASE_URL}`,

2
packages/hoppscotch-backend/src/auth/auth.service.ts
View File

@@ -229,7 +229,7 @@ export class AuthService {
}
await this.mailerService.sendEmail(email, {
template: 'code-your-own',
template: 'user-invitation',
variables: {
inviteeEmail: email,
magicLink: `${url}/enter?token=${generatedTokens.token}`,

4
packages/hoppscotch-backend/src/mailer/MailDescriptions.ts
View File

@@ -8,7 +8,7 @@ export type MailDescription = {
};
export type UserMagicLinkMailDescription = {
template: 'code-your-own';
template: 'user-invitation';
variables: {
inviteeEmail: string;
magicLink: string;
@@ -16,7 +16,7 @@ export type UserMagicLinkMailDescription = {
};
export type AdminUserInvitationMailDescription = {
template: 'code-your-own';
template: 'user-invitation';
variables: {
inviteeEmail: string;
magicLink: string;

2
packages/hoppscotch-backend/src/mailer/mailer.service.ts
View File

@@ -27,7 +27,7 @@ export class MailerService {
case 'team-invitation':
return `${mailDesc.variables.invitee} invited you to join ${mailDesc.variables.invite_team_name} in Hoppscotch`;
case 'code-your-own':
case 'user-invitation':
return 'Sign in to Hoppscotch';
}
}

0
packages/hoppscotch-backend/src/mailer/templates/code-your-own.hbs → packages/hoppscotch-backend/src/mailer/templates/user-invitation.hbs
View File

8
packages/hoppscotch-common/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@hoppscotch/common",
"private": true,
"version": "2023.8.2",
"version": "2023.8.3",
"scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*",
"test": "vitest --run",
@@ -27,12 +27,12 @@
"@codemirror/lang-javascript": "^6.2.1",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-xml": "^6.0.2",
"@codemirror/language": "^6.9.1",
"@codemirror/language": "^6.9.2",
"@codemirror/legacy-modes": "^6.3.3",
"@codemirror/lint": "^6.4.2",
"@codemirror/search": "^6.5.4",
"@codemirror/state": "^6.3.1",
"@codemirror/view": "^6.21.3",
"@codemirror/view": "^6.22.0",
"@fontsource-variable/inter": "^5.0.8",
"@fontsource-variable/material-symbols-rounded": "^5.0.7",
"@fontsource-variable/roboto-mono": "^5.0.9",
@@ -41,7 +41,7 @@
"@hoppscotch/js-sandbox": "workspace:^",
"@hoppscotch/ui": "workspace:^",
"@hoppscotch/vue-toasted": "^0.1.0",
"@lezer/highlight": "^1.1.6",
"@lezer/highlight": "1.1.4",
"@urql/core": "^4.1.1",
"@urql/devtools": "^2.0.3",
"@urql/exchange-auth": "^2.1.6",

9
packages/hoppscotch-common/src/components/collections/index.vue
View File

@@ -18,13 +18,12 @@
"
>
<WorkspaceCurrent :section="t('tab.collections')" />
<HoppSmartInput
<input
v-model="filterTexts"
:placeholder="t('action.search')"
input-styles="py-2 pl-4 pr-2 bg-transparent !border-0"
type="search"
:autofocus="false"
autocomplete="off"
class="flex h-8 w-full bg-transparent p-4 py-2"
:placeholder="t('action.search')"
:disabled="collectionsType.type === 'team-collections'"
/>
</div>

2
packages/hoppscotch-common/src/components/environments/Selector.vue
View File

@@ -66,7 +66,7 @@
/>
<HoppSmartTabs
v-model="selectedEnvTab"
:styles="`sticky overflow-x-auto my-2 border border-divider rounded flex-shrink-0 z-0 top-0 bg-primary ${
:styles="`sticky overflow-x-auto my-2 border border-divider rounded flex-shrink-0 z-10 top-0 bg-primary ${
!isTeamSelected || workspace.type === 'personal'
? 'bg-primaryLight'
: ''

2
packages/hoppscotch-common/src/components/graphql/Sidebar.vue
View File

@@ -30,8 +30,8 @@
v-model="graphqlFieldsFilterText"
type="search"
autocomplete="off"
class="flex h-8 w-full bg-transparent p-4 py-2"
:placeholder="`${t('action.search')}`"
class="flex flex-1 bg-transparent p-4 py-2"
/>
<div class="flex">
<HoppButtonSecondary

2
packages/hoppscotch-common/src/components/history/index.vue
View File

@@ -9,7 +9,7 @@
v-model="filterText"
type="search"
autocomplete="off"
class="flex flex-1 bg-transparent p-4 py-2"
class="flex h-8 w-full bg-transparent p-4 py-2"
:placeholder="`${t('action.search')}`"
/>
<div class="flex">

4
packages/hoppscotch-common/src/components/http/Headers.vue
View File

@@ -256,7 +256,7 @@ import * as E from "fp-ts/Either"
import * as O from "fp-ts/Option"
import * as A from "fp-ts/Array"
import draggable from "vuedraggable-es"
import { RequestOptionTabs } from "./RequestOptions.vue"
import { RESTOptionTabs } from "./RequestOptions.vue"
import { useCodemirror } from "@composables/codemirror"
import { commonHeaders } from "~/helpers/headers"
import { useI18n } from "@composables/i18n"
@@ -295,7 +295,7 @@ const deletionToast = ref<{ goAway: (delay: number) => void } | null>(null)
const props = defineProps<{ modelValue: HoppRESTRequest }>()
const emit = defineEmits<{
(e: "change-tab", value: RequestOptionTabs): void
(e: "change-tab", value: RESTOptionTabs): void
(e: "update:modelValue", value: HoppRESTRequest): void
}>()

4
packages/hoppscotch-common/src/components/teams/Edit.vue
View File

@@ -35,12 +35,12 @@
v-if="
!teamDetails.loading &&
E.isRight(teamDetails.data) &&
teamDetails.data.right.team.teamMembers
teamDetails.data.right.team?.teamMembers
"
class="rounded border border-divider"
>
<HoppSmartPlaceholder
v-if="teamDetails.data.right.team.teamMembers === 0"
v-if="teamDetails.data.right.team.teamMembers.length === 0"
:src="`/images/states/${colorMode.value}/add_group.svg`"
:alt="`${t('empty.members')}`"
:text="t('empty.members')"

4
packages/hoppscotch-common/src/components/teams/Invite.vue
View File

@@ -88,7 +88,7 @@
>
<div
v-for="(invitee, index) in pendingInvites.data.right.team
.teamInvitations"
?.teamInvitations"
:key="`invitee-${index}`"
class="flex divide-x divide-dividerLight"
>
@@ -122,7 +122,7 @@
<HoppSmartPlaceholder
v-if="
E.isRight(pendingInvites.data) &&
pendingInvites.data.right.team.teamInvitations.length === 0
pendingInvites.data.right.team?.teamInvitations.length === 0
"
:text="t('empty.pending_invites')"
>

4
packages/hoppscotch-common/src/helpers/actions.ts
View File

@@ -6,7 +6,7 @@ import { Ref, onBeforeUnmount, onMounted, reactive, watch } from "vue"
import { BehaviorSubject } from "rxjs"
import { HoppRESTDocument } from "./rest/document"
import { HoppGQLRequest, HoppRESTRequest } from "@hoppscotch/data"
import { RequestOptionTabs } from "~/components/http/RequestOptions.vue"
import { RESTOptionTabs } from "~/components/http/RequestOptions.vue"
import { HoppGQLSaveContext } from "./graphql/document"
import { GQLOptionTabs } from "~/components/graphql/RequestOptions.vue"
import { computed } from "vue"
@@ -113,7 +113,7 @@ type HoppActionArgsMap = {
request: HoppGQLRequest
}
"request.open-tab": {
tab: RequestOptionTabs | GQLOptionTabs
tab: RESTOptionTabs | GQLOptionTabs
}
"tab.duplicate-tab": {

2
packages/hoppscotch-selfhost-web/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@hoppscotch/selfhost-web",
"private": true,
"version": "2023.8.2",
"version": "2023.8.3",
"type": "module",
"scripts": {
"dev:vite": "vite",

2
packages/hoppscotch-sh-admin/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "hoppscotch-sh-admin",
"private": true,
"version": "2023.8.2",
"version": "2023.8.3",
"type": "module",
"scripts": {
"dev": "pnpm exec npm-run-all -p -l dev:*",

76
pnpm-lock.yaml generated
View File

@@ -35,11 +35,11 @@ importers:
packages/codemirror-lang-graphql:
dependencies:
'@codemirror/language':
specifier: ^6.9.1
specifier: ^6.9.2
version: 6.9.2
'@lezer/highlight':
specifier: ^1.1.6
version: 1.1.6
specifier: 1.1.4
version: 1.1.4
'@lezer/lr':
specifier: ^1.3.13
version: 1.3.13
@@ -372,7 +372,7 @@ importers:
version: 10.1.0(openapi-types@12.1.3)
'@codemirror/autocomplete':
specifier: ^6.10.2
version: 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.1.0)
version: 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.1.0)
'@codemirror/commands':
specifier: ^6.3.0
version: 6.3.0
@@ -384,9 +384,9 @@ importers:
version: 6.0.1
'@codemirror/lang-xml':
specifier: ^6.0.2
version: 6.0.2(@codemirror/view@6.21.4)
version: 6.0.2(@codemirror/view@6.22.0)
'@codemirror/language':
specifier: ^6.9.1
specifier: ^6.9.2
version: 6.9.2
'@codemirror/legacy-modes':
specifier: ^6.3.3
@@ -401,8 +401,8 @@ importers:
specifier: ^6.3.1
version: 6.3.1
'@codemirror/view':
specifier: ^6.21.3
version: 6.21.4
specifier: ^6.22.0
version: 6.22.0
'@fontsource-variable/inter':
specifier: ^5.0.8
version: 5.0.8
@@ -428,8 +428,8 @@ importers:
specifier: ^0.1.0
version: 0.1.0(vue@3.3.4)
'@lezer/highlight':
specifier: ^1.1.6
version: 1.1.6
specifier: 1.1.4
version: 1.1.4
'@urql/core':
specifier: ^4.1.1
version: 4.1.1(graphql@16.8.0)
@@ -4253,7 +4253,7 @@ packages:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
dev: true
/@codemirror/autocomplete@6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.0.3):
/@codemirror/autocomplete@6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.0.3):
resolution: {integrity: sha512-3dCL7b0j2GdtZzWN5j7HDpRAJ26ip07R4NGYz7QYthIYMiX8I4E4TNrYcdTayPJGeVQtd/xe7lWU4XL7THFb/w==}
peerDependencies:
'@codemirror/language': ^6.0.0
@@ -4263,11 +4263,11 @@ packages:
dependencies:
'@codemirror/language': 6.9.2
'@codemirror/state': 6.3.1
'@codemirror/view': 6.21.4
'@codemirror/view': 6.22.0
'@lezer/common': 1.0.3
dev: false
/@codemirror/autocomplete@6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.1.0):
/@codemirror/autocomplete@6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.1.0):
resolution: {integrity: sha512-3dCL7b0j2GdtZzWN5j7HDpRAJ26ip07R4NGYz7QYthIYMiX8I4E4TNrYcdTayPJGeVQtd/xe7lWU4XL7THFb/w==}
peerDependencies:
'@codemirror/language': ^6.0.0
@@ -4277,7 +4277,7 @@ packages:
dependencies:
'@codemirror/language': 6.9.2
'@codemirror/state': 6.3.1
'@codemirror/view': 6.21.4
'@codemirror/view': 6.22.0
'@lezer/common': 1.1.0
dev: false
@@ -4286,17 +4286,17 @@ packages:
dependencies:
'@codemirror/language': 6.9.2
'@codemirror/state': 6.3.1
'@codemirror/view': 6.21.4
'@codemirror/view': 6.22.0
'@lezer/common': 1.1.0
/@codemirror/lang-javascript@6.2.1:
resolution: {integrity: sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==}
dependencies:
'@codemirror/autocomplete': 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.1.0)
'@codemirror/autocomplete': 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.1.0)
'@codemirror/language': 6.9.2
'@codemirror/lint': 6.4.2
'@codemirror/state': 6.3.1
'@codemirror/view': 6.21.4
'@codemirror/view': 6.22.0
'@lezer/common': 1.1.0
'@lezer/javascript': 1.4.5
dev: false
@@ -4307,10 +4307,10 @@ packages:
'@codemirror/language': 6.9.2
'@lezer/json': 1.0.1
/@codemirror/lang-xml@6.0.2(@codemirror/view@6.21.4):
/@codemirror/lang-xml@6.0.2(@codemirror/view@6.22.0):
resolution: {integrity: sha512-JQYZjHL2LAfpiZI2/qZ/qzDuSqmGKMwyApYmEUUCTxLM4MWS7sATUEfIguZQr9Zjx/7gcdnewb039smF6nC2zw==}
dependencies:
'@codemirror/autocomplete': 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.21.4)(@lezer/common@1.0.3)
'@codemirror/autocomplete': 6.10.2(@codemirror/language@6.9.2)(@codemirror/state@6.3.1)(@codemirror/view@6.22.0)(@lezer/common@1.0.3)
'@codemirror/language': 6.9.2
'@codemirror/state': 6.3.1
'@lezer/common': 1.0.3
@@ -4323,11 +4323,11 @@ packages:
resolution: {integrity: sha512-QGTQXSpAKDIzaSE96zNK1UfIUhPgkT1CLjh1N5qVzZuxgsEOhz5RqaN8QCIdyOQklGLx3MgHd9YrE3X3+Pl1ow==}
dependencies:
'@codemirror/state': 6.3.1
'@codemirror/view': 6.21.4
'@codemirror/view': 6.22.0
'@lezer/common': 1.1.0
'@lezer/highlight': 1.1.6
'@lezer/highlight': 1.1.4
'@lezer/lr': 1.3.13
style-mod: 4.0.3
style-mod: 4.1.0
/@codemirror/legacy-modes@6.3.3:
resolution: {integrity: sha512-X0Z48odJ0KIoh/HY8Ltz75/4tDYc9msQf1E/2trlxFaFFhgjpVHjZ/BCXe1Lk7s4Gd67LL/CeEEHNI+xHOiESg==}
@@ -4339,14 +4339,14 @@ packages:
resolution: {integrity: sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==}
dependencies:
'@codemirror/state': 6.3.1
'@codemirror/view': 6.21.4
'@codemirror/view': 6.22.0
crelt: 1.0.6
/@codemirror/search@6.5.4:
resolution: {integrity: sha512-YoTrvjv9e8EbPs58opjZKyJ3ewFrVSUzQ/4WXlULQLSDDr1nGPJ67mMXFNNVYwdFhybzhrzrtqgHmtpJwIF+8g==}
dependencies:
'@codemirror/state': 6.3.1
'@codemirror/view': 6.21.4
'@codemirror/view': 6.22.0
crelt: 1.0.6
dev: false
@@ -4358,12 +4358,12 @@ packages:
dependencies:
'@codemirror/language': 6.9.2
'@codemirror/state': 6.3.1
'@codemirror/view': 6.21.4
'@lezer/highlight': 1.1.6
'@codemirror/view': 6.22.0
'@lezer/highlight': 1.1.4
dev: true
/@codemirror/view@6.21.4:
resolution: {integrity: sha512-WKVZ7nvN0lwWPfAf05WxWqTpwjC8YN3q5goj3CsSig7//DD81LULgOx3nBegqpqP0iygBqRmW8z0KSc2QTAdAg==}
/@codemirror/view@6.22.0:
resolution: {integrity: sha512-6zLj4YIoIpfTGKrDMTbeZRpa8ih4EymMCKmddEDcJWrCdp/N1D46B38YEz4creTb4T177AVS9EyXkLeC/HL2jA==}
dependencies:
'@codemirror/state': 6.3.1
style-mod: 4.1.0
@@ -7734,7 +7734,7 @@ packages:
'@codemirror/lint': 6.4.2
'@codemirror/state': 6.3.1
'@codemirror/theme-one-dark': 6.1.0
'@codemirror/view': 6.21.4
'@codemirror/view': 6.22.0
'@histoire/vendors': 0.12.4
dev: true
@@ -8924,9 +8924,6 @@ packages:
resolution: {integrity: sha512-JH4wAXCgUOcCGNekQPLhVeUtIqjH0yPBs7vvUdSjyQama9618IOKFJwkv2kcqdhF0my8hQEgCTEJU0GIgnahvA==}
dev: false
/@lezer/common@1.0.4:
resolution: {integrity: sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg==}
/@lezer/common@1.1.0:
resolution: {integrity: sha512-XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw==}
@@ -8938,22 +8935,22 @@ packages:
'@lezer/lr': 1.3.13
dev: true
/@lezer/highlight@1.1.6:
resolution: {integrity: sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==}
/@lezer/highlight@1.1.4:
resolution: {integrity: sha512-IECkFmw2l7sFcYXrV8iT9GeY4W0fU4CxX0WMwhmhMIVjoDdD1Hr6q3G2NqVtLg/yVe5n7i4menG3tJ2r4eCrPQ==}
dependencies:
'@lezer/common': 1.0.4
'@lezer/common': 1.1.0
/@lezer/javascript@1.4.5:
resolution: {integrity: sha512-FmBUHz8K1V22DgjTd6SrIG9owbzOYZ1t3rY6vGEmw+e2RVBd7sqjM8uXEVRFmfxKFn1Mx2ABJehHjrN3G2ZpmA==}
dependencies:
'@lezer/highlight': 1.1.6
'@lezer/highlight': 1.1.4
'@lezer/lr': 1.3.13
dev: false
/@lezer/json@1.0.1:
resolution: {integrity: sha512-nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw==}
dependencies:
'@lezer/highlight': 1.1.6
'@lezer/highlight': 1.1.4
'@lezer/lr': 1.3.13
/@lezer/lr@1.3.13:
@@ -8964,7 +8961,7 @@ packages:
/@lezer/xml@1.0.2:
resolution: {integrity: sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==}
dependencies:
'@lezer/highlight': 1.1.6
'@lezer/highlight': 1.1.4
'@lezer/lr': 1.3.13
dev: false
@@ -23920,9 +23917,6 @@ packages:
pick-util: 1.1.5
dev: false
/style-mod@4.0.3:
resolution: {integrity: sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw==}
/style-mod@4.1.0:
resolution: {integrity: sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==}