From 6928eb799251469f2210cb5631a1c9f98d729be8 Mon Sep 17 00:00:00 2001 From: 5idereal Date: Fri, 14 Jul 2023 14:06:08 +0800 Subject: [PATCH 01/10] feat(lang): update tw translation (#3170) --- packages/hoppscotch-common/locales/tw.json | 116 ++++++++++----------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/packages/hoppscotch-common/locales/tw.json b/packages/hoppscotch-common/locales/tw.json index 6d58298c9..cce86a565 100644 --- a/packages/hoppscotch-common/locales/tw.json +++ b/packages/hoppscotch-common/locales/tw.json @@ -19,7 +19,7 @@ "edit": "編輯", "filter": "篩選回應", "go_back": "返回", - "go_forward": "Go forward", + "go_forward": "向前", "group_by": "分組方式", "label": "標籤", "learn_more": "瞭解更多", @@ -117,37 +117,37 @@ "username": "使用者名稱" }, "collection": { - "created": "組合已建立", - "different_parent": "Cannot reorder collection with different parent", - "edit": "編輯組合", - "invalid_name": "請提供有效的組合名稱", - "invalid_root_move": "Collection already in the root", - "moved": "Moved Successfully", - "my_collections": "我的組合", - "name": "我的新組合", - "name_length_insufficient": "組合名稱至少要有 3 個字元。", - "new": "建立組合", - "order_changed": "Collection Order Updated", - "renamed": "組合已重新命名", + "created": "集合已建立", + "different_parent": "無法為父集合不同的集合重新排序", + "edit": "編輯集合", + "invalid_name": "請提供有效的集合名稱", + "invalid_root_move": "集合已在根目錄", + "moved": "移動成功", + "my_collections": "我的集合", + "name": "我的新集合", + "name_length_insufficient": "集合名稱至少要有 3 個字元。", + "new": "建立集合", + "order_changed": "集合順序已更新", + "renamed": "集合已重新命名", "request_in_use": "請求正在使用中", "save_as": "另存為", - "select": "選擇一個組合", + "select": "選擇一個集合", "select_location": "選擇位置", "select_team": "選擇一個團隊", - "team_collections": "團隊組合" + "team_collections": "團隊集合" }, "confirm": { "exit_team": "您確定要離開此團隊嗎？", "logout": "您確定要登出嗎？", - "remove_collection": "您確定要永久刪除該組合嗎？", + "remove_collection": "您確定要永久刪除該集合嗎？", "remove_environment": "您確定要永久刪除該環境嗎？", "remove_folder": "您確定要永久刪除該資料夾嗎？", "remove_history": "您確定要永久刪除全部歷史記錄嗎？", "remove_request": "您確定要永久刪除該請求嗎？", "remove_team": "您確定要刪除該團隊嗎？", "remove_telemetry": "您確定要退出遙測服務嗎？", - "request_change": "您確定要捨棄當前請求嗎？未儲存的變更將遺失。", - "save_unsaved_tab": "Do you want to save changes made in this tab?", + "request_change": "您確定要捨棄目前的請求嗎？未儲存的變更將遺失。", + "save_unsaved_tab": "您要儲存在此分頁做出的改動嗎？", "sync": "您想從雲端恢復您的工作區嗎？這將丟棄您的本地進度。" }, "count": { @@ -160,13 +160,13 @@ }, "documentation": { "generate": "產生文件", - "generate_message": "匯入 Hoppscotch 組合以隨時隨地產生 API 文件。" + "generate_message": "匯入 Hoppscotch 集合以隨時隨地產生 API 文件。" }, "empty": { "authorization": "該請求沒有使用任何授權", "body": "該請求沒有任何請求主體", - "collection": "組合為空", - "collections": "組合為空", + "collection": "集合為空", + "collections": "集合為空", "documentation": "連線到 GraphQL 端點以檢視文件", "endpoint": "端點不能留空", "environments": "環境為空", @@ -209,7 +209,7 @@ "browser_support_sse": "此瀏覽器似乎不支援 SSE。", "check_console_details": "檢查控制台日誌以獲悉詳情", "curl_invalid_format": "cURL 格式不正確", - "danger_zone": "Danger zone", + "danger_zone": "危險地帶", "delete_account": "您的帳號目前為這些團隊的擁有者：", "delete_account_description": "您在刪除帳號前必須先將您自己從團隊中移除、轉移擁有權，或是刪除團隊。", "empty_req_name": "空請求名稱", @@ -277,38 +277,38 @@ "tests": "編寫測試指令碼以自動除錯。" }, "hide": { - "collection": "隱藏組合面板", + "collection": "隱藏集合面板", "more": "隱藏更多", "preview": "隱藏預覽", "sidebar": "隱藏側邊欄" }, "import": { - "collections": "匯入組合", + "collections": "匯入集合", "curl": "匯入 cURL", "failed": "匯入失敗", "from_gist": "從 Gist 匯入", "from_gist_description": "從 Gist 網址匯入", "from_insomnia": "從 Insomnia 匯入", - "from_insomnia_description": "從 Insomnia 組合匯入", + "from_insomnia_description": "從 Insomnia 集合匯入", "from_json": "從 Hoppscotch 匯入", - "from_json_description": "從 Hoppscotch 組合檔匯入", - "from_my_collections": "從我的組合匯入", - "from_my_collections_description": "從我的組合檔匯入", + "from_json_description": "從 Hoppscotch 集合檔匯入", + "from_my_collections": "從我的集合匯入", + "from_my_collections_description": "從我的集合檔匯入", "from_openapi": "從 OpenAPI 匯入", "from_openapi_description": "從 OpenAPI 規格檔 (YML/JSON) 匯入", "from_postman": "從 Postman 匯入", - "from_postman_description": "從 Postman 組合匯入", + "from_postman_description": "從 Postman 集合匯入", "from_url": "從網址匯入", "gist_url": "輸入 Gist 網址", "import_from_url_invalid_fetch": "無法從網址取得資料", - "import_from_url_invalid_file_format": "匯入組合時發生錯誤", + "import_from_url_invalid_file_format": "匯入集合時發生錯誤", "import_from_url_invalid_type": "不支援此類型。可接受的值為 'hoppscotch'、'openapi'、'postman'、'insomnia'", - "import_from_url_success": "已匯入組合", - "json_description": "從 Hoppscotch 組合 JSON 檔匯入組合", + "import_from_url_success": "已匯入集合", + "json_description": "從 Hoppscotch 集合 JSON 檔匯入集合", "title": "匯入" }, "layout": { - "collapse_collection": "隱藏或顯示組合", + "collapse_collection": "隱藏或顯示集合", "collapse_sidebar": "隱藏或顯示側邊欄", "column": "垂直版面", "name": "配置", @@ -316,8 +316,8 @@ "zen_mode": "專注模式" }, "modal": { - "close_unsaved_tab": "You have unsaved changes", - "collections": "組合", + "close_unsaved_tab": "您有未儲存的改動", + "collections": "集合", "confirm": "確認", "edit_request": "編輯請求", "import_export": "匯入／匯出" @@ -374,9 +374,9 @@ "email_verification_mail": "已將驗證信寄送至您的電子郵件地址。請點擊信中連結以驗證您的電子郵件地址。", "no_permission": "您沒有權限執行此操作。", "owner": "擁有者", - "owner_description": "擁有者可以新增、編輯和刪除請求、組合和團隊成員。", + "owner_description": "擁有者可以新增、編輯和刪除請求、集合和團隊成員。", "roles": "角色", - "roles_description": "角色用來控制對共用組合的存取權。", + "roles_description": "角色用來控制對共用集合的存取權。", "updated": "已更新個人檔案", "viewer": "檢視者", "viewer_description": "檢視者只能檢視和使用請求。" @@ -396,8 +396,8 @@ "text": "文字" }, "copy_link": "複製連結", - "different_collection": "Cannot reorder requests from different collections", - "duplicated": "Request duplicated", + "different_collection": "無法重新排列來自不同集合的請求", + "duplicated": "已複製請求", "duration": "持續時間", "enter_curl": "輸入 cURL", "generate_code": "產生程式碼", @@ -405,10 +405,10 @@ "header_list": "請求標頭列表", "invalid_name": "請提供請求名稱", "method": "方法", - "moved": "Request moved", + "moved": "已移動請求", "name": "請求名稱", "new": "新請求", - "order_changed": "Request Order Updated", + "order_changed": "已更新請求順序", "override": "覆寫", "override_help": "在標頭設置 Content-Type", "overriden": "已覆寫", @@ -432,7 +432,7 @@ "view_my_links": "檢視我的連結" }, "response": { - "audio": "Audio", + "audio": "音訊", "body": "回應本體", "filter_response_body": "篩選 JSON 回應本體 (使用 JSONPath 語法)", "headers": "回應標頭", @@ -446,7 +446,7 @@ "status": "狀態", "time": "時間", "title": "回應", - "video": "Video", + "video": "視訊", "waiting_for_connection": "等待連線", "xml": "XML" }, @@ -494,7 +494,7 @@ "short_codes_description": "我們為您打造的快捷碼。", "sidebar_on_left": "左側邊欄", "sync": "同步", - "sync_collections": "組合", + "sync_collections": "集合", "sync_description": "這些設定會同步到雲端。", "sync_environments": "環境", "sync_history": "歷史", @@ -551,7 +551,7 @@ "previous_method": "選擇上一個方法", "put_method": "選擇 PUT 方法", "reset_request": "重置請求", - "save_to_collections": "儲存到組合", + "save_to_collections": "儲存到集合", "send_request": "傳送請求", "title": "請求" }, @@ -570,7 +570,7 @@ }, "show": { "code": "顯示程式碼", - "collection": "顯示組合面板", + "collection": "顯示集合面板", "more": "顯示更多", "sidebar": "顯示側邊欄" }, @@ -639,9 +639,9 @@ "tab": { "authorization": "授權", "body": "請求本體", - "collections": "組合", + "collections": "集合", "documentation": "幫助文件", - "environments": "Environments", + "environments": "環境", "headers": "請求標頭", "history": "歷史記錄", "mqtt": "MQTT", @@ -666,7 +666,7 @@ "email_do_not_match": "電子信箱與您的帳號資料不一致。請聯絡您的團隊擁有者。", "exit": "退出團隊", "exit_disabled": "團隊擁有者無法退出團隊", - "invalid_coll_id": "Invalid collection ID", + "invalid_coll_id": "集合 ID 無效", "invalid_email_format": "電子信箱格式無效", "invalid_id": "團隊 ID 無效。請聯絡您的團隊擁有者。", "invalid_invite_link": "邀請連結無效", @@ -690,21 +690,21 @@ "member_removed": "使用者已移除", "member_role_updated": "使用者角色已更新", "members": "成員", - "more_members": "+{count} more", + "more_members": "還有 {count} 位", "name_length_insufficient": "團隊名稱至少為 6 個字元", "name_updated": "團隊名稱已更新", "new": "新團隊", "new_created": "已建立新團隊", "new_name": "我的新團隊", - "no_access": "您沒有編輯組合的許可權", + "no_access": "您沒有編輯集合的許可權", "no_invite_found": "未找到邀請。請聯絡您的團隊擁有者。", - "no_request_found": "Request not found.", + "no_request_found": "找不到請求。", "not_found": "找不到團隊。請聯絡您的團隊擁有者。", "not_valid_viewer": "您不是一個有效的檢視者。請聯絡您的團隊擁有者。", - "parent_coll_move": "Cannot move collection to a child collection", + "parent_coll_move": "無法將集合移動至子集合", "pending_invites": "待定邀請", "permissions": "許可權", - "same_target_destination": "Same target and destination", + "same_target_destination": "目標和目的地相同", "saved": "團隊已儲存", "select_a_team": "選擇團隊", "title": "團隊", @@ -734,9 +734,9 @@ "url": "網址" }, "workspace": { - "change": "Change workspace", - "personal": "My Workspace", - "team": "Team Workspace", - "title": "Workspaces" + "change": "切換工作區", + "personal": "我的工作區", + "team": "團隊工作區", + "title": "工作區" } } From 25177bd6357497527609099a5e425a59bdc7a3fe Mon Sep 17 00:00:00 2001 From: Anwarul Islam Date: Mon, 17 Jul 2023 13:02:25 +0600 Subject: [PATCH 02/10] fix: update vite-plugin-dts version which fixes build issue on docker/alpine (#3179) --- packages/hoppscotch-ui/package.json | 2 +- .../src/components/smart/Anchor.vue | 91 +++--- packages/hoppscotch-ui/vite.config.ts | 7 +- pnpm-lock.yaml | 284 +++++++++++------- 4 files changed, 227 insertions(+), 157 deletions(-) diff --git a/packages/hoppscotch-ui/package.json b/packages/hoppscotch-ui/package.json index 36c6a920d..2ffcc42e8 100644 --- a/packages/hoppscotch-ui/package.json +++ b/packages/hoppscotch-ui/package.json @@ -71,7 +71,7 @@ "unplugin-vue-components": "^0.21.0", "vite": "^3.2.3", "vite-plugin-checker": "^0.5.1", - "vite-plugin-dts": "2.0.0-beta.3", + "vite-plugin-dts": "3.2.0", "vite-plugin-fonts": "^0.6.0", "vite-plugin-html-config": "^1.0.10", "vite-plugin-inspect": "^0.7.4", diff --git a/packages/hoppscotch-ui/src/components/smart/Anchor.vue b/packages/hoppscotch-ui/src/components/smart/Anchor.vue index 3a18a7d70..21abcc389 100644 --- a/packages/hoppscotch-ui/src/components/smart/Anchor.vue +++ b/packages/hoppscotch-ui/src/components/smart/Anchor.vue @@ -1,62 +1,55 @@ - diff --git a/packages/hoppscotch-ui/vite.config.ts b/packages/hoppscotch-ui/vite.config.ts index 86ff5fb15..875fc901a 100644 --- a/packages/hoppscotch-ui/vite.config.ts +++ b/packages/hoppscotch-ui/vite.config.ts @@ -11,14 +11,13 @@ export default defineConfig({ vue(), dts({ insertTypesEntry: true, - skipDiagnostics: true, - outputDir: ['dist'] + outDir: ["dist"], }), WindiCSS({ root: path.resolve(__dirname), }), Icons({ - compiler: "vue3" + compiler: "vue3", }), VitePluginFonts({ google: { @@ -45,6 +44,6 @@ export default defineConfig({ exports: "named", }, }, - emptyOutDir: true + emptyOutDir: true, }, }) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 051edc531..35fb49948 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1274,8 +1274,8 @@ importers: specifier: ^0.5.1 version: 0.5.1(eslint@8.29.0)(typescript@4.9.3)(vite@3.2.4) vite-plugin-dts: - specifier: 2.0.0-beta.3 - version: 2.0.0-beta.3(@types/node@17.0.45)(rollup@2.79.1)(vite@3.2.4) + specifier: 3.2.0 + version: 3.2.0(@types/node@17.0.45)(sass@1.53.0)(terser@5.14.1)(typescript@4.9.3) vite-plugin-fonts: specifier: ^0.6.0 version: 0.6.0(vite@3.2.4) @@ -1977,14 +1977,6 @@ packages: dependencies: '@babel/types': 7.18.7 - /@babel/parser@7.20.15: - resolution: {integrity: sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==} - engines: {node: '>=6.0.0'} - hasBin: true - dependencies: - '@babel/types': 7.21.2 - dev: true - /@babel/parser@7.21.2: resolution: {integrity: sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==} engines: {node: '>=6.0.0'} @@ -1992,6 +1984,14 @@ packages: dependencies: '@babel/types': 7.18.7 + /@babel/parser@7.22.7: + resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.21.2 + dev: true + /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.18.6(@babel/core@7.18.6): resolution: {integrity: sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==} engines: {node: '>=6.9.0'} @@ -5601,16 +5601,16 @@ packages: vue-i18n: optional: true dependencies: - '@intlify/message-compiler': 9.3.0-beta.19 - '@intlify/shared': 9.3.0-beta.19 + '@intlify/message-compiler': 9.3.0-beta.24 + '@intlify/shared': 9.3.0-beta.24 jsonc-eslint-parser: 1.4.1 source-map: 0.6.1 vue-i18n: 9.2.2(vue@3.2.37) yaml-eslint-parser: 0.3.2 dev: true - /@intlify/bundle-utils@6.0.0: - resolution: {integrity: sha512-c8nTDgsTrBqVk3LPoF/YEarqeqcW0XAY5Y0UmFl5VKWKRNQh47jzvHRDmeRWhos5bUw1zIdiTixrs99FMJ9j5g==} + /@intlify/bundle-utils@7.0.0: + resolution: {integrity: sha512-+/RBsYWbiZcs97RyVb4mrsSrLmIMaI6evj30jI9f1psjXx+syRbf0ab63I5SIz290EOm6TE80fTst/Xjel+D9w==} engines: {node: '>= 14.16'} peerDependencies: petite-vue-i18n: '*' @@ -5621,8 +5621,8 @@ packages: vue-i18n: optional: true dependencies: - '@intlify/message-compiler': 9.3.0-beta.17 - '@intlify/shared': 9.3.0-beta.17 + '@intlify/message-compiler': 9.3.0-beta.20 + '@intlify/shared': 9.3.0-beta.20 acorn: 8.8.2 escodegen: 2.0.0 estree-walker: 2.0.2 @@ -5655,33 +5655,33 @@ packages: '@intlify/shared': 9.2.2 source-map: 0.6.1 - /@intlify/message-compiler@9.3.0-beta.17: - resolution: {integrity: sha512-i7hvVIRk1Ax2uKa9xLRJCT57to08OhFMhFXXjWN07rmx5pWQYQ23MfX1xgggv9drnWTNhqEiD+u4EJeHoS5+Ww==} - engines: {node: '>= 14'} - dependencies: - '@intlify/shared': 9.3.0-beta.17 - source-map: 0.6.1 - dev: true - - /@intlify/message-compiler@9.3.0-beta.19: - resolution: {integrity: sha512-5RBn5tMOsWh5FqM65IfEJvfpRS8R0lHEUVNDa2rNc9Y7oGEI7swezlbFqU9Kc5FyHy5Kx2jHtdgFIipDwnIYFQ==} + /@intlify/message-compiler@9.3.0-beta.20: + resolution: {integrity: sha512-hwqQXyTnDzAVZ300SU31jO0+3OJbpOdfVU6iBkrmNpS7t2HRnVACo0EwcEXzJa++4EVDreqz5OeqJbt+PeSGGA==} engines: {node: '>= 16'} dependencies: - '@intlify/shared': 9.3.0-beta.19 - source-map: 0.6.1 + '@intlify/shared': 9.3.0-beta.20 + source-map-js: 1.0.2 + dev: true + + /@intlify/message-compiler@9.3.0-beta.24: + resolution: {integrity: sha512-prhHATkgp0mpPqoVgiAtLmUc1JMvs8fMH6w53AVEBn+VF87dLhzanfmWY5FoZWORG51ag54gBDBOoM/VFv3m3A==} + engines: {node: '>= 16'} + dependencies: + '@intlify/shared': 9.3.0-beta.24 + source-map-js: 1.0.2 dev: true /@intlify/shared@9.2.2: resolution: {integrity: sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==} engines: {node: '>= 14'} - /@intlify/shared@9.3.0-beta.17: - resolution: {integrity: sha512-mscf7RQsUTOil35jTij4KGW1RC9SWQjYScwLxP53Ns6g24iEd5HN7ksbt9O6FvTmlQuX77u+MXpBdfJsGqizLQ==} - engines: {node: '>= 14'} + /@intlify/shared@9.3.0-beta.20: + resolution: {integrity: sha512-RucSPqh8O9FFxlYUysQTerSw0b9HIRpyoN1Zjogpm0qLiHK+lBNSa5sh1nCJ4wSsNcjphzgpLQCyR60GZlRV8g==} + engines: {node: '>= 16'} dev: true - /@intlify/shared@9.3.0-beta.19: - resolution: {integrity: sha512-+lhQggrLvlQ/O5OmIYAc9gadcYXMoaDi0Doef+X/f6TLZFr9PTMjOpBWmpwNNHi026e54jckntUn6GzqDtIN4w==} + /@intlify/shared@9.3.0-beta.24: + resolution: {integrity: sha512-AKxJ8s7eKIQWkNaf4wyyoLRwf4puCuQgjSChlDJm5JBEt6T8HGgnYTJLRXu6LD/JACn3Qwu6hM/XRX1c9yvjmQ==} engines: {node: '>= 16'} dev: true @@ -5700,8 +5700,8 @@ packages: vue-i18n: optional: true dependencies: - '@intlify/bundle-utils': 6.0.0 - '@intlify/shared': 9.3.0-beta.19 + '@intlify/bundle-utils': 7.0.0 + '@intlify/shared': 9.3.0-beta.24 '@rollup/pluginutils': 4.2.1 debug: 4.3.4(supports-color@9.2.2) fast-glob: 3.2.11 @@ -5728,7 +5728,7 @@ packages: optional: true dependencies: '@intlify/bundle-utils': 3.4.0(vue-i18n@9.2.2) - '@intlify/shared': 9.3.0-beta.19 + '@intlify/shared': 9.3.0-beta.24 '@rollup/pluginutils': 4.2.1 debug: 4.3.4(supports-color@9.2.2) fast-glob: 3.2.12 @@ -6341,32 +6341,32 @@ packages: resolution: {integrity: sha512-EWUguj2kd7ldmrF9F+vI5hUOralPd+sdsUnYbRy33vZTuZkduC1shE9TtEMEjAQwyfyMb4ole5KtjF8MsnQOlA==} dev: true - /@microsoft/api-extractor-model@7.26.4(@types/node@17.0.45): - resolution: {integrity: sha512-PDCgCzXDo+SLY5bsfl4bS7hxaeEtnXj7XtuzEE+BtALp7B5mK/NrS2kHWU69pohgsRmEALycQdaQPXoyT2i5MQ==} + /@microsoft/api-extractor-model@7.27.4(@types/node@17.0.45): + resolution: {integrity: sha512-HjqQFmuGPOS20rtnu+9Jj0QrqZyR59E+piUWXPMZTTn4jaZI+4UmsHSf3Id8vyueAhOBH2cgwBuRTE5R+MfSMw==} dependencies: '@microsoft/tsdoc': 0.14.2 '@microsoft/tsdoc-config': 0.16.2 - '@rushstack/node-core-library': 3.55.2(@types/node@17.0.45) + '@rushstack/node-core-library': 3.59.5(@types/node@17.0.45) transitivePeerDependencies: - '@types/node' dev: true - /@microsoft/api-extractor@7.34.4(@types/node@17.0.45): - resolution: {integrity: sha512-HOdcci2nT40ejhwPC3Xja9G+WSJmWhCUKKryRfQYsmE9cD+pxmBaKBKCbuS9jUcl6bLLb4Gz+h7xEN5r0QiXnQ==} + /@microsoft/api-extractor@7.36.1(@types/node@17.0.45): + resolution: {integrity: sha512-2SPp1jq6wDY5IOsRLUv/4FxngslctBZJlztAJ3uWpCAwqKQG7ESdL3DhEza+StbYLtBQmu1Pk6q1Vkhl7qD/bg==} hasBin: true dependencies: - '@microsoft/api-extractor-model': 7.26.4(@types/node@17.0.45) + '@microsoft/api-extractor-model': 7.27.4(@types/node@17.0.45) '@microsoft/tsdoc': 0.14.2 '@microsoft/tsdoc-config': 0.16.2 - '@rushstack/node-core-library': 3.55.2(@types/node@17.0.45) - '@rushstack/rig-package': 0.3.18 - '@rushstack/ts-command-line': 4.13.2 + '@rushstack/node-core-library': 3.59.5(@types/node@17.0.45) + '@rushstack/rig-package': 0.4.0 + '@rushstack/ts-command-line': 4.15.1 colors: 1.2.5 lodash: 4.17.21 resolve: 1.22.1 semver: 7.3.8 source-map: 0.6.1 - typescript: 4.8.4 + typescript: 5.0.4 transitivePeerDependencies: - '@types/node' dev: true @@ -6932,8 +6932,8 @@ packages: resolution: {integrity: sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA==} dev: true - /@rushstack/node-core-library@3.55.2(@types/node@17.0.45): - resolution: {integrity: sha512-SaLe/x/Q/uBVdNFK5V1xXvsVps0y7h1sN7aSJllQyFbugyOaxhNRF25bwEDnicARNEjJw0pk0lYnJQ9Kr6ev0A==} + /@rushstack/node-core-library@3.59.5(@types/node@17.0.45): + resolution: {integrity: sha512-1IpV7LufrI1EoVO8hYsb3t6L8L+yp40Sa0OaOV2CIu1zx4e6ZeVNaVIEXFgMXBKdGXkAh21MnCaIzlDNpG6ZQw==} peerDependencies: '@types/node': '*' peerDependenciesMeta: @@ -6950,15 +6950,15 @@ packages: z-schema: 5.0.5 dev: true - /@rushstack/rig-package@0.3.18: - resolution: {integrity: sha512-SGEwNTwNq9bI3pkdd01yCaH+gAsHqs0uxfGvtw9b0LJXH52qooWXnrFTRRLG1aL9pf+M2CARdrA9HLHJys3jiQ==} + /@rushstack/rig-package@0.4.0: + resolution: {integrity: sha512-FnM1TQLJYwSiurP6aYSnansprK5l8WUK8VG38CmAaZs29ZeL1msjK0AP1VS4ejD33G0kE/2cpsPsS9jDenBMxw==} dependencies: resolve: 1.22.1 strip-json-comments: 3.1.1 dev: true - /@rushstack/ts-command-line@4.13.2: - resolution: {integrity: sha512-bCU8qoL9HyWiciltfzg7GqdfODUeda/JpI0602kbN5YH22rzTxyqYvv7aRLENCM7XCQ1VRs7nMkEqgJUOU8Sag==} + /@rushstack/ts-command-line@4.15.1: + resolution: {integrity: sha512-EL4jxZe5fhb1uVL/P/wQO+Z8Rc8FMiWJ1G7VgnPDvdIt5GVjRfK7vwzder1CZQiX3x0PY6uxENYLNGTFd1InRQ==} dependencies: '@types/argparse': 1.0.38 argparse: 1.0.10 @@ -7220,15 +7220,6 @@ packages: engines: {node: '>= 10'} dev: true - /@ts-morph/common@0.18.1: - resolution: {integrity: sha512-RVE+zSRICWRsfrkAw5qCAK+4ZH9kwEFv5h0+/YeHTLieWP7F4wWq4JsKFuNWG+fYh/KF+8rAtgdj5zb2mm+DVA==} - dependencies: - fast-glob: 3.2.12 - minimatch: 5.1.0 - mkdirp: 1.0.4 - path-browserify: 1.0.1 - dev: true - /@tsconfig/node10@1.0.9: resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} @@ -8394,6 +8385,12 @@ packages: muggle-string: 0.1.0 dev: true + /@volar/language-core@1.8.0: + resolution: {integrity: sha512-ZHTvZPM3pEbOOuaq+ybNz5TQlHUqPQPK0G1+SonvApGq0e3qgGijjhtL5T7hsCtUEmxfix8FrAuCH14tMBOhTg==} + dependencies: + '@volar/source-map': 1.8.0 + dev: true + /@volar/shared@0.27.24: resolution: {integrity: sha512-Mi8a4GQaiorfb+o4EqOXDZm9E/uBJXgScFgF+NhtcMBOUKHNMKQyLI7YRGumtyJTTdaX7nSDJjGGTkv23tcOtQ==} dependencies: @@ -8418,6 +8415,12 @@ packages: muggle-string: 0.1.0 dev: true + /@volar/source-map@1.8.0: + resolution: {integrity: sha512-d35aV0yFkIrkynRSKgrN5hgbMv6ekkFvcJsJGmOZ8UEjqLStto9zq7RSvpp6/PZ7/pa4Gn1f6K1qDt0bq0oUew==} + dependencies: + muggle-string: 0.3.1 + dev: true + /@volar/transforms@0.27.24: resolution: {integrity: sha512-sOHi1ZSapFlxn7yPl4MO5TXd9aWC0BVq2CgXAJ2EESb+ddh2uJbGQgLLNocX+MDh419cUuuFT2QAJpuWHhJcng==} dependencies: @@ -8431,6 +8434,12 @@ packages: '@volar/language-core': 1.0.9 dev: true + /@volar/typescript@1.8.0: + resolution: {integrity: sha512-T/U1XLLhXv6tNr40Awznfc6QZWizSL99t6M0DeXtIMbnvSCqjjCVRnwlsq+DK9C1RlO3k8+i0Z8iJn7O1GGtoA==} + dependencies: + '@volar/language-core': 1.8.0 + dev: true + /@volar/vue-code-gen@0.38.2: resolution: {integrity: sha512-whLunD6phSGWBUHZKdTxeglrpzQu26ii8CRVapFdjfyMaVhQ7ESNeIAhkTVyg2ovOPc0PiDYPQEPzfWAADIWog==} dependencies: @@ -8505,6 +8514,15 @@ packages: estree-walker: 2.0.2 source-map: 0.6.1 + /@vue/compiler-core@3.3.4: + resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} + dependencies: + '@babel/parser': 7.22.7 + '@vue/shared': 3.3.4 + estree-walker: 2.0.2 + source-map-js: 1.0.2 + dev: true + /@vue/compiler-dom@3.2.37: resolution: {integrity: sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==} dependencies: @@ -8523,6 +8541,13 @@ packages: '@vue/compiler-core': 3.2.45 '@vue/shared': 3.2.45 + /@vue/compiler-dom@3.3.4: + resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==} + dependencies: + '@vue/compiler-core': 3.3.4 + '@vue/shared': 3.3.4 + dev: true + /@vue/compiler-sfc@2.7.1: resolution: {integrity: sha512-YQRE2uYhlvyFgHmKAqySCdLm7O37XZc+yG9dujwD3h8em+rD1qGOthxc0H3XcijOy50gj/pYHgBO6C3MjV+oug==} dependencies: @@ -8636,6 +8661,25 @@ packages: - supports-color dev: true + /@vue/language-core@1.8.4(typescript@4.9.3): + resolution: {integrity: sha512-pnNtNcJVfkGYluW0vsVO+Y1gyX+eA0voaS7+1JOhCp5zKeCaL/PAmGYOgfvwML62neL+2H8pnhY7sffmrGpEhw==} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@volar/language-core': 1.8.0 + '@volar/source-map': 1.8.0 + '@vue/compiler-dom': 3.3.4 + '@vue/reactivity': 3.3.4 + '@vue/shared': 3.3.4 + minimatch: 9.0.3 + muggle-string: 0.3.1 + typescript: 4.9.3 + vue-template-compiler: 2.7.14 + dev: true + /@vue/reactivity-transform@3.2.37: resolution: {integrity: sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==} dependencies: @@ -8679,6 +8723,12 @@ packages: dependencies: '@vue/shared': 3.2.45 + /@vue/reactivity@3.3.4: + resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==} + dependencies: + '@vue/shared': 3.3.4 + dev: true + /@vue/runtime-core@3.2.37: resolution: {integrity: sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==} dependencies: @@ -8739,6 +8789,19 @@ packages: /@vue/shared@3.2.45: resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==} + /@vue/shared@3.3.4: + resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} + dev: true + + /@vue/typescript@1.8.4(typescript@4.9.3): + resolution: {integrity: sha512-sioQfIY5xcmEAz+cPLvv6CtzGPtGhIdR0Za87zB8M4mPe4OSsE3MBGkXcslf+EzQgF+fm6Gr1SRMSX8r5ZmzDA==} + dependencies: + '@volar/typescript': 1.8.0 + '@vue/language-core': 1.8.4(typescript@4.9.3) + transitivePeerDependencies: + - typescript + dev: true + /@vueuse/core@8.7.5(vue@3.2.37): resolution: {integrity: sha512-tqgzeZGoZcXzoit4kOGLWJibDMLp0vdm6ZO41SSUQhkhtrPhAg6dbIEPiahhUu6sZAmSYvVrZgEr5aKD51nrLA==} peerDependencies: @@ -9143,7 +9206,7 @@ packages: hasBin: true /after@0.8.2: - resolution: {integrity: sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=} + resolution: {integrity: sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==} dev: false /agent-base@6.0.2: @@ -9755,7 +9818,7 @@ packages: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} /base64-arraybuffer@0.1.4: - resolution: {integrity: sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=} + resolution: {integrity: sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==} engines: {node: '>= 0.6.0'} dev: false @@ -10302,10 +10365,6 @@ packages: engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} dev: true - /code-block-writer@11.0.3: - resolution: {integrity: sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw==} - dev: true - /collect-v8-coverage@1.0.1: resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==} dev: true @@ -10402,14 +10461,14 @@ packages: dev: true /component-bind@1.0.0: - resolution: {integrity: sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=} + resolution: {integrity: sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==} dev: false /component-emitter@1.3.0: resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==} /component-inherit@0.0.3: - resolution: {integrity: sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=} + resolution: {integrity: sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==} dev: false /concat-map@0.0.1: @@ -13609,7 +13668,7 @@ packages: dev: false /has-cors@1.1.0: - resolution: {integrity: sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=} + resolution: {integrity: sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==} dev: false /has-flag@3.0.0: @@ -14002,7 +14061,7 @@ packages: engines: {node: '>=8'} /indexof@0.0.1: - resolution: {integrity: sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=} + resolution: {integrity: sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==} dev: false /inflight@1.0.6: @@ -15863,6 +15922,10 @@ packages: resolution: {integrity: sha512-ymToLHqL02udwVdbkowNpzjFd6UzozMtshPQKVi5k1EjKRqKqBrOnE9QbLEb0/pV76SAiIT13hdL8R6suc+f3g==} dev: true + /kolorist@1.8.0: + resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} + dev: true + /leac@0.6.0: resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==} dev: false @@ -16231,13 +16294,6 @@ packages: dependencies: sourcemap-codec: 1.4.8 - /magic-string@0.29.0: - resolution: {integrity: sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.14 - dev: true - /magic-string@0.30.0: resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} engines: {node: '>=12'} @@ -16493,6 +16549,13 @@ packages: dependencies: brace-expansion: 2.0.1 + /minimatch@9.0.3: + resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -16971,6 +17034,10 @@ packages: resolution: {integrity: sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==} dev: true + /muggle-string@0.3.1: + resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==} + dev: true + /multer@1.4.4-lts.1: resolution: {integrity: sha512-WeSGziVj6+Z2/MwQo3GvqzgR+9Uc+qt8SwHKh3gvNPiISKfsMfG4SvCOFYlxxgkXt7yIV2i1yczehm0EOKIxIg==} engines: {node: '>= 6.0.0'} @@ -17569,10 +17636,6 @@ packages: utils-merge: 1.0.1 dev: false - /path-browserify@1.0.1: - resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} - dev: true - /path-case@3.0.4: resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==} dependencies: @@ -19709,7 +19772,7 @@ packages: dev: true /to-array@0.1.4: - resolution: {integrity: sha1-F+bBH3PdTz10zaek/zI46a2b+JA=} + resolution: {integrity: sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==} dev: false /to-fast-properties@2.0.0: @@ -19899,13 +19962,6 @@ packages: resolution: {integrity: sha512-DEQrfv6l7IvN2jlzc/VTdZJYsWUnQNCsueYjMkC/iXoEoi5fNan6MjeDqkvhfzbmHgdz9UxDUluX3V5HdjTydQ==} dev: true - /ts-morph@17.0.1: - resolution: {integrity: sha512-10PkHyXmrtsTvZSL+cqtJLTgFXkU43Gd0JCc0Rw6GchWbqKe0Rwgt1v3ouobTZwQzF1mGhDeAlWYBMGRV7y+3g==} - dependencies: - '@ts-morph/common': 0.18.1 - code-block-writer: 11.0.3 - dev: true - /ts-node-dev@2.0.0(@types/node@18.11.10)(typescript@4.9.3): resolution: {integrity: sha512-ywMrhCfH6M75yftYvrvNarLEY+SUXtUvU8/0Z6llrHQVBx12GiFk5sStF8UdfE/yfzk9IAq7O5EEbTQsxlBI8w==} engines: {node: '>=0.8.0'} @@ -20213,6 +20269,12 @@ packages: hasBin: true dev: true + /typescript@5.0.4: + resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==} + engines: {node: '>=12.20'} + hasBin: true + dev: true + /ua-parser-js@0.7.31: resolution: {integrity: sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==} dev: true @@ -20746,27 +20808,31 @@ packages: vscode-uri: 3.0.3 dev: true - /vite-plugin-dts@2.0.0-beta.3(@types/node@17.0.45)(rollup@2.79.1)(vite@3.2.4): - resolution: {integrity: sha512-QrsbTxyt0choSYXPxPfmN9XcSvxcVZk0zticxLrI5DkECs9KhDrSVGok1YP/UPkoKpfF9ThtOJcM5Rjuesxv/w==} + /vite-plugin-dts@3.2.0(@types/node@17.0.45)(sass@1.53.0)(terser@5.14.1)(typescript@4.9.3): + resolution: {integrity: sha512-s+dwJvDcb/AWgb49oVbq9JiUSIMwaVpFfV4SVIaBZmv9OZyeyDGxujaq+z4HJ4LB4hUG5c4oRAJyLfV66c763Q==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: - vite: '>=2.9.0' + typescript: '*' dependencies: - '@babel/parser': 7.20.15 - '@microsoft/api-extractor': 7.34.4(@types/node@17.0.45) + '@microsoft/api-extractor': 7.36.1(@types/node@17.0.45) '@rollup/pluginutils': 5.0.2(rollup@2.79.1) - '@rushstack/node-core-library': 3.55.2(@types/node@17.0.45) + '@rushstack/node-core-library': 3.59.5(@types/node@17.0.45) + '@vue/language-core': 1.8.4(typescript@4.9.3) debug: 4.3.4(supports-color@9.2.2) - fast-glob: 3.2.12 - fs-extra: 10.1.0 - kolorist: 1.7.0 - magic-string: 0.29.0 - ts-morph: 17.0.1 + kolorist: 1.8.0 + typescript: 4.9.3 + vue-tsc: 1.8.4(typescript@4.9.3) + optionalDependencies: + rollup: 2.79.1 vite: 3.2.4(@types/node@17.0.45)(sass@1.53.0)(terser@5.14.1) transitivePeerDependencies: - '@types/node' - - rollup + - less + - sass + - stylus + - sugarss - supports-color + - terser dev: true /vite-plugin-eslint@1.8.1(eslint@8.29.0)(vite@3.2.4): @@ -21500,6 +21566,18 @@ packages: typescript: 4.9.3 dev: true + /vue-tsc@1.8.4(typescript@4.9.3): + resolution: {integrity: sha512-+hgpOhIx11vbi8/AxEdaPj3fiRwN9wy78LpsNNw2V995/IWa6TMyQxHbaw2ZKUpdwjySSHgrT6ohDEhUgFxGYw==} + hasBin: true + peerDependencies: + typescript: '*' + dependencies: + '@vue/language-core': 1.8.4(typescript@4.9.3) + '@vue/typescript': 1.8.4(typescript@4.9.3) + semver: 7.3.8 + typescript: 4.9.3 + dev: true + /vue@2.7.1: resolution: {integrity: sha512-X1YkFddhbTAU2FPK0gBZ/vDOcOMA8ZT4uHoFVor1bUb7BpVGdEswS286YGtODsf/Ghfr1LM1sBMFAY8XT+dVhA==} dependencies: @@ -22290,7 +22368,7 @@ packages: dev: false /yeast@0.1.2: - resolution: {integrity: sha1-AI4G2AlDIMNy28L47XagymyKxBk=} + resolution: {integrity: sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==} dev: false /yn@3.1.1: From 82b6e08d6820bed28b8a5d3b65fc85bebd8743cb Mon Sep 17 00:00:00 2001 From: Balu Babu Date: Mon, 17 Jul 2023 12:33:11 +0530 Subject: [PATCH 03/10] fix: fixed issue in team-environment test cases (#3189) --- .../src/team-environments/team-environments.service.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/hoppscotch-backend/src/team-environments/team-environments.service.spec.ts b/packages/hoppscotch-backend/src/team-environments/team-environments.service.spec.ts index 719e58007..254936460 100644 --- a/packages/hoppscotch-backend/src/team-environments/team-environments.service.spec.ts +++ b/packages/hoppscotch-backend/src/team-environments/team-environments.service.spec.ts @@ -306,8 +306,8 @@ describe('TeamEnvironmentsService', () => { ); mockPrisma.teamEnvironment.create.mockResolvedValueOnce({ - ...teamEnvironment, id: 'newid', + ...teamEnvironment, }); const result = await teamEnvironmentsService.createDuplicateEnvironment( @@ -337,8 +337,8 @@ describe('TeamEnvironmentsService', () => { ); mockPrisma.teamEnvironment.create.mockResolvedValueOnce({ - ...teamEnvironment, id: 'newid', + ...teamEnvironment, }); const result = await teamEnvironmentsService.createDuplicateEnvironment( From 9402bb9285cfbbb1d8887f3f2c9765ebddc7d154 Mon Sep 17 00:00:00 2001 From: NicklasWallgren Date: Mon, 17 Jul 2023 17:52:56 +0200 Subject: [PATCH 04/10] fix: add healthcheck for db and remove unwanted volumes (#3150) --- docker-compose.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 417b15002..8c948fcd0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,10 +19,12 @@ services: - DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch?connect_timeout=300 - PORT=3000 volumes: - - ./packages/hoppscotch-backend/:/usr/src/app + # Uncomment the line below when modifying code. Only applicable when using the "dev" target. + # - ./packages/hoppscotch-backend/:/usr/src/app - /usr/src/app/node_modules/ depends_on: - - hoppscotch-db + hoppscotch-db: + condition: service_healthy ports: - "3170:3000" @@ -60,12 +62,20 @@ services: # you are using an external postgres instance # This will be exposed at port 5432 hoppscotch-db: - image: postgres + image: postgres:15 ports: - "5432:5432" + user: postgres environment: + # The default user defined by the docker image + POSTGRES_USER: postgres # NOTE: Please UPDATE THIS PASSWORD! POSTGRES_PASSWORD: testpass POSTGRES_DB: hoppscotch + healthcheck: + test: ["CMD-SHELL", "sh -c 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'"] + interval: 5s + timeout: 5s + retries: 10 From 51efb35aa6eef01ad20a973a55333c92ceb795fb Mon Sep 17 00:00:00 2001 From: Anwarul Islam Date: Tue, 18 Jul 2023 00:26:08 +0600 Subject: [PATCH 05/10] fix: keybinding modifier issue (#3163) --- .../src/helpers/keybindings.ts | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/packages/hoppscotch-common/src/helpers/keybindings.ts b/packages/hoppscotch-common/src/helpers/keybindings.ts index f2f62f128..0f703ebb7 100644 --- a/packages/hoppscotch-common/src/helpers/keybindings.ts +++ b/packages/hoppscotch-common/src/helpers/keybindings.ts @@ -14,7 +14,13 @@ let keybindingsEnabled = true * Alt is also regarded as macOS OPTION (⌥) key * Ctrl is also regarded as macOS COMMAND (⌘) key (NOTE: this differs from HTML Keyboard spec where COMMAND is Meta key!) */ -type ModifierKeys = "ctrl" | "alt" | "ctrl-shift" | "alt-shift" +type ModifierKeys = + | "ctrl" + | "alt" + | "ctrl-shift" + | "alt-shift" + | "ctrl-alt" + | "ctrl-alt-shift" /* eslint-disable prettier/prettier */ // prettier-ignore @@ -143,18 +149,19 @@ function getPressedKey(ev: KeyboardEvent): Key | null { } function getActiveModifier(ev: KeyboardEvent): ModifierKeys | null { - const isShiftKey = ev.shiftKey + const modifierKeys = { + ctrl: isAppleDevice() ? ev.metaKey : ev.ctrlKey, + alt: ev.altKey, + shift: ev.shiftKey, + } - // We only allow one modifier key to be pressed (for now) - // Control key (+ Command) gets priority and if Alt is also pressed, it is ignored - if (isAppleDevice() && ev.metaKey) return isShiftKey ? "ctrl-shift" : "ctrl" - else if (!isAppleDevice() && ev.ctrlKey) - return isShiftKey ? "ctrl-shift" : "ctrl" + // active modifier: ctrl | alt | ctrl-alt | ctrl-shift | ctrl-alt-shift | alt-shift + // modiferKeys object's keys are sorted to match the above order + const activeModifier = Object.keys(modifierKeys) + .filter((key) => modifierKeys[key as keyof typeof modifierKeys]) + .join("-") - // Test for Alt key - if (ev.altKey) return isShiftKey ? "alt-shift" : "alt" - - return null + return activeModifier === "" ? null : (activeModifier as ModifierKeys) } /** From 39842559b5c636aa04efe5f24a947fa68482f1a2 Mon Sep 17 00:00:00 2001 From: NicklasWallgren Date: Mon, 17 Jul 2023 20:38:06 +0200 Subject: [PATCH 06/10] fix: reduce the memory consumption during build to prevent OOM (#3148) Co-authored-by: Nicklas Wallgren Co-authored-by: Andrew Bastin --- .dockerignore | 1 + packages/hoppscotch-common/src/components.d.ts | 6 +++++- packages/hoppscotch-selfhost-web/Dockerfile | 2 +- packages/hoppscotch-selfhost-web/package.json | 2 +- packages/hoppscotch-sh-admin/Dockerfile | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..c25925208 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +*/**/node_modules diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts index 9ed2d2c9f..a5bb515ab 100644 --- a/packages/hoppscotch-common/src/components.d.ts +++ b/packages/hoppscotch-common/src/components.d.ts @@ -82,17 +82,18 @@ declare module '@vue/runtime-core' { 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'] HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture'] - HoppSmartPlaceholder: typeof import('@hoppscotch/ui')['HoppSmartPlaceholder'] 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'] + HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle'] HoppSmartWindow: typeof import('@hoppscotch/ui')['HoppSmartWindow'] HoppSmartWindows: typeof import('@hoppscotch/ui')['HoppSmartWindows'] HttpAuthorization: typeof import('./components/http/Authorization.vue')['default'] @@ -122,6 +123,7 @@ declare module '@vue/runtime-core' { HttpURLEncodedParams: typeof import('./components/http/URLEncodedParams.vue')['default'] IconLucideAlertTriangle: typeof import('~icons/lucide/alert-triangle')['default'] IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'] + IconLucideBrush: typeof import('~icons/lucide/brush')['default'] IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default'] IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default'] IconLucideGlobe: typeof import('~icons/lucide/globe')['default'] @@ -131,8 +133,10 @@ declare module '@vue/runtime-core' { IconLucideLayers: typeof import('~icons/lucide/layers')['default'] IconLucideListEnd: typeof import('~icons/lucide/list-end')['default'] IconLucideMinus: typeof import('~icons/lucide/minus')['default'] + IconLucideRss: typeof import('~icons/lucide/rss')['default'] IconLucideSearch: typeof import('~icons/lucide/search')['default'] IconLucideUsers: typeof import('~icons/lucide/users')['default'] + IconLucideVerified: typeof import('~icons/lucide/verified')['default'] LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default'] LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default'] LensesRenderersAudioLensRenderer: typeof import('./components/lenses/renderers/AudioLensRenderer.vue')['default'] diff --git a/packages/hoppscotch-selfhost-web/Dockerfile b/packages/hoppscotch-selfhost-web/Dockerfile index bd35ab288..b43ae334d 100644 --- a/packages/hoppscotch-selfhost-web/Dockerfile +++ b/packages/hoppscotch-selfhost-web/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /usr/src/app RUN npm i -g pnpm COPY . . -RUN pnpm install +RUN pnpm install --force --frozen-lockfile WORKDIR /usr/src/app/packages/hoppscotch-selfhost-web/ RUN pnpm run build diff --git a/packages/hoppscotch-selfhost-web/package.json b/packages/hoppscotch-selfhost-web/package.json index e63437ca3..d5ca77c34 100644 --- a/packages/hoppscotch-selfhost-web/package.json +++ b/packages/hoppscotch-selfhost-web/package.json @@ -7,7 +7,7 @@ "dev:vite": "vite", "dev:gql-codegen": "graphql-codegen --require dotenv/config --config gql-codegen.yml dotenv_config_path=\"../../.env\" --watch", "dev": "pnpm exec npm-run-all -p -l dev:*", - "build": "node --max_old_space_size=16384 ./node_modules/vite/bin/vite.js build", + "build": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build", "preview": "vite preview", "lint": "eslint src --ext .ts,.js,.vue --ignore-path .gitignore .", "lint:ts": "vue-tsc --noEmit", diff --git a/packages/hoppscotch-sh-admin/Dockerfile b/packages/hoppscotch-sh-admin/Dockerfile index 9795de122..9a1f98f38 100644 --- a/packages/hoppscotch-sh-admin/Dockerfile +++ b/packages/hoppscotch-sh-admin/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /usr/src/app RUN npm i -g pnpm COPY . . -RUN pnpm install +RUN pnpm install --force --frozen-lockfile WORKDIR /usr/src/app/packages/hoppscotch-sh-admin/ RUN pnpm run build From 6496bea846ee80baff72d0262e46c0c2c1528b8f Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Tue, 18 Jul 2023 21:37:19 +0530 Subject: [PATCH 07/10] chore: bump version to 2023.4.8 --- packages/hoppscotch-backend/package.json | 2 +- packages/hoppscotch-common/package.json | 2 +- .../hoppscotch-common/src/components.d.ts | 38 ------------------- packages/hoppscotch-selfhost-web/package.json | 2 +- packages/hoppscotch-sh-admin/package.json | 2 +- 5 files changed, 4 insertions(+), 42 deletions(-) diff --git a/packages/hoppscotch-backend/package.json b/packages/hoppscotch-backend/package.json index eaf675eaf..e0ad0802a 100644 --- a/packages/hoppscotch-backend/package.json +++ b/packages/hoppscotch-backend/package.json @@ -1,6 +1,6 @@ { "name": "hoppscotch-backend", - "version": "2023.4.7", + "version": "2023.4.8", "description": "", "author": "", "private": true, diff --git a/packages/hoppscotch-common/package.json b/packages/hoppscotch-common/package.json index f8f7becdc..a6373f5db 100644 --- a/packages/hoppscotch-common/package.json +++ b/packages/hoppscotch-common/package.json @@ -1,7 +1,7 @@ { "name": "@hoppscotch/common", "private": true, - "version": "2023.4.7", + "version": "2023.4.8", "scripts": { "dev": "pnpm exec npm-run-all -p -l dev:*", "dev:vite": "vite", diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts index a5bb515ab..8f040fcda 100644 --- a/packages/hoppscotch-common/src/components.d.ts +++ b/packages/hoppscotch-common/src/components.d.ts @@ -74,28 +74,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'] - HoppSmartIntersection: typeof import('@hoppscotch/ui')['HoppSmartIntersection'] - HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem'] - HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink'] - HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal'] - HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture'] - 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'] - HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle'] - 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'] @@ -121,22 +99,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'] - IconLucideAlertTriangle: typeof import('~icons/lucide/alert-triangle')['default'] - IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'] - IconLucideBrush: typeof import('~icons/lucide/brush')['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'] - IconLucideListEnd: typeof import('~icons/lucide/list-end')['default'] - IconLucideMinus: typeof import('~icons/lucide/minus')['default'] - IconLucideRss: typeof import('~icons/lucide/rss')['default'] - IconLucideSearch: typeof import('~icons/lucide/search')['default'] - IconLucideUsers: typeof import('~icons/lucide/users')['default'] - IconLucideVerified: typeof import('~icons/lucide/verified')['default'] LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default'] LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default'] LensesRenderersAudioLensRenderer: typeof import('./components/lenses/renderers/AudioLensRenderer.vue')['default'] diff --git a/packages/hoppscotch-selfhost-web/package.json b/packages/hoppscotch-selfhost-web/package.json index d5ca77c34..ed7fec799 100644 --- a/packages/hoppscotch-selfhost-web/package.json +++ b/packages/hoppscotch-selfhost-web/package.json @@ -1,7 +1,7 @@ { "name": "@hoppscotch/selfhost-web", "private": true, - "version": "2023.4.7", + "version": "2023.4.8", "type": "module", "scripts": { "dev:vite": "vite", diff --git a/packages/hoppscotch-sh-admin/package.json b/packages/hoppscotch-sh-admin/package.json index aa03113d0..5995eb1c6 100644 --- a/packages/hoppscotch-sh-admin/package.json +++ b/packages/hoppscotch-sh-admin/package.json @@ -1,7 +1,7 @@ { "name": "hoppscotch-sh-admin", "private": true, - "version": "2023.4.7", + "version": "2023.4.8", "type": "module", "scripts": { "dev": "pnpm exec npm-run-all -p -l dev:*", From e869d49e16bf1df0da127c15397573dea20eeb3b Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Tue, 18 Jul 2023 21:41:38 +0530 Subject: [PATCH 08/10] chore: run tests on and against release branches --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2cf042711..9a2af6430 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Node.js CI on: push: - branches: [main, staging] + branches: [main, staging, "release/**"] pull_request: - branches: [main, staging] + branches: [main, staging, "release/**"] jobs: test: From 29171d1b6fbfef71ae30e268dab43670be3c8658 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Tue, 18 Jul 2023 22:27:37 +0530 Subject: [PATCH 09/10] fix: generate-ui failing to build --- packages/hoppscotch-ui/src/components/smart/Anchor.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hoppscotch-ui/src/components/smart/Anchor.vue b/packages/hoppscotch-ui/src/components/smart/Anchor.vue index 21abcc389..b6bf55839 100644 --- a/packages/hoppscotch-ui/src/components/smart/Anchor.vue +++ b/packages/hoppscotch-ui/src/components/smart/Anchor.vue @@ -26,7 +26,7 @@