add escape hatch

This commit is contained in:
Khaleel Al-Adhami 2024-11-01 15:19:08 -07:00
parent 075825e26c
commit 2ba62a6d63
2 changed files with 9 additions and 5 deletions

View File

@ -467,9 +467,11 @@ def output_system_info():
console.debug(f"{dep}") console.debug(f"{dep}")
console.debug( console.debug(
f"Using package installer at: {prerequisites.get_install_package_manager()}" # type: ignore f"Using package installer at: {prerequisites.get_install_package_manager(on_failure_return_none=True)}" # type: ignore
) )
console.debug(f"Using package executer at: {prerequisites.get_package_manager()}") # type: ignore console.debug(
f"Using package executer at: {prerequisites.get_package_manager(on_failure_return_none=True)}"
) # type: ignore
if system != "Windows": if system != "Windows":
console.debug(f"Unzip path: {path_ops.which('unzip')}") console.debug(f"Unzip path: {path_ops.which('unzip')}")

View File

@ -204,7 +204,7 @@ def get_bun_version() -> version.Version | None:
return None return None
def get_install_package_manager() -> str: def get_install_package_manager(on_failure_return_none: bool = False) -> str | None:
"""Get the package manager executable for installation. """Get the package manager executable for installation.
Currently, bun is used for installation only. Currently, bun is used for installation only.
@ -217,11 +217,11 @@ def get_install_package_manager() -> str:
or windows_check_onedrive_in_path() or windows_check_onedrive_in_path()
or windows_npm_escape_hatch() or windows_npm_escape_hatch()
): ):
return get_package_manager() return get_package_manager(on_failure_return_none)
return str(get_config().bun_path) return str(get_config().bun_path)
def get_package_manager() -> str: def get_package_manager(on_failure_return_none: bool = False) -> str | None:
"""Get the package manager executable for running app. """Get the package manager executable for running app.
Currently on unix systems, npm is used for running the app only. Currently on unix systems, npm is used for running the app only.
@ -234,6 +234,8 @@ def get_package_manager() -> str:
npm_path = path_ops.get_npm_path() npm_path = path_ops.get_npm_path()
if npm_path is not None: if npm_path is not None:
npm_path = str(Path(npm_path).resolve()) npm_path = str(Path(npm_path).resolve())
if on_failure_return_none:
return None
raise FileNotFoundError("NPM not found. You may need to run `reflex init`.") raise FileNotFoundError("NPM not found. You may need to run `reflex init`.")