chore: merge hoppscotch/main into next-she/main

.dockerignore

@@ -0,0 +1 @@
+*/**/node_modules

.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:

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
 
 

packages/hoppscotch-backend/package.json

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

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(

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,47 +277,47 @@
  "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": "配置",
  "row": "水平版面",
  "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,19 +396,19 @@
  "text": "文字"
  },
  "copy_link": "複製連結",
- "different_collection": "Cannot reorder requests from different collections",
- "duplicated": "Request duplicated",
+ "different_collection": "無法重新排列來自不同集合的請求",
+ "duplicated": "已複製請求",
  "duration": "持續時間",
  "enter_curl": "輸入 cURL",
  "generate_code": "產生程式碼",
  "generated_code": "已產生程式碼",
  "header_list": "請求標頭列表",
  "invalid_name": "請提供請求名稱",
  "method": "方法",
- "moved": "Request moved",
+ "moved": "已移動請求",
  "name": "請求名稱",
  "new": "新請求",
- "order_changed": "Request Order Updated",
+ "order_changed": "已更新請求順序",
  "override": "覆寫",
  "override_help": "在標頭設置 <kbd>Content-Type</kbd>",
  "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": "工作區"
  }
 }

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:*",
  "test": "vitest --run",