diff --git a/packages/hoppscotch-cli/package.json b/packages/hoppscotch-cli/package.json index ed292d111..44708c3f0 100644 --- a/packages/hoppscotch-cli/package.json +++ b/packages/hoppscotch-cli/package.json @@ -54,7 +54,7 @@ "io-ts": "^2.2.16", "jest": "^27.5.1", "lodash": "^4.17.21", - "prettier": "^2.6.2", + "prettier": "^2.8.4", "qs": "^6.10.3", "ts-jest": "^27.1.4", "tsup": "^5.12.7", diff --git a/packages/hoppscotch-common/package.json b/packages/hoppscotch-common/package.json index 8c8a8e775..34c92fb88 100644 --- a/packages/hoppscotch-common/package.json +++ b/packages/hoppscotch-common/package.json @@ -126,7 +126,7 @@ "@vue/runtime-core": "^3.2.39", "cross-env": "^7.0.3", "eslint": "^8.24.0", - "eslint-plugin-prettier": "^4.2.0", + "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-vue": "^9.5.1", "npm-run-all": "^4.1.5", "openapi-types": "^12.0.0", diff --git a/packages/hoppscotch-common/src/components/app/Interceptor.vue b/packages/hoppscotch-common/src/components/app/Interceptor.vue index 617d82392..0bc4755e2 100644 --- a/packages/hoppscotch-common/src/components/app/Interceptor.vue +++ b/packages/hoppscotch-common/src/components/app/Interceptor.vue @@ -69,7 +69,7 @@ const interceptors = computed(() => [ }, ]) -type InterceptorMode = typeof interceptors["value"][number]["value"] +type InterceptorMode = (typeof interceptors)["value"][number]["value"] const interceptorSelection = computed({ get() { diff --git a/packages/hoppscotch-common/src/components/history/index.vue b/packages/hoppscotch-common/src/components/history/index.vue index 43f40e33a..1ed45eeb2 100644 --- a/packages/hoppscotch-common/src/components/history/index.vue +++ b/packages/hoppscotch-common/src/components/history/index.vue @@ -284,7 +284,7 @@ const filters = computed(() => [ { value: "STARRED" as const, label: t("filter.starred") }, ]) -type FilterMode = typeof filters["value"][number]["value"] +type FilterMode = (typeof filters)["value"][number]["value"] const filterSelection = ref("ALL") @@ -293,7 +293,7 @@ const groups = computed(() => [ { value: "URL" as const, label: t("group.url") }, ]) -type GroupMode = typeof groups["value"][number]["value"] +type GroupMode = (typeof groups)["value"][number]["value"] const groupSelection = ref("TIME") diff --git a/packages/hoppscotch-common/src/components/realtime/Subscription.vue b/packages/hoppscotch-common/src/components/realtime/Subscription.vue index 4225146b0..300e94679 100644 --- a/packages/hoppscotch-common/src/components/realtime/Subscription.vue +++ b/packages/hoppscotch-common/src/components/realtime/Subscription.vue @@ -112,7 +112,7 @@ const emit = defineEmits<{ (e: "submit", body: MQTTTopic): void }>() -const QoS = ref(2) +const QoS = ref<(typeof QOS_VALUES)[number]>(2) const name = ref("") const color = ref("#f58290") diff --git a/packages/hoppscotch-common/src/helpers/new-codegen/index.ts b/packages/hoppscotch-common/src/helpers/new-codegen/index.ts index c1dbf8e8a..74304ec4c 100644 --- a/packages/hoppscotch-common/src/helpers/new-codegen/index.ts +++ b/packages/hoppscotch-common/src/helpers/new-codegen/index.ts @@ -185,7 +185,7 @@ export const CodegenDefinitions = [ /** * A type which defines all the valid code generators */ -export type CodegenName = typeof CodegenDefinitions[number]["name"] +export type CodegenName = (typeof CodegenDefinitions)[number]["name"] /** * Generates Source Code for the given codgen diff --git a/packages/hoppscotch-common/src/newstore/settings.ts b/packages/hoppscotch-common/src/newstore/settings.ts index 357e8e18c..c3dfd33d4 100644 --- a/packages/hoppscotch-common/src/newstore/settings.ts +++ b/packages/hoppscotch-common/src/newstore/settings.ts @@ -7,7 +7,7 @@ import type { KeysMatching } from "~/types/ts-utils" export const HoppBgColors = ["system", "light", "dark", "black"] as const -export type HoppBgColor = typeof HoppBgColors[number] +export type HoppBgColor = (typeof HoppBgColors)[number] export const HoppAccentColors = [ "green", @@ -21,11 +21,11 @@ export const HoppAccentColors = [ "pink", ] as const -export type HoppAccentColor = typeof HoppAccentColors[number] +export type HoppAccentColor = (typeof HoppAccentColors)[number] export const HoppFontSizes = ["small", "medium", "large"] as const -export type HoppFontSize = typeof HoppFontSizes[number] +export type HoppFontSize = (typeof HoppFontSizes)[number] export type SettingsType = { syncCollections: boolean diff --git a/packages/hoppscotch-common/src/pages/realtime.vue b/packages/hoppscotch-common/src/pages/realtime.vue index 4e4df1031..bd56ace7a 100644 --- a/packages/hoppscotch-common/src/pages/realtime.vue +++ b/packages/hoppscotch-common/src/pages/realtime.vue @@ -44,7 +44,7 @@ const REALTIME_NAVIGATION = [ }, ] as const -type RealtimeNavTab = typeof REALTIME_NAVIGATION[number]["target"] +type RealtimeNavTab = (typeof REALTIME_NAVIGATION)[number]["target"] const currentTab = ref("websocket") diff --git a/packages/hoppscotch-js-sandbox/package.json b/packages/hoppscotch-js-sandbox/package.json index 2041bf0a7..73b7caf8c 100644 --- a/packages/hoppscotch-js-sandbox/package.json +++ b/packages/hoppscotch-js-sandbox/package.json @@ -55,11 +55,11 @@ "@typescript-eslint/eslint-plugin": "^5.19.0", "@typescript-eslint/parser": "^5.19.0", "eslint": "^8.13.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-prettier": "^4.0.0", + "eslint-config-prettier": "^8.6.0", + "eslint-plugin-prettier": "^4.2.1", "io-ts": "^2.2.16", "jest": "^27.5.1", - "prettier": "^2.6.2", + "prettier": "^2.8.4", "ts-jest": "^27.1.4", "typescript": "^4.6.3" } diff --git a/packages/hoppscotch-ui/package.json b/packages/hoppscotch-ui/package.json index 46953b1e7..66dd846f1 100644 --- a/packages/hoppscotch-ui/package.json +++ b/packages/hoppscotch-ui/package.json @@ -53,7 +53,7 @@ "@vue/runtime-core": "^3.2.39", "cross-env": "^7.0.3", "eslint": "^8.24.0", - "eslint-plugin-prettier": "^4.2.0", + "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-vue": "^9.5.1", "histoire": "^0.12.4", "npm-run-all": "^4.1.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9798c59d4..5f5c64179 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -62,7 +62,7 @@ importers: io-ts: ^2.2.16 jest: ^27.5.1 lodash: ^4.17.21 - prettier: ^2.6.2 + prettier: ^2.8.4 qs: ^6.10.3 ts-jest: ^27.1.4 tsup: ^5.12.7 @@ -86,7 +86,7 @@ importers: io-ts: 2.2.16_fp-ts@2.12.1 jest: 27.5.1 lodash: 4.17.21 - prettier: 2.7.1 + prettier: 2.8.4 qs: 6.11.0 ts-jest: 27.1.5_mqaoisgizytgigbr3gbjwvnjie tsup: 5.12.9_liswqajbmjp6gyfdb6pun2kq5i @@ -154,7 +154,7 @@ importers: buffer: ^6.0.3 cross-env: ^7.0.3 eslint: ^8.24.0 - eslint-plugin-prettier: ^4.2.0 + eslint-plugin-prettier: ^4.2.1 eslint-plugin-vue: ^9.5.1 esprima: ^4.0.1 events: ^3.3.0 @@ -345,7 +345,7 @@ importers: vite-plugin-inspect: 0.7.4_vite@3.1.4 vite-plugin-pages: 0.26.0_vnheu5mvzzbfbuhqo4shkhdhei vite-plugin-pages-sitemap: 1.4.0 - vite-plugin-pwa: 0.13.1_vite@3.1.4 + vite-plugin-pwa: 0.13.1_bg4cnt4dy3xq3a47wkujd6ryzq vite-plugin-vue-layouts: 0.7.0_oewzdqozxqnqgsrjzmwikx34vi vite-plugin-windicss: 1.8.8_vite@3.1.4 vue-tsc: 0.38.2_typescript@4.7.4 @@ -381,13 +381,13 @@ importers: '@typescript-eslint/eslint-plugin': ^5.19.0 '@typescript-eslint/parser': ^5.19.0 eslint: ^8.13.0 - eslint-config-prettier: ^8.5.0 - eslint-plugin-prettier: ^4.0.0 + eslint-config-prettier: ^8.6.0 + eslint-plugin-prettier: ^4.2.1 fp-ts: ^2.11.10 io-ts: ^2.2.16 jest: ^27.5.1 lodash: ^4.17.21 - prettier: ^2.6.2 + prettier: ^2.8.4 quickjs-emscripten: ^0.15.0 ts-jest: ^27.1.4 tsup: ^5.12.5 @@ -407,11 +407,11 @@ importers: '@typescript-eslint/eslint-plugin': 5.30.6_2vt5mtrqleafs33qg2bhpmbaqm '@typescript-eslint/parser': 5.30.6_4x5o4skxv6sl53vpwefgt23khm eslint: 8.19.0 - eslint-config-prettier: 8.5.0_eslint@8.19.0 - eslint-plugin-prettier: 4.2.1_7uxdfn2xinezdgvmbammh6ev5i + eslint-config-prettier: 8.6.0_eslint@8.19.0 + eslint-plugin-prettier: 4.2.1_ynq7nynyjfwcw5rz6ihwbkdyyy io-ts: 2.2.16_fp-ts@2.12.1 jest: 27.5.1 - prettier: 2.7.1 + prettier: 2.8.4 ts-jest: 27.1.5_mqaoisgizytgigbr3gbjwvnjie typescript: 4.7.4 @@ -439,7 +439,7 @@ importers: acorn-walk: ^8.2.0 cross-env: ^7.0.3 eslint: ^8.24.0 - eslint-plugin-prettier: ^4.2.0 + eslint-plugin-prettier: ^4.2.1 eslint-plugin-vue: ^9.5.1 esprima: ^4.0.1 events: ^3.3.0 @@ -614,7 +614,7 @@ importers: vite-plugin-inspect: 0.7.4_vite@3.2.4 vite-plugin-pages: 0.26.0_vite@3.2.4 vite-plugin-pages-sitemap: 1.4.0 - vite-plugin-pwa: 0.13.1_vite@3.2.4 + vite-plugin-pwa: 0.13.1_3kw35epztoiwny7qtfesjexvtu vite-plugin-static-copy: 0.12.0_vite@3.2.4 vite-plugin-vue-layouts: 0.7.0_vite@3.2.4+vue@3.2.45 vite-plugin-windicss: 1.8.8_vite@3.2.4 @@ -5570,7 +5570,7 @@ packages: dev: true /after/0.8.2: - resolution: {integrity: sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==} + resolution: {integrity: sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=} dev: false /agent-base/6.0.2: @@ -5927,7 +5927,7 @@ packages: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} /base64-arraybuffer/0.1.4: - resolution: {integrity: sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==} + resolution: {integrity: sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=} engines: {node: '>= 0.6.0'} dev: false @@ -6373,7 +6373,7 @@ packages: dev: true /component-bind/1.0.0: - resolution: {integrity: sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==} + resolution: {integrity: sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=} dev: false /component-emitter/1.3.0: @@ -6381,7 +6381,7 @@ packages: dev: false /component-inherit/0.0.3: - resolution: {integrity: sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==} + resolution: {integrity: sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=} dev: false /concat-map/0.0.1: @@ -7670,8 +7670,8 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-prettier/8.5.0_eslint@8.19.0: - resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==} + /eslint-config-prettier/8.6.0_eslint@8.19.0: + resolution: {integrity: sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==} hasBin: true peerDependencies: eslint: '>=7.0.0' @@ -7679,23 +7679,6 @@ packages: eslint: 8.19.0 dev: true - /eslint-plugin-prettier/4.2.1_7uxdfn2xinezdgvmbammh6ev5i: - resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} - engines: {node: '>=12.0.0'} - peerDependencies: - eslint: '>=7.28.0' - eslint-config-prettier: '*' - prettier: '>=2.0.0' - peerDependenciesMeta: - eslint-config-prettier: - optional: true - dependencies: - eslint: 8.19.0 - eslint-config-prettier: 8.5.0_eslint@8.19.0 - prettier: 2.7.1 - prettier-linter-helpers: 1.0.0 - dev: true - /eslint-plugin-prettier/4.2.1_eslint@8.24.0: resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} @@ -7726,6 +7709,23 @@ packages: prettier-linter-helpers: 1.0.0 dev: true + /eslint-plugin-prettier/4.2.1_ynq7nynyjfwcw5rz6ihwbkdyyy: + resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} + engines: {node: '>=12.0.0'} + peerDependencies: + eslint: '>=7.28.0' + eslint-config-prettier: '*' + prettier: '>=2.0.0' + peerDependenciesMeta: + eslint-config-prettier: + optional: true + dependencies: + eslint: 8.19.0 + eslint-config-prettier: 8.6.0_eslint@8.19.0 + prettier: 2.8.4 + prettier-linter-helpers: 1.0.0 + dev: true + /eslint-plugin-vue/9.5.1_eslint@8.24.0: resolution: {integrity: sha512-Y0sL2RY7Xc9S8kNih9lbwHIDmewUg9bfas6WSzsOWRgDXhIHKxRBZYNAnVcXBFfE+bMWHUA5GLChl7TcTYUI8w==} engines: {node: ^14.17.0 || >=16.0.0} @@ -8765,7 +8765,7 @@ packages: dev: false /has-cors/1.1.0: - resolution: {integrity: sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==} + resolution: {integrity: sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=} dev: false /has-flag/3.0.0: @@ -9064,7 +9064,7 @@ packages: engines: {node: '>=8'} /indexof/0.0.1: - resolution: {integrity: sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==} + resolution: {integrity: sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=} dev: false /inflight/1.0.6: @@ -11411,8 +11411,8 @@ packages: fast-diff: 1.2.0 dev: true - /prettier/2.7.1: - resolution: {integrity: sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==} + /prettier/2.8.4: + resolution: {integrity: sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==} engines: {node: '>=10.13.0'} hasBin: true dev: true @@ -12716,7 +12716,7 @@ packages: dev: true /to-array/0.1.4: - resolution: {integrity: sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==} + resolution: {integrity: sha1-F+bBH3PdTz10zaek/zI46a2b+JA=} dev: false /to-fast-properties/2.0.0: @@ -13746,10 +13746,29 @@ packages: - supports-color dev: true - /vite-plugin-pwa/0.13.1_vite@3.1.4: + /vite-plugin-pwa/0.13.1_3kw35epztoiwny7qtfesjexvtu: resolution: {integrity: sha512-NR3dIa+o2hzlzo4lF4Gu0cYvoMjSw2DdRc6Epw1yjmCqWaGuN86WK9JqZie4arNlE1ZuWT3CLiMdiX5wcmmUmg==} peerDependencies: vite: ^3.1.0 + workbox-window: ^6.5.4 + dependencies: + debug: 4.3.4 + fast-glob: 3.2.11 + pretty-bytes: 6.0.0 + rollup: 2.79.1 + vite: 3.2.4 + workbox-build: 6.5.4 + workbox-window: 6.5.4 + transitivePeerDependencies: + - '@types/babel__core' + - supports-color + dev: true + + /vite-plugin-pwa/0.13.1_bg4cnt4dy3xq3a47wkujd6ryzq: + resolution: {integrity: sha512-NR3dIa+o2hzlzo4lF4Gu0cYvoMjSw2DdRc6Epw1yjmCqWaGuN86WK9JqZie4arNlE1ZuWT3CLiMdiX5wcmmUmg==} + peerDependencies: + vite: ^3.1.0 + workbox-window: ^6.5.4 dependencies: debug: 4.3.4 fast-glob: 3.2.11 @@ -13767,6 +13786,7 @@ packages: resolution: {integrity: sha512-NR3dIa+o2hzlzo4lF4Gu0cYvoMjSw2DdRc6Epw1yjmCqWaGuN86WK9JqZie4arNlE1ZuWT3CLiMdiX5wcmmUmg==} peerDependencies: vite: ^3.1.0 + workbox-window: ^6.5.4 dependencies: debug: 4.3.4 fast-glob: 3.2.11 @@ -14811,7 +14831,7 @@ packages: dev: false /yeast/0.1.2: - resolution: {integrity: sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==} + resolution: {integrity: sha1-AI4G2AlDIMNy28L47XagymyKxBk=} dev: false /yn/3.1.1: