From 9256871d6234e191752da706a901b75f059e1051 Mon Sep 17 00:00:00 2001 From: stelzo Date: Tue, 21 Jan 2025 23:49:47 +0100 Subject: [PATCH] const vendor dir name --- crates/typst-cli/src/vendor.rs | 4 ++-- crates/typst-kit/src/package.rs | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/crates/typst-cli/src/vendor.rs b/crates/typst-cli/src/vendor.rs index 08bd4c1bd..a6e36a55a 100644 --- a/crates/typst-cli/src/vendor.rs +++ b/crates/typst-cli/src/vendor.rs @@ -5,7 +5,7 @@ use typst::{ diag::{bail, HintedStrResult, Warned}, layout::PagedDocument, }; -use typst_kit::package::DEFAULT_PACKAGES_SUBDIR; +use typst_kit::package::{DEFAULT_PACKAGES_SUBDIR, DEFAULT_VENDOR_SUBDIR}; use crate::{ args::VendorCommand, compile::print_diagnostics, set_failed, world::SystemWorld, @@ -46,7 +46,7 @@ pub fn vendor(command: &VendorCommand) -> HintedStrResult<()> { } fn copy_deps(world: &mut SystemWorld) -> HintedStrResult<()> { - let vendor_dir = world.workdir().join("vendor"); + let vendor_dir = world.workdir().join(DEFAULT_VENDOR_SUBDIR); match vendor_dir.try_exists() { Ok(false) => { diff --git a/crates/typst-kit/src/package.rs b/crates/typst-kit/src/package.rs index 0ab8e943d..ea561f6a4 100644 --- a/crates/typst-kit/src/package.rs +++ b/crates/typst-kit/src/package.rs @@ -21,6 +21,9 @@ pub const DEFAULT_NAMESPACE: &str = "preview"; /// The default packages sub directory within the package and package cache paths. pub const DEFAULT_PACKAGES_SUBDIR: &str = "typst/packages"; +/// The default vendor sub directory within the project root. +pub const DEFAULT_VENDOR_SUBDIR: &str = "vendor"; + /// Holds information about where packages should be stored and downloads them /// on demand, if possible. #[derive(Debug)] @@ -84,7 +87,7 @@ impl PackageStorage { // Read from vendor dir if it exists. if let Some(project_root) = project_root { - let vendor_dir = project_root.join("vendor"); + let vendor_dir = project_root.join(DEFAULT_VENDOR_SUBDIR); if let Ok(true) = vendor_dir.try_exists() { let dir = vendor_dir.join(&subdir); if dir.exists() {