Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia
TypeScript apiapi-clientapi-restapi-testingdeveloper-toolsgraphqlhttphttp-clientpwarestrest-apispatestingtesting-toolstoolsvuevuejswebsocket
fix: language switching issue to en from slug (#3006)
Anwarul Islam4acc4b2dda6a
diff --git a/packages/hoppscotch-common/package.json b/packages/hoppscotch-common/package.jsonindex 23ba67e1a..d29eb1cab 100644--- a/packages/hoppscotch-common/package.json+++ b/packages/hoppscotch-common/package.json@@ -106,7 +106,7 @@"@graphql-codegen/urql-introspection": "^2.2.0","@graphql-typed-document-node/core": "^3.1.1","@iconify-json/lucide": "^1.1.40",- "@intlify/vite-plugin-vue-i18n": "^6.0.1",+ "@intlify/vite-plugin-vue-i18n": "^7.0.0","@rushstack/eslint-patch": "^1.1.4","@types/js-yaml": "^4.0.5","@types/lodash-es": "^4.17.6",diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.tsindex ee5f3e869..8e77b3d59 100644--- a/packages/hoppscotch-common/src/components.d.ts+++ b/packages/hoppscotch-common/src/components.d.ts@@ -73,25 +73,6 @@ declare module '@vue/runtime-core' {History: typeof import('./components/history/index.vue')['default']HistoryGraphqlCard: typeof import('./components/history/graphql/Card.vue')['default']HistoryRestCard: typeof import('./components/history/rest/Card.vue')['default']- 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']- 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']- HoppSmartWindow: typeof import('@hoppscotch/ui')['HoppSmartWindow']- HoppSmartWindows: typeof import('@hoppscotch/ui')['HoppSmartWindows']HttpAuthorization: typeof import('./components/http/Authorization.vue')['default']HttpAuthorizationApiKey: typeof import('./components/http/authorization/ApiKey.vue')['default']HttpAuthorizationBasic: typeof import('./components/http/authorization/Basic.vue')['default']@@ -117,18 +98,6 @@ 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']- IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['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']LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default']LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default']LensesRenderersHTMLLensRenderer: typeof import('./components/lenses/renderers/HTMLLensRenderer.vue')['default']diff --git a/packages/hoppscotch-common/src/modules/i18n.ts b/packages/hoppscotch-common/src/modules/i18n.tsindex 9a97a7253..9366b0be6 100644--- a/packages/hoppscotch-common/src/modules/i18n.ts+++ b/packages/hoppscotch-common/src/modules/i18n.ts@@ -7,7 +7,6 @@ import { HoppModule } from "."import languages from "../../languages.json"-import en from "../../locales/en.json"import { throwError } from "~/helpers/functional/error"import { getLocalConfig, setLocalConfig } from "~/newstore/localpersistence"@@ -123,11 +122,6 @@ export default <HoppModule>{fallbackLocale: "en",legacy: false,allowComposition: true,-- // TODO: Fix this to allow for dynamic imports- messages: {- en,- },})app.use(i18n)diff --git a/packages/hoppscotch-selfhost-web/package.json b/packages/hoppscotch-selfhost-web/package.jsonindex 0225af7f5..8b69b129c 100644--- a/packages/hoppscotch-selfhost-web/package.json+++ b/packages/hoppscotch-selfhost-web/package.json@@ -46,7 +46,7 @@"@graphql-codegen/typescript-urql-graphcache": "^2.3.1","@graphql-codegen/urql-introspection": "^2.2.0","@graphql-typed-document-node/core": "^3.1.1",- "@intlify/vite-plugin-vue-i18n": "^6.0.1",+ "@intlify/vite-plugin-vue-i18n": "^7.0.0","@rushstack/eslint-patch": "^1.1.4","@typescript-eslint/eslint-plugin": "^5.19.0","@typescript-eslint/parser": "^5.19.0",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 15c2e3a41..ad72a5399 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -612,8 +612,8 @@ importers:specifier: ^1.1.40version: 1.1.40'@intlify/vite-plugin-vue-i18n':- specifier: ^6.0.1- version: 6.0.1([email protected])([email protected])+ specifier: ^7.0.0+ version: 7.0.0([email protected])([email protected])'@rushstack/eslint-patch':specifier: ^1.1.4version: 1.1.4@@ -891,8 +891,8 @@ importers:specifier: ^3.1.1version: 3.1.1([email protected])'@intlify/vite-plugin-vue-i18n':- specifier: ^6.0.1- version: 6.0.1([email protected])([email protected])+ specifier: ^7.0.0+ version: 7.0.0([email protected])([email protected])'@rushstack/eslint-patch':specifier: ^1.1.4version: 1.1.4@@ -1203,7 +1203,7 @@ importers:version: 1.1.40'@intlify/vite-plugin-vue-i18n':specifier: ^6.0.1- version: 6.0.1([email protected])([email protected])+ version: 6.0.1([email protected])'@rushstack/eslint-patch':specifier: ^1.1.4version: 1.1.4@@ -1700,7 +1700,7 @@ packages:convert-source-map: 1.8.0debug: 4.3.4([email protected])gensync: 1.0.0-beta.2- json5: 2.2.1+ json5: 2.2.3semver: 6.3.0transitivePeerDependencies:- supports-color@@ -1729,7 +1729,7 @@ packages:resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==}engines: {node: '>=6.9.0'}dependencies:- '@babel/types': 7.18.7+ '@babel/types': 7.21.2dev: true/@babel/[email protected]:@@ -1831,14 +1831,14 @@ packages:resolution: {integrity: sha512-CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng==}engines: {node: '>=6.9.0'}dependencies:- '@babel/types': 7.18.7+ '@babel/types': 7.21.2dev: true/@babel/[email protected]:resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==}engines: {node: '>=6.9.0'}dependencies:- '@babel/types': 7.18.7+ '@babel/types': 7.21.2dev: true/@babel/[email protected]:@@ -1861,7 +1861,7 @@ packages:resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==}engines: {node: '>=6.9.0'}dependencies:- '@babel/types': 7.18.7+ '@babel/types': 7.21.2dev: true/@babel/[email protected]:@@ -1897,7 +1897,7 @@ packages:'@babel/helper-member-expression-to-functions': 7.18.6'@babel/helper-optimise-call-expression': 7.18.6'@babel/traverse': 7.18.6- '@babel/types': 7.18.7+ '@babel/types': 7.21.2transitivePeerDependencies:- supports-colordev: true@@ -1906,14 +1906,14 @@ packages:resolution: {integrity: sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==}engines: {node: '>=6.9.0'}dependencies:- '@babel/types': 7.18.7+ '@babel/types': 7.21.2dev: true/@babel/[email protected]:resolution: {integrity: sha512-4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw==}engines: {node: '>=6.9.0'}dependencies:- '@babel/types': 7.18.7+ '@babel/types': 7.21.2dev: true/@babel/[email protected]:@@ -2897,7 +2897,7 @@ packages:engines: {node: '>=6.9.0'}dependencies:'@babel/code-frame': 7.18.6- '@babel/parser': 7.18.6+ '@babel/parser': 7.21.2'@babel/types': 7.18.7dev: true@@ -5414,7 +5414,27 @@ packages:- supports-colordev: true- /@intlify/[email protected]([email protected]):+ /@intlify/[email protected]([email protected]):+ resolution: {integrity: sha512-2UQkqiSAOSPEHMGWlybqWm4G2K0X+FyYho5AwXz6QklSX1EY5EDmOSxZmwscn2qmKBnp6OYsme5kUrnN9xrWzQ==}+ engines: {node: '>= 12'}+ peerDependencies:+ petite-vue-i18n: '*'+ vue-i18n: '*'+ peerDependenciesMeta:+ petite-vue-i18n:+ optional: true+ vue-i18n:+ optional: true+ dependencies:+ '@intlify/message-compiler': 9.3.0-beta.17+ '@intlify/shared': 9.3.0-beta.17+ jsonc-eslint-parser: 1.4.1+ source-map: 0.6.1+ vue-i18n: 9.2.2([email protected])+ yaml-eslint-parser: 0.3.2+ dev: true++ /@intlify/[email protected]:resolution: {integrity: sha512-c8nTDgsTrBqVk3LPoF/YEarqeqcW0XAY5Y0UmFl5VKWKRNQh47jzvHRDmeRWhos5bUw1zIdiTixrs99FMJ9j5g==}engines: {node: '>= 14.16'}peerDependencies:@@ -5435,7 +5455,6 @@ packages:magic-string: 0.30.0mlly: 1.2.0source-map: 0.6.1- vue-i18n: 9.2.2([email protected])yaml-eslint-parser: 0.3.2dev: true@@ -5478,7 +5497,7 @@ packages:engines: {node: '>= 14'}dev: true+ /@intlify/[email protected]([email protected]):resolution: {integrity: sha512-FFVcxVU4bR9vdDLNbltM5mrhndnXMErO01i0RrpdyMegEt3Nu/YLoH0sFdjRun7/RY4vaEnhTnFvVf9uO0dQvg==}engines: {node: '>= 14.6'}peerDependencies:@@ -5493,12 +5512,39 @@ packages:vue-i18n:optional: truedependencies:- '@intlify/bundle-utils': 6.0.0([email protected])+ '@intlify/bundle-utils': 6.0.0'@intlify/shared': 9.3.0-beta.17'@rollup/pluginutils': 4.2.1debug: 4.3.4([email protected])fast-glob: 3.2.11source-map: 0.6.1+ transitivePeerDependencies:+ - supports-color+ dev: true++ resolution: {integrity: sha512-2TbDOQ8XD+vkc0s5OFmr+IY/k4mYMC7pzvx0xGQn+cU/ev314+yi7Z7N7rWcBgiYk1WOUalbGSo3d4nJDxOOyw==}+ engines: {node: '>= 14.6'}+ deprecated: This plugin support until Vite 3. If you would like to use on Vite 4, please use @intlify/unplugin-vue-i18n+ peerDependencies:+ petite-vue-i18n: '*'+ vite: ^2.9.0 || ^3.0.0+ vue-i18n: '*'+ peerDependenciesMeta:+ petite-vue-i18n:+ optional: true+ vite:+ optional: true+ vue-i18n:+ optional: true+ dependencies:+ '@intlify/bundle-utils': 3.4.0([email protected])+ '@intlify/shared': 9.3.0-beta.17+ '@rollup/pluginutils': 4.2.1+ debug: 4.3.4([email protected])+ fast-glob: 3.2.12+ source-map: 0.6.1vite: 3.1.4([email protected])([email protected])vue-i18n: 9.2.2([email protected])transitivePeerDependencies:@@ -7039,7 +7085,7 @@ packages:/@types/[email protected]:resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}dependencies:- '@babel/parser': 7.18.6+ '@babel/parser': 7.21.2'@babel/types': 7.18.7'@types/babel__generator': 7.6.4'@types/babel__template': 7.4.1@@ -7049,14 +7095,14 @@ packages:/@types/[email protected]:resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}dependencies:- '@babel/types': 7.18.7+ '@babel/types': 7.21.2dev: true/@types/[email protected]:resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}dependencies:- '@babel/parser': 7.18.6- '@babel/types': 7.18.7+ '@babel/parser': 7.21.2+ '@babel/types': 7.21.2dev: true/@types/[email protected]:@@ -8909,7 +8955,7 @@ packages:hasBin: true- resolution: {integrity: sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==}+ resolution: {integrity: sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=}dev: false@@ -9373,7 +9419,7 @@ packages:engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}dependencies:'@babel/template': 7.18.6- '@babel/types': 7.18.7+ '@babel/types': 7.21.2'@types/babel__core': 7.1.19'@types/babel__traverse': 7.17.1dev: true@@ -9383,7 +9429,7 @@ packages:engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}dependencies:'@babel/template': 7.18.6- '@babel/types': 7.18.7+ '@babel/types': 7.21.2'@types/babel__core': 7.1.19'@types/babel__traverse': 7.17.1dev: true@@ -9521,7 +9567,7 @@ packages:resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}- resolution: {integrity: sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==}+ resolution: {integrity: sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=}engines: {node: '>= 0.6.0'}dev: false@@ -10168,14 +10214,14 @@ packages:dev: true- resolution: {integrity: sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==}+ resolution: {integrity: sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=}dev: falseresolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==}- resolution: {integrity: sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==}+ resolution: {integrity: sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=}dev: false@@ -13346,7 +13392,7 @@ packages:dev: false- resolution: {integrity: sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==}+ resolution: {integrity: sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=}dev: false@@ -13739,7 +13785,7 @@ packages:engines: {node: '>=8'}- resolution: {integrity: sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==}+ resolution: {integrity: sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=}dev: false@@ -19440,7 +19486,7 @@ packages:dev: true- resolution: {integrity: sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==}+ resolution: {integrity: sha1-F+bBH3PdTz10zaek/zI46a2b+JA=}dev: false@@ -22002,7 +22048,7 @@ packages:dev: false- resolution: {integrity: sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==}+ resolution: {integrity: sha1-AI4G2AlDIMNy28L47XagymyKxBk=}dev: false