Fix/dev hints (#304)

* chore: remove unused axios dep; replace npm run with node --run

axios was listed as a direct UI dependency but had no import sites.
Switch MagicMirror start command and CI lint step from `npm run` to
`node --run` (available in Node 22+, matches the current test matrix).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: replace git checkout . with git restore . for working tree reset

git restore is the correct modern replacement for discarding working
tree changes; git switch is for branch switching.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* build: update dependencies

* chore: fix build with nix

* chore: fix setup with bun.nix prevent modifications to file when not needed

* chore: add pre-commit script to unify version location

* docs: update changelog

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Bee-Mar

.github/workflows/workflow.yaml

@@ -134,7 +134,7 @@ jobs:
 
       - name: Angular Lint
         run: |
-          cd ui && npm run lint && cd ..
+          cd ui && node --run lint && cd ..
 
       - name: Angular Unit Tests
         run: |

CHANGELOG.md

@@ -462,3 +462,22 @@
 
 - Bumping version to 4.6.2 to trigger a new build
 - Stale cache within CI/CD pipeline caused incorrect wheels to be built thus producing inconsistent builds
+
+## Version 4.6.3
+
+### Bug Fixes
+
+- Fixed working tree reset in `MagicMirrorPackage.upgrade()` to use `git restore .` instead of the deprecated `git checkout .`; `git restore` is the correct modern command for discarding working tree changes
+
+### Build
+
+- Fixed `nix build` failure caused by Angular attempting to inline Google Fonts over the network during the production build; disabled `optimization.fonts.inline` in the production configuration so fonts continue to load at runtime via `<link>` as intended
+- Fixed `postinstall` script bash quoting bug where `[ -x $(command -v b2n) ]` evaluated truthy when `b2n` was absent, causing a spurious "command not found" error in the Nix sandbox
+- Updated Python and UI dependencies
+
+### Tooling
+
+- `bun.nix` no longer regenerates on every `direnv reload` / shell entry; the devshell now runs `bun install --ignore-scripts` to skip lifecycle scripts during shell initialization, and `lock` explicitly regenerates `bun.nix` after `bun update`
+- Added `sync:version` pre-commit hook that reads the version from `pyproject.toml` and keeps `mmpm/__version__.py` and `ui/package.json` in sync automatically on every commit
+- Removed unused `axios` dependency from the UI
+- Replaced `npm run` with `node --run` in the MagicMirror start command and CI lint step (requires Node 22+)

flake.lock

@@ -127,6 +127,31 @@
               };
 
               nixfmt.enable = true;
+
+              sync-version = {
+                enable = true;
+                name = "sync:version";
+                stages = [ "pre-commit" ];
+                pass_filenames = false;
+                entry = toString (
+                  pkgs.writeShellScript "sync-version" ''
+                    set -euo pipefail
+                    VERSION=$(${pkgs.python3}/bin/python3 -c "import tomllib; f=open('pyproject.toml','rb'); print(tomllib.load(f)['project']['version'])")
+                    IFS='.' read -r MAJOR MINOR PATCH <<< "''${VERSION}"
+                    printf '%s\n' \
+                      "major = ''${MAJOR}" \
+                      "minor = ''${MINOR}" \
+                      "patch = ''${PATCH}" \
+                      "" \
+                      'version = f"{major}.{minor}.{patch}"' \
+                      > mmpm/__version__.py
+                    ${pkgs.gnused}/bin/sed -i \
+                      "s/\"version\": \"[^\"]*\"/\"version\": \"''${VERSION}\"/" \
+                      ui/package.json
+                    git add mmpm/__version__.py ui/package.json
+                  ''
+                );
+              };
             };
           };
         }
@@ -219,16 +244,16 @@
           };
 
           # ---- Utility Scripts
-          start = pkgs.writeShellScriptBin "start" ''pm2 start dev/ecosystem.json'';
-          stop = pkgs.writeShellScriptBin "stop" ''pm2 stop mmpm'';
-          remove = pkgs.writeShellScriptBin "remove" ''pm2 delete mmpm'';
-          logs = pkgs.writeShellScriptBin "logs" ''pm2 logs mmpm'';
+          start = pkgs.writeShellScriptBin "start" "pm2 start dev/ecosystem.json";
+          stop = pkgs.writeShellScriptBin "stop" "pm2 stop mmpm";
+          remove = pkgs.writeShellScriptBin "remove" "pm2 delete mmpm";
+          logs = pkgs.writeShellScriptBin "logs" "pm2 logs mmpm";
 
           unit-tests = pkgs.writeShellScriptBin "unit-tests" ''
             uv run coverage run -m pytest
             CHROME_BIN=${pkgs.chromium}/bin/chromium bun --cwd=ui run test --watch=false --browsers=ChromeHeadlessNoSandbox
           '';
-          static-analysis = pkgs.writeShellScriptBin "static-analysis" ''uv run mypy mmpm'';
+          static-analysis = pkgs.writeShellScriptBin "static-analysis" "uv run mypy mmpm";
 
           format = pkgs.writeShellScriptBin "format" ''
             uv run ruff format mmpm tests
@@ -249,6 +274,7 @@
           lock = pkgs.writeShellScriptBin "lock" ''
             uv lock --upgrade
             bun --cwd=ui update
+            (cd ui && ${bun2nix.packages.${system}.default}/bin/bun2nix -o bun.nix)
           '';
 
           deploy = pkgs.writeShellScriptBin "deploy" ''
@@ -336,7 +362,7 @@
 
               source $VIRTUAL_ENV/bin/activate
               uv sync
-              bun --cwd=ui install
+              bun --cwd=ui install --ignore-scripts
             '';
           };
         }

flake.nix

@@ -1,5 +1,5 @@
 major = 4
 minor = 6
-patch = 2
+patch = 3
 
 version = f"{major}.{minor}.{patch}"

mmpm/__version__.py

@@ -188,7 +188,7 @@ def _detect_display_server_script() -> str:
 
     def start(self) -> bool:
         """
-        Launches MagicMirror using pm2, if found, otherwise a 'npm start' is run as
+        Launches MagicMirror using pm2, if found, otherwise a 'node --run' is run as
         a background process
 
         Parameters:
@@ -199,7 +199,7 @@ def start(self) -> bool:
         """
         script = self._detect_display_server_script()
         os.environ["ELECTRON_DISABLE_SANDBOX"] = "1"
-        command = ["npm", "run", script]
+        command = ["node", "--run", script]
 
         pm2_process = str(self.env.MMPM_MAGICMIRROR_PM2_PROCESS_NAME.get())
         compose_file = str(self.env.MMPM_MAGICMIRROR_DOCKER_COMPOSE_FILE.get())
@@ -228,7 +228,7 @@ def start(self) -> bool:
         error_code, _, stderr = run_cmd(
             command,
             message="Starting MagicMirror",
-            background=bool(command[0] == "npm"),
+            background=bool(command[0] == "node"),
         )
 
         if error_code:

mmpm/magicmirror/controller.py

@@ -121,10 +121,10 @@ def upgrade(self):
 
         os.chdir(root_dir)
 
-        error_code, _, stderr = run_cmd(["git", "checkout", "."], progress=False)
+        error_code, _, stderr = run_cmd(["git", "restore", "."], progress=False)
 
         if error_code:
-            message = "Failed to checkout MagicMirror repo for clean upgrade"
+            message = "Failed to restore MagicMirror repo for clean upgrade"
             logger.error(f"{message}. See `mmpm logs` for details")
             return stderr
 

mmpm/magicmirror/magicmirror.py

@@ -1,6 +1,6 @@
 [project]
 name = "mmpm"
-version = "4.6.2"
+version = "4.6.3"
 description = "MMPM, the MagicMirror Package Manager CLI simplifies the installation, removal, and general maintenance of MagicMirror packages"
 
 authors = [

pyproject.toml

@@ -46,15 +46,15 @@ def test_start_with_npm(self, mock_env, mock_chdir, mock_which, mock_run_cmd, mo
         mock_env.return_value.MMPM_MAGICMIRROR_DOCKER_COMPOSE_FILE.get.return_value = None
         mock_env.return_value.MMPM_MAGICMIRROR_ROOT.get.return_value = "/path/to/magicmirror"
         mock_exists.return_value = True
-        mock_which.side_effect = lambda x: "/usr/bin/" + x if x in ["npm"] else None
+        mock_which.side_effect = lambda x: "/usr/bin/" + x if x in ["node"] else None
         mock_run_cmd.return_value = (0, "", "")  # Simulate successful command execution
 
         # Instantiate and start MagicMirror
         controller = MagicMirrorController()
         success = controller.start()
         self.assertTrue(success)
         args, kwargs = mock_run_cmd.call_args
-        self.assertEqual(args[0][:2], ["npm", "run"])
+        self.assertEqual(args[0][:2], ["node", "--run"])
         self.assertIn(args[0][2], ["start:x11", "start:wayland", "start:windows"])
         self.assertEqual(kwargs.get("message"), "Starting MagicMirror")
         self.assertTrue(kwargs.get("background"))
@@ -331,7 +331,7 @@ def test_returns_x11_as_fallback_with_no_env(self):
                 self.assertEqual(MagicMirrorController._detect_display_server_script(), "start:x11")
 
     def test_start_uses_detected_script(self):
-        """start() passes the detected script to npm run."""
+        """start() passes the detected script to node --run."""
         from mmpm.singleton import Singleton
 
         Singleton._instances = {}
@@ -350,7 +350,7 @@ def test_start_uses_detected_script(self):
 
         self.assertTrue(result)
         args, _ = mock_run_cmd.call_args
-        self.assertEqual(args[0], ["npm", "run", "start:wayland"])
+        self.assertEqual(args[0], ["node", "--run", "start:wayland"])
 
 
 class TestMagicMirrorControllerErrors(unittest.TestCase):

tests/magicmirror/test_controller.py

@@ -215,8 +215,8 @@ def test_upgrade_root_not_exists(self):
         self.assertFalse(result)
 
     @patch("mmpm.magicmirror.magicmirror.run_cmd")
-    def test_upgrade_git_checkout_fails(self, mock_run_cmd):
-        """Lines 129-131: returns stderr string when git checkout fails."""
+    def test_upgrade_git_restore_fails(self, mock_run_cmd):
+        """Lines 129-131: returns stderr string when git restore fails."""
         mm = MagicMirror()
         mm.env = MockedMMPMEnv()
         root = mm.env.MMPM_MAGICMIRROR_ROOT.get()