diff --git a/devenv.lock b/devenv.lock index b22ef4ed..1307a977 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,10 +3,10 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1738772960, + "lastModified": 1761922975, "owner": "cachix", "repo": "devenv", - "rev": "7f756cdf3fbb01cab243dcec4de0ca94e6aaa2af", + "rev": "c9f0b47815a4895fadac87812de8a4de27e0ace1", "type": "github" }, "original": { @@ -24,10 +24,10 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1738737274, + "lastModified": 1762238689, "owner": "nix-community", "repo": "fenix", - "rev": "f82de9980822f3b1efcf54944939b1d514386827", + "rev": "0f94d1e67ea9ef983a9b5caf9c14bc52ae2eac44", "type": "github" }, "original": { @@ -39,10 +39,10 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, + "lastModified": 1761588595, "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -60,10 +60,10 @@ ] }, "locked": { - "lastModified": 1737465171, + "lastModified": 1760663237, "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -94,10 +94,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738734093, + "lastModified": 1762156382, "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b2753b0356d1c951d7a3ef1d086ba5a71fff43c", + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "type": "github" }, "original": { @@ -115,16 +115,17 @@ "nixpkgs": "nixpkgs", "pre-commit-hooks": [ "git-hooks" - ] + ], + "rust-overlay": "rust-overlay" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738754241, + "lastModified": 1762201112, "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3", + "rev": "132d3338f4526b5c71046e5dc7ddf800e279daf4", "type": "github" }, "original": { @@ -133,6 +134,25 @@ "repo": "rust-analyzer", "type": "github" } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762223900, + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "cfe1598d69a42a5edb204770e71b8df77efef2c3", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } } }, "root": "root", diff --git a/devenv.nix b/devenv.nix index 5b0b64ba..f9ff690b 100644 --- a/devenv.nix +++ b/devenv.nix @@ -7,12 +7,7 @@ let else pkgs; darwinPackages = with pkgs; [ - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.WebKit + apple-sdk ]; linuxPackages = with pkgs; [ @@ -172,6 +167,10 @@ in { npm.enable = true; pnpm.enable = true; }; + go = { + enable = true; + package = pkgs.go_1_24; + }; rust = { enable = true; channel = "nightly"; diff --git a/devenv.yaml b/devenv.yaml index 9ee9ba34..d0169201 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -1,23 +1,14 @@ -# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json inputs: - # For NodeJS-22 and above - nixpkgs: - url: github:NixOS/nixpkgs/nixpkgs-unstable - # nixpkgs: - # url: github:cachix/devenv-nixpkgs/rolling fenix: url: github:nix-community/fenix inputs: nixpkgs: follows: nixpkgs - -# If you're using non-OSS software, you can set allowUnfree to true. + nixpkgs: + url: github:NixOS/nixpkgs/nixpkgs-unstable + rust-overlay: + url: github:oxalica/rust-overlay + inputs: + nixpkgs: + follows: nixpkgs allowUnfree: true - -# If you're willing to use a package that's vulnerable -# permittedInsecurePackages: -# - "openssl-1.1.1w" - -# If you have more than one devenv you can merge them -#imports: -# - ./backend diff --git a/packages/hoppscotch-common/.eslintrc.js b/packages/hoppscotch-common/.eslintrc.js index f69f0f80..63fdd568 100644 --- a/packages/hoppscotch-common/.eslintrc.js +++ b/packages/hoppscotch-common/.eslintrc.js @@ -47,8 +47,14 @@ module.exports = { "vue/no-side-effects-in-computed-properties": "off", "import/no-named-as-default": "off", "import/no-named-as-default-member": "off", - "@typescript-eslint/no-unused-vars": + "@typescript-eslint/no-unused-vars": [ process.env.HOPP_LINT_FOR_PROD === "true" ? "error" : "warn", + { + argsIgnorePattern: "^_", + varsIgnorePattern: "^_", + caughtErrorsIgnorePattern: "^_", + }, + ], "@typescript-eslint/no-non-null-assertion": "off", "@typescript-eslint/no-explicit-any": "off", "import/default": "off", diff --git a/packages/hoppscotch-common/locales/en.json b/packages/hoppscotch-common/locales/en.json index 22a6bf95..c14f3b4d 100644 --- a/packages/hoppscotch-common/locales/en.json +++ b/packages/hoppscotch-common/locales/en.json @@ -877,7 +877,28 @@ "add_new": "Add a new instance", "confirm_remove": "Confirm Removal", "remove_warning": "Are you sure you want to remove this instance?", - "clear_cached_bundles": "Clear cached bundles" + "clear_cached_bundles": "Clear cached bundles", + "opening_add_modal": "Opening add instance dialog", + "closed_add_modal": "Add instance dialog closed", + "cancelled_removal": "Instance removal cancelled", + "connection_cancelled": "Connection cancelled by pre-connect validation", + "post_connect_completed": "Post-connection setup completed", + "connecting": "Connecting to instance...", + "confirm_removal": "Confirm removal of instance", + "removal_cancelled": "Instance removal cancelled by pre-removal validation", + "post_remove_completed": "Post-removal cleanup completed", + "removing": "Removing instance...", + "clearing_cache": "Clearing cache...", + "initialized": "Instance switcher initialized", + "connecting_state": "Establishing connection...", + "connected_state": "Successfully connected to instance", + "disconnected_state": "Disconnected from instance", + "stream_error": "Connection state monitoring failed", + "recent_instances_error": "Failed to load recent instances", + "instance_changed": "Switched to instance", + "current_instance_error": "Failed to track current instance", + "not_available": "Instance switching is not available", + "cleanup_completed": "Instance switcher cleanup completed" }, "inspections": { "description": "Inspect possible errors", diff --git a/packages/hoppscotch-common/src/components/app/Header.vue b/packages/hoppscotch-common/src/components/app/Header.vue index 11ac0b69..a1766f20 100644 --- a/packages/hoppscotch-common/src/components/app/Header.vue +++ b/packages/hoppscotch-common/src/components/app/Header.vue @@ -15,30 +15,21 @@ >
-
- - {{ instanceDisplayName }} - - - {{ platform.instance.displayConfig.description }} - -
+ + {{ + platform.instance.getCurrentInstance?.()?.displayName || + "Hoppscotch" + }} +