3 files changed, 30 insertions, 55 deletions

diff --git a/lib/python/qmk/cli/docs.py b/lib/python/qmk/cli/docs.py
index c24b914bc1..d28dddf194 100644
--- a/lib/python/qmk/cli/docs.py
+++ b/lib/python/qmk/cli/docs.py
@@ -1,44 +1,27 @@
 """Serve QMK documentation locally
 """
-import http.server
-import os
 import shutil
-import webbrowser
+from qmk.docs import prepare_docs_build_area, run_docs_command
 
 from milc import cli
 
 
-@cli.argument('-p', '--port', default=8936, type=int, help='Port number to use.')
-@cli.argument('-b', '--browser', action='store_true', help='Open the docs in the default browser.')
 @cli.subcommand('Run a local webserver for QMK documentation.', hidden=False if cli.config.user.developer else True)
 def docs(cli):
     """Spin up a local HTTP server for the QMK docs.
     """
-    os.chdir('docs')
 
-    # If docsify-cli is installed, run that instead so we get live reload
-    if shutil.which('docsify'):
-        command = ['docsify', 'serve', '--port', f'{cli.config.docs.port}', '--open' if cli.config.docs.browser else '']
+    if not shutil.which('doxygen'):
+        cli.log.error('doxygen is not installed. Please install it and try again.')
+        return
 
-        cli.log.info(f"Running {{fg_cyan}}{str.join(' ', command)}{{fg_reset}}")
-        cli.log.info("Press Control+C to exit.")
+    if not shutil.which('yarn'):
+        cli.log.error('yarn is not installed. Please install it and try again.')
+        return
 
-        try:
-            cli.run(command, capture_output=False)
-        except KeyboardInterrupt:
-            cli.log.info("Stopping HTTP server...")
-    else:
-        # Fall back to Python HTTPServer
-        with http.server.HTTPServer(('', cli.config.docs.port), http.server.SimpleHTTPRequestHandler) as httpd:
-            cli.log.info(f"Serving QMK docs at http://localhost:{cli.config.docs.port}/")
-            cli.log.info("Press Control+C to exit.")
+    if not prepare_docs_build_area(is_production=False):
+        return False
 
-            if cli.config.docs.browser:
-                webbrowser.open(f'http://localhost:{cli.config.docs.port}')
-
-            try:
-                httpd.serve_forever()
-            except KeyboardInterrupt:
-                cli.log.info("Stopping HTTP server...")
-            finally:
-                httpd.shutdown()
+    if not cli.config.general.verbose:
+        cli.log.info('Serving docs at http://localhost:5173/ (Ctrl+C to stop)')
+    run_docs_command('run', 'docs:dev')
diff --git a/lib/python/qmk/cli/generate/docs.py b/lib/python/qmk/cli/generate/docs.py
index eb3099e138..5821d43b86 100644
--- a/lib/python/qmk/cli/generate/docs.py
+++ b/lib/python/qmk/cli/generate/docs.py
@@ -1,18 +1,12 @@
 """Build QMK documentation locally
 """
 import shutil
-from pathlib import Path
-from subprocess import DEVNULL
+from qmk.docs import prepare_docs_build_area, run_docs_command, BUILD_DOCS_PATH
 
 from milc import cli
 
-DOCS_PATH = Path('docs/')
-BUILD_PATH = Path('.build/')
-BUILD_DOCS_PATH = BUILD_PATH / 'docs'
-DOXYGEN_PATH = BUILD_PATH / 'doxygen'
-MOXYGEN_PATH = BUILD_DOCS_PATH / 'internals'
-
 
+@cli.argument('-s', '--serve', arg_only=True, action='store_true', help="Serves the generated docs once built.")
 @cli.subcommand('Build QMK documentation.', hidden=False if cli.config.user.developer else True)
 def generate_docs(cli):
     """Invoke the docs generation process
@@ -21,24 +15,22 @@ def generate_docs(cli):
         * [ ] Add a real build step... something static docs
     """
 
-    if BUILD_DOCS_PATH.exists():
-        shutil.rmtree(BUILD_DOCS_PATH)
-    if DOXYGEN_PATH.exists():
-        shutil.rmtree(DOXYGEN_PATH)
-
-    shutil.copytree(DOCS_PATH, BUILD_DOCS_PATH)
+    if not shutil.which('doxygen'):
+        cli.log.error('doxygen is not installed. Please install it and try again.')
+        return
 
-    # When not verbose we want to hide all output
-    args = {
-        'capture_output': False if cli.config.general.verbose else True,
-        'check': True,
-        'stdin': DEVNULL,
-    }
+    if not shutil.which('yarn'):
+        cli.log.error('yarn is not installed. Please install it and try again.')
+        return
 
-    cli.log.info('Generating docs...')
-
-    # Generate internal docs
-    cli.run(['doxygen', 'Doxyfile'], **args)
-    cli.run(['moxygen', '-q', '-g', '-o', MOXYGEN_PATH / '%s.md', DOXYGEN_PATH / 'xml'], **args)
+    if not prepare_docs_build_area(is_production=True):
+        return False
 
+    cli.log.info('Building vitepress docs')
+    run_docs_command('run', 'docs:build')
     cli.log.info('Successfully generated docs to %s.', BUILD_DOCS_PATH)
+
+    if cli.args.serve:
+        if not cli.config.general.verbose:
+            cli.log.info('Serving docs at http://localhost:4173/ (Ctrl+C to stop)')
+        run_docs_command('run', 'docs:preview')
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 37bf2923d6..56bd05e1e3 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -133,7 +133,7 @@ def _question(*args, **kwargs):
 def prompt_keyboard():
     prompt = """{fg_yellow}Name Your Keyboard Project{style_reset_all}
 For more infomation, see:
-https://docs.qmk.fm/#/hardware_keyboard_guidelines?id=naming-your-keyboardproject
+https://docs.qmk.fm/hardware_keyboard_guidelines#naming-your-keyboard-project
 
 Keyboard Name? """