diff --git a/.gitignore b/.gitignore
index 16982164c42..67d170d66fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,144 @@
-.DS_STORE
-node_modules
-scripts/flow/*/.flowconfig
+# -----------------------------------------------------------------------------
+# SYSTEM FILES
+# -----------------------------------------------------------------------------
+
+.DS_Store
+Thumbs.db
+desktop.ini
+
+# -----------------------------------------------------------------------------
+# NODE / PACKAGE MANAGERS
+# -----------------------------------------------------------------------------
+
+node_modules/
+.pnpm-store/
+.npm/
+.yarn/
+.yarn-cache/
+.yarnrc*
+
+# -----------------------------------------------------------------------------
+# FLOW
+# -----------------------------------------------------------------------------
+
 .flowconfig
+scripts/flow/*/.flowconfig
+
+# -----------------------------------------------------------------------------
+# PYTHON
+# -----------------------------------------------------------------------------
+
+*.py[cod]
+__pycache__/
+
+# -----------------------------------------------------------------------------
+# TEMPORARY / CACHE FILES
+# -----------------------------------------------------------------------------
+
 *~
-*.pyc
-.grunt
+*.swp
+*.swo
+*.tmp
+*.temp
+*.cache
+.module-cache/
+tmp/
+tmp/**
+/tmp/
+
+# -----------------------------------------------------------------------------
+# LOGS
+# -----------------------------------------------------------------------------
+
+*.log
+*.log.*
+logs/
+coverage/
+
+# -----------------------------------------------------------------------------
+# TESTING / BENCHMARKS
+# -----------------------------------------------------------------------------
+
+__benchmarks__/
 _SpecRunner.html
-__benchmarks__
+test/the-files-to-test.generated.js
+
+# -----------------------------------------------------------------------------
+# BUILD OUTPUTS
+# -----------------------------------------------------------------------------
+
 build/
+dist/
 remote-repo/
-coverage/
-.module-cache
+
+# -----------------------------------------------------------------------------
+# REACT FIXTURES
+# -----------------------------------------------------------------------------
+
 fixtures/dom/public/react-dom.js
 fixtures/dom/public/react.js
-test/the-files-to-test.generated.js
-*.log*
-chrome-user-data
+
+# -----------------------------------------------------------------------------
+# IDE / EDITOR
+# -----------------------------------------------------------------------------
+
+.idea/
+.vscode/
+.zed/
+
+*.iml
 *.sublime-project
 *.sublime-workspace
-.idea
-*.iml
-.vscode
-.zed
-*.swp
-*.swo
-/tmp
+
+# -----------------------------------------------------------------------------
+# BROWSER / CHROME
+# -----------------------------------------------------------------------------
+
+chrome-user-data/
+
+# -----------------------------------------------------------------------------
+# WORKTREES
+# -----------------------------------------------------------------------------
+
+.worktrees/
 /.worktrees
+
+# -----------------------------------------------------------------------------
+# CLAUDE
+# -----------------------------------------------------------------------------
+
 .claude/*.local.*
 
-packages/react-devtools-core/dist
-packages/react-devtools-extensions/chrome/build
+# -----------------------------------------------------------------------------
+# DEVTOOLS BUILDS
+# -----------------------------------------------------------------------------
+
+packages/react-devtools-core/dist/
+
+packages/react-devtools-fusebox/dist/
+packages/react-devtools-inline/dist/
+packages/react-devtools-shell/dist/
+packages/react-devtools-timeline/dist/
+
+# -----------------------------------------------------------------------------
+# CHROME EXTENSION
+# -----------------------------------------------------------------------------
+
+packages/react-devtools-extensions/chrome/build/
 packages/react-devtools-extensions/chrome/*.crx
 packages/react-devtools-extensions/chrome/*.pem
-packages/react-devtools-extensions/firefox/build
+
+# -----------------------------------------------------------------------------
+# FIREFOX EXTENSION
+# -----------------------------------------------------------------------------
+
+packages/react-devtools-extensions/firefox/build/
 packages/react-devtools-extensions/firefox/*.xpi
 packages/react-devtools-extensions/firefox/*.pem
-packages/react-devtools-extensions/shared/build
-packages/react-devtools-extensions/.tempUserDataDir
-packages/react-devtools-fusebox/dist
-packages/react-devtools-inline/dist
-packages/react-devtools-shell/dist
-packages/react-devtools-timeline/dist
+
+# -----------------------------------------------------------------------------
+# SHARED EXTENSIONS
+# -----------------------------------------------------------------------------
+
+packages/react-devtools-extensions/shared/build/
+packages/react-devtools-extensions/.tempUserDataDir/