From 50259f035829aaf83f78ffb18043842a7f210898 Mon Sep 17 00:00:00 2001
From: Mark Lee <mark.lee@outreach.io>
Date: Wed, 17 Jun 2026 15:59:18 -0700
Subject: [PATCH] feat(shfmt): upgrade to 3.13.1

---
 .editorconfig     |  6 ++++++
 mise.devbase.lock | 23 +++++++++++++++--------
 mise.devbase.toml |  2 +-
 shell/shfmt.sh    |  5 +----
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index af8bb1980..a72d1fd9f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,12 @@ indent_style = tab
 indent_style = space
 indent_size  = 2
 
+# Non-standard config for shfmt
+[[shell]]
+indent_style = space
+indent_size  = 2
+simplify = true
+
 [*.py]
 indent_style = space
 indent_size = 4
diff --git a/mise.devbase.lock b/mise.devbase.lock
index ec76db510..729e5ceff 100644
--- a/mise.devbase.lock
+++ b/mise.devbase.lock
@@ -580,29 +580,36 @@ checksum = "sha256:8a4e35ab0b331c85d73567b12f2a444df187f483e5079ceffa6bda1faa2e7
 url = "https://github.com/koalaman/shellcheck/releases/download/v0.11.0/shellcheck-v0.11.0.zip"
 
 [[tools.shfmt]]
-version = "3.7.0"
+version = "3.13.1"
 backend = "aqua:mvdan/sh"
 
 [tools.shfmt."platforms.linux-arm64"]
-url = "https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_linux_arm64"
+checksum = "sha256:32d92acaa5cd8abb29fc49dac123dc412442d5713967819d8af2c29f1b3857c7"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_linux_arm64"
 
 [tools.shfmt."platforms.linux-arm64-musl"]
-url = "https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_linux_arm64"
+checksum = "sha256:32d92acaa5cd8abb29fc49dac123dc412442d5713967819d8af2c29f1b3857c7"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_linux_arm64"
 
 [tools.shfmt."platforms.linux-x64"]
-url = "https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_linux_amd64"
+checksum = "sha256:fb096c5d1ac6beabbdbaa2874d025badb03ee07929f0c9ff67563ce8c75398b1"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_linux_amd64"
 
 [tools.shfmt."platforms.linux-x64-musl"]
-url = "https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_linux_amd64"
+checksum = "sha256:fb096c5d1ac6beabbdbaa2874d025badb03ee07929f0c9ff67563ce8c75398b1"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_linux_amd64"
 
 [tools.shfmt."platforms.macos-arm64"]
-url = "https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_darwin_arm64"
+checksum = "sha256:9680526be4a66ea1ffe988ed08af58e1400fe1e4f4aef5bd88b20bb9b3da33f8"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_darwin_arm64"
 
 [tools.shfmt."platforms.macos-x64"]
-url = "https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_darwin_amd64"
+checksum = "sha256:6feedafc72915794163114f512348e2437d080d0047ef8b8fa2ec63b575f12af"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_darwin_amd64"
 
 [tools.shfmt."platforms.windows-x64"]
-url = "https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_windows_amd64.exe"
+checksum = "sha256:60cd368533d0ad73fa86d93d5bbf95ef40587245ce684ed138c1b31557b5fe97"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_windows_amd64.exe"
 
 [[tools.terraform]]
 version = "1.4.4"
diff --git a/mise.devbase.toml b/mise.devbase.toml
index 48e6ae573..4aed9b6cf 100644
--- a/mise.devbase.toml
+++ b/mise.devbase.toml
@@ -24,7 +24,7 @@ gofumpt = "0.9.2"
 golangci-lint = "2.9.0"
 kubeconform = "0.6.4"
 shellcheck = "0.11.0"
-shfmt = "3.7.0"
+shfmt = "3.13.1"
 terraform = "1.4.4"
 tombi = "0.7.27"
 "github:getoutreach/kubecfg" = "0.34.0"
diff --git a/shell/shfmt.sh b/shell/shfmt.sh
index 73a655c80..2e0f26343 100755
--- a/shell/shfmt.sh
+++ b/shell/shfmt.sh
@@ -9,7 +9,4 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 # shellcheck source=./lib/mise/stub.sh
 source "$DIR/lib/mise/stub.sh"
 
-# Always set simplify mode.
-args=("--simplify" "$@")
-
-mise_exec_tool shfmt "${args[@]}"
+mise_exec_tool shfmt "$@"