extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-12-04 22:32:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into conditional-style

Browse Source
This commit is contained in:
Filip Bachul 2023-08-30 10:35:10 +02:00
commit 69064ad059
13 changed files with 531 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.dprint.json
View File

@ -41,9 +41,9 @@
"target/"
],
"plugins": [
"https://github.com/dprint/dprint-plugin-typescript/releases/download/0.86.1/plugin.wasm",
"https://github.com/dprint/dprint-plugin-typescript/releases/download/0.86.2/plugin.wasm",
"https://github.com/dprint/dprint-plugin-json/releases/download/0.17.4/plugin.wasm",
"https://github.com/dprint/dprint-plugin-markdown/releases/download/0.15.3/plugin.wasm",
"https://github.com/dprint/dprint-plugin-markdown/releases/download/0.16.0/plugin.wasm",
"https://github.com/dprint/dprint-plugin-toml/releases/download/0.5.4/plugin.wasm"
]
}

2
.github/workflows/spell-check.yml vendored
View File

@ -7,4 +7,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: crate-ci/typos@v1.16.5
- uses: crate-ci/typos@v1.16.8

419
Cargo.lock generated
View File

@ -46,16 +46,15 @@ dependencies = [
[[package]]
name = "anstream"
version = "0.3.2"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is-terminal",
"utf8parse",
]
@ -85,9 +84,9 @@ dependencies = [
[[package]]
name = "anstyle-wincon"
version = "1.0.1"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
dependencies = [
"anstyle",
"windows-sys",
@ -369,9 +368,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.3.21"
version = "4.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
dependencies = [
"clap_builder",
"clap_derive",
@ -380,9 +379,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.3.21"
version = "4.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
dependencies = [
"anstream",
"anstyle",
@ -395,18 +394,18 @@ dependencies = [
[[package]]
name = "clap_complete"
version = "4.3.2"
version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce"
checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
version = "4.3.12"
version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
dependencies = [
"heck",
"proc-macro2",
@ -623,6 +622,12 @@ dependencies = [
"winapi",
]
[[package]]
name = "deranged"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
[[package]]
name = "derivative"
version = "2.2.0"
@ -807,6 +812,15 @@ version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "faster-hex"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9042d281a5eec0f2387f8c3ea6c4514e2cf2732c90a85aaf383b761ee3b290d"
dependencies = [
"serde",
]
[[package]]
name = "fastrand"
version = "1.9.0"
@ -975,9 +989,9 @@ dependencies = [
[[package]]
name = "gix"
version = "0.51.0"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ce5c049b1afcae9bb9e10c0f6dd8eb1335e8647fb7fd34732a66133ca3b9886"
checksum = "a35ed1401a11506b45361746507a7c94c546574ddd7dfc2717f8941e30070254"
dependencies = [
"gix-actor",
"gix-attributes",
@ -987,9 +1001,9 @@ dependencies = [
"gix-date",
"gix-diff",
"gix-discover",
"gix-features 0.32.1",
"gix-features",
"gix-filter",
"gix-fs 0.4.1",
"gix-fs",
"gix-glob",
"gix-hash",
"gix-hashtable",
@ -1002,11 +1016,13 @@ dependencies = [
"gix-odb",
"gix-pack",
"gix-path",
"gix-pathspec",
"gix-prompt",
"gix-ref",
"gix-refspec",
"gix-revision",
"gix-sec",
"gix-submodule",
"gix-tempfile",
"gix-trace",
"gix-traverse",
@ -1014,8 +1030,10 @@ dependencies = [
"gix-utils",
"gix-validate",
"gix-worktree",
"gix-worktree-state",
"log",
"once_cell",
"parking_lot",
"signal-hook 0.3.15",
"smallvec",
"thiserror",
@ -1024,23 +1042,23 @@ dependencies = [
[[package]]
name = "gix-actor"
version = "0.24.2"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abd2566c12095a584716f2c16f051850bd8987f57556f1fef4a7cce0300b83d0"
checksum = "8f8a773b5385e9d2f88bd879fb763ec1212585f6d630ebe13adb7bac93bce975"
dependencies = [
"bstr",
"btoi",
"gix-date",
"itoa",
"nom 7.1.3",
"thiserror",
"winnow",
]
[[package]]
name = "gix-attributes"
version = "0.16.0"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63a134a674e39e238bd273326a9815296cc71f867ad5466518da71392cff98ce"
checksum = "b1ecae08f2625d8abcd27570fa2f9c2fcf01a1cd968a8d90858e63f8e08211a3"
dependencies = [
"bstr",
"gix-glob",
@ -1055,9 +1073,9 @@ dependencies = [
[[package]]
name = "gix-bitmap"
version = "0.2.6"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aa8bbde7551a9e3e783a2871f53bbb0f50aac7a77db5680c8709f69e8ce724f"
checksum = "0ccab4bc576844ddb51b78d81b4a42d73e6229660fa614dfc3d3999c874d1959"
dependencies = [
"thiserror",
]
@ -1073,22 +1091,22 @@ dependencies = [
[[package]]
name = "gix-command"
version = "0.2.8"
version = "0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2783ad148fb16bf9cfd46423706ba552a62a4d4a18fda5dd07648eb0228862dd"
checksum = "0f28f654184b5f725c5737c7e4f466cbd8f0102ac352d5257eeab19647ee4256"
dependencies = [
"bstr",
]
[[package]]
name = "gix-commitgraph"
version = "0.18.1"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4c2d5ce99eba59fe9477a9e3037b0e1d0266d53925cc4b322bc06c566589b99"
checksum = "3845b3c8722a0e97d9d593c05d384bb1275a5865f1cd967523a3780ffc93168e"
dependencies = [
"bstr",
"gix-chunk",
"gix-features 0.32.1",
"gix-features",
"gix-hash",
"memmap2",
"thiserror",
@ -1096,13 +1114,13 @@ dependencies = [
[[package]]
name = "gix-config"
version = "0.26.2"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2135b921a699a4c36167148193bea23c653a16ef0686f6a280e383469709a773"
checksum = "9a312d120231dc8d5a2e34928a9a2098c1d3dbad76f0660ee38d0b1a87de5271"
dependencies = [
"bstr",
"gix-config-value",
"gix-features 0.32.1",
"gix-features",
"gix-glob",
"gix-path",
"gix-ref",
@ -1118,9 +1136,9 @@ dependencies = [
[[package]]
name = "gix-config-value"
version = "0.12.5"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e874f41437441c02991dcea76990b9058fadfc54b02ab4dd06ab2218af43897"
checksum = "901e184f3d4f99bf015ca13b5ccacb09e26b400f198fe2066651089e2c490680"
dependencies = [
"bitflags 2.3.3",
"bstr",
@ -1131,9 +1149,9 @@ dependencies = [
[[package]]
name = "gix-credentials"
version = "0.17.1"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "307d91ec5f7c8e9bfaa217fe30c2e0099101cbe83dbed27a222dbb6def38725f"
checksum = "2988e917f7ee4a99072354d5885ca14c9e7039de8246e96e300ab3e5060cad19"
dependencies = [
"bstr",
"gix-command",
@ -1147,9 +1165,9 @@ dependencies = [
[[package]]
name = "gix-date"
version = "0.7.1"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56b0312dba1ad003d9b8c502bed52fbcf106f8de3a9a26bfa7b45642a6f94b72"
checksum = "01e476b4e156f6044d35bf1ce2079d97b7207515cfb5a2bb6fcd489bb697d700"
dependencies = [
"bstr",
"itoa",
@ -1159,9 +1177,9 @@ dependencies = [
[[package]]
name = "gix-diff"
version = "0.33.1"
version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a49d7a9a9ed5ec3428c3061da45d0fc5f50b3c07b91ea4e7ec4959668f25f6c"
checksum = "016be5f0789da595b61d15a862476be0cbae8fd29e2c91d66770fdd8df145773"
dependencies = [
"gix-hash",
"gix-object",
@ -1171,9 +1189,9 @@ dependencies = [
[[package]]
name = "gix-discover"
version = "0.22.1"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "041480eb03d8aa0894d9b73d25d182d51bc4d0ea8925a6ee0c971262bbc7715e"
checksum = "2b74760d912716b287357dae5654ad84be12a2a75a721f00b58ecdd65496e024"
dependencies = [
"bstr",
"dunce",
@ -1186,20 +1204,9 @@ dependencies = [
[[package]]
name = "gix-features"
version = "0.31.1"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06142d8cff5d17509399b04052b64d2f9b3a311d5cff0b1a32b220f62cd0d595"
dependencies = [
"gix-hash",
"gix-trace",
"libc",
]
[[package]]
name = "gix-features"
version = "0.32.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "882695cccf38da4c3cc7ee687bdb412cf25e37932d7f8f2c306112ea712449f1"
checksum = "7f77decb545f63a52852578ef5f66ecd71017ffc1983d551d5fa2328d6d9817f"
dependencies = [
"crc32fast",
"crossbeam-channel",
@ -1219,9 +1226,9 @@ dependencies = [
[[package]]
name = "gix-filter"
version = "0.2.0"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef4d4d61f2ab07de4612f8e078d7f1a443c7ab5c40f382784c8eacdf0fd172b9"
checksum = "5f5495cdd54f4c3bb05b35a525cd39df1643362d917a7e03f112564c2825feb4"
dependencies = [
"bstr",
"encoding_rs",
@ -1239,49 +1246,40 @@ dependencies = [
[[package]]
name = "gix-fs"
version = "0.3.0"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb15956bc0256594c62a2399fcf6958a02a11724217eddfdc2b49b21b6292496"
checksum = "53d5089f3338647776733a75a800a664ab046f56f21c515fa4722e395f877ef8"
dependencies = [
"gix-features 0.31.1",
]
[[package]]
name = "gix-fs"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d5b6e9d34a2c61ea4a02bbca94c409ab6dbbca1348cbb67298cd7fed8758761"
dependencies = [
"gix-features 0.32.1",
"gix-features",
]
[[package]]
name = "gix-glob"
version = "0.10.1"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7c79b881a18d89a75876ba277476d5a2bad5b19f03759c7a07e0808dfe08212"
checksum = "c753299d14a29ca06d7adc8464c16f1786eb97bc9a44a796ad0a37f57235a494"
dependencies = [
"bitflags 2.3.3",
"bstr",
"gix-features 0.32.1",
"gix-features",
"gix-path",
]
[[package]]
name = "gix-hash"
version = "0.11.4"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b422ff2ad9a0628baaad6da468cf05385bf3f5ab495ad5a33cce99b9f41092f"
checksum = "7d4796bac3aaf0c2f8bea152ca924ae3bdc5f135caefe6431116bcd67e98eab9"
dependencies = [
"hex",
"faster-hex",
"thiserror",
]
[[package]]
name = "gix-hashtable"
version = "0.2.4"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "385f4ce6ecf3692d313ca3aa9bd3b3d8490de53368d6d94bedff3af8b6d9c58d"
checksum = "45ad1b70efd1e77c32729d5a522f0c855e9827242feb10318e1acaf2259222c0"
dependencies = [
"gix-hash",
"hashbrown 0.14.0",
@ -1290,9 +1288,9 @@ dependencies = [
[[package]]
name = "gix-ignore"
version = "0.5.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a88b95ceb3bc45abcab6eb55ef4e0053e58b4df0712d3f9aec7d0ca990952603"
checksum = "b355098421f5cc91a0e5f1ef3600ae250c13b7c3c472b18c361897c6081bfbb1"
dependencies = [
"bstr",
"gix-glob",
@ -1302,17 +1300,17 @@ dependencies = [
[[package]]
name = "gix-index"
version = "0.21.1"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "732f61ec71576bd443a3c24f4716dc7eac180d8929e7bb8603c7310161507106"
checksum = "a9738fc58ca30e232c7b1be8e8ab52b072979acb9bf3fa97662b5b23c0c6fbca"
dependencies = [
"bitflags 2.3.3",
"bstr",
"btoi",
"filetime",
"gix-bitmap",
"gix-features 0.32.1",
"gix-fs 0.4.1",
"gix-features",
"gix-fs",
"gix-hash",
"gix-lock",
"gix-object",
@ -1325,9 +1323,9 @@ dependencies = [
[[package]]
name = "gix-lock"
version = "7.0.1"
version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "714bcb13627995ac33716e9c5e4d25612b19947845395f64d2a9cbe6007728e4"
checksum = "de4363023577b31906b476b34eefbf76931363ec574f88b5c7b6027789f1e3ce"
dependencies = [
"gix-tempfile",
"gix-utils",
@ -1336,9 +1334,9 @@ dependencies = [
[[package]]
name = "gix-mailmap"
version = "0.16.1"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc0dbbf35d29639770af68d7ff55924d83786c8924b0e6a1766af1a98b7d58b"
checksum = "244a4a6f08e8104110675de649ccd20fe1d1116783063920e19aa7da197a4ad0"
dependencies = [
"bstr",
"gix-actor",
@ -1348,9 +1346,9 @@ dependencies = [
[[package]]
name = "gix-negotiate"
version = "0.5.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce0061b7ae867e830c77b1ecfc5875f0d042aebb3d7e6014d04fd86ca6c71d59"
checksum = "a0b0ea711559f843b8286cdf71ea421560c072120fae35a949bcf6b068b73745"
dependencies = [
"bitflags 2.3.3",
"gix-commitgraph",
@ -1364,33 +1362,32 @@ dependencies = [
[[package]]
name = "gix-object"
version = "0.33.2"
version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdd87520c71a19afecfa616863a4b761621074878f5a3999243b3e37e233943"
checksum = "c4283b7b5e9438afe2e3183e9acd1c77e750800937bb56c06b750822d2ff6d95"
dependencies = [
"bstr",
"btoi",
"gix-actor",
"gix-date",
"gix-features 0.32.1",
"gix-features",
"gix-hash",
"gix-validate",
"hex",
"itoa",
"nom 7.1.3",
"smallvec",
"thiserror",
"winnow",
]
[[package]]
name = "gix-odb"
version = "0.50.2"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e827dbda6d3dabadb94cd437d0e0fe8c314a60d136a3235fc6f5bf7b96b976ac"
checksum = "c1dd295ca055d8270de23b6037176b03782de753f75c84dabb7713f7d7e229fd"
dependencies = [
"arc-swap",
"gix-date",
"gix-features 0.32.1",
"gix-features",
"gix-hash",
"gix-object",
"gix-pack",
@ -1403,14 +1400,14 @@ dependencies = [
[[package]]
name = "gix-pack"
version = "0.40.2"
version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46f029a4dce9ac91da35c968c3abdcae573b3e52c123be86cbab3011599de533"
checksum = "e2e645c38138216b9de2f6279bfb1b8567de6f4539f8fa2761eea961d991f448"
dependencies = [
"clru",
"gix-chunk",
"gix-diff",
"gix-features 0.32.1",
"gix-features",
"gix-hash",
"gix-hashtable",
"gix-object",
@ -1426,20 +1423,20 @@ dependencies = [
[[package]]
name = "gix-packetline-blocking"
version = "0.16.4"
version = "0.16.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20276373def40fc3be7a86d09e1bb607d33dd6bf83e3504e83cd594e51438667"
checksum = "e39142400d3faa7057680ed3947c3b70e46b6a0b16a7c242ec8f0249e37518ba"
dependencies = [
"bstr",
"hex",
"faster-hex",
"thiserror",
]
[[package]]
name = "gix-path"
version = "0.8.4"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18609c8cbec8508ea97c64938c33cd305b75dfc04a78d0c3b78b8b3fd618a77c"
checksum = "764b31ac54472e796f08be376eaeea3e30800949650566620809659d39969dbd"
dependencies = [
"bstr",
"gix-trace",
@ -1449,10 +1446,25 @@ dependencies = [
]
[[package]]
name = "gix-prompt"
version = "0.5.5"
name = "gix-pathspec"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c22decaf4a063ccae2b2108820c8630c01bd6756656df3fe464b32b8958a5ea"
checksum = "b4ba6662a29a6332926494542f6144ee87a59df3c70a4c680ebd235b646d7866"
dependencies = [
"bitflags 2.3.3",
"bstr",
"gix-attributes",
"gix-config-value",
"gix-glob",
"gix-path",
"thiserror",
]
[[package]]
name = "gix-prompt"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ebf6f126413908bfbdc27bf69f6f8b94b674457546fab8ba613be22b917d33"
dependencies = [
"gix-command",
"gix-config-value",
@ -1463,9 +1475,9 @@ dependencies = [
[[package]]
name = "gix-quote"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfd80d3d0c733508df9449b1d3795da36083807e31d851d7d61d29af13bd4b0a"
checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905"
dependencies = [
"bstr",
"btoi",
@ -1474,14 +1486,14 @@ dependencies = [
[[package]]
name = "gix-ref"
version = "0.33.3"
version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25db11edd78bf33043d1969fff51c567a4b30edd77ab44f6f8eb460a4c14985d"
checksum = "993ce5c448a94038b8da1a8969c0facd6c1fbac509fa013344c580458f41527d"
dependencies = [
"gix-actor",
"gix-date",
"gix-features 0.32.1",
"gix-fs 0.4.1",
"gix-features",
"gix-fs",
"gix-hash",
"gix-lock",
"gix-object",
@ -1489,15 +1501,15 @@ dependencies = [
"gix-tempfile",
"gix-validate",
"memmap2",
"nom 7.1.3",
"thiserror",
"winnow",
]
[[package]]
name = "gix-refspec"
version = "0.14.1"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d19a02bf740b326d6c082a7d6f754ebe56eef900986c5e91be7cf000df9ea18d"
checksum = "f3171923a0f9075feae790bb81d824c0c1f91a899df51508705d4957bacd006e"
dependencies = [
"bstr",
"gix-hash",
@ -1509,9 +1521,9 @@ dependencies = [
[[package]]
name = "gix-revision"
version = "0.18.1"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38a13500890435e3b9e7746bceda248646bfc69e259210884c98e29bb7a1aa6f"
checksum = "2443886b7c55e73a813f203fe8603b94ac5deb3dfad8812d25e731b81f569f27"
dependencies = [
"bstr",
"gix-date",
@ -1519,14 +1531,15 @@ dependencies = [
"gix-hashtable",
"gix-object",
"gix-revwalk",
"gix-trace",
"thiserror",
]
[[package]]
name = "gix-revwalk"
version = "0.4.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d4cbaf3cfbfde2b81b5ee8b469aff42c34693ce0fe17fc3c244d5085307f2c"
checksum = "362f71e173364f67d02899388c4b3d2f6bac7c16c0f3a9bbc04683f984f59daa"
dependencies = [
"gix-commitgraph",
"gix-date",
@ -1539,9 +1552,9 @@ dependencies = [
[[package]]
name = "gix-sec"
version = "0.8.4"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9615cbd6b456898aeb942cd75e5810c382fbfc48dbbff2fa23ebd2d33dcbe9c7"
checksum = "0debc2e70613a077c257c2bb45ab4f652a550ae1d00bdca356633ea9de88a230"
dependencies = [
"bitflags 2.3.3",
"gix-path",
@ -1550,12 +1563,27 @@ dependencies = [
]
[[package]]
name = "gix-tempfile"
version = "7.0.0"
name = "gix-submodule"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fac8310c17406ea619af72f42ee46dac795110f68f41b4f4fa231b69889c6a2"
checksum = "71cc3ecd5e2387102aa275fc88fcf36e0f0b9df23a1335bf6255327abbb9bb3f"
dependencies = [
"gix-fs 0.3.0",
"bstr",
"gix-config",
"gix-path",
"gix-pathspec",
"gix-refspec",
"gix-url",
"thiserror",
]
[[package]]
name = "gix-tempfile"
version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cea558d3daf3b1d0001052b12218c66c8f84788852791333b633d7eeb6999db1"
dependencies = [
"gix-fs",
"libc",
"once_cell",
"parking_lot",
@ -1572,9 +1600,9 @@ checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836"
[[package]]
name = "gix-traverse"
version = "0.30.1"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e12e0fe428394226c37dd686ad64b09a04b569fe157d638b125b4a4c1e7e2df0"
checksum = "beecf2e4d8924cbe0cace0bd396f9b037fdf7db9799d5695fe70dcad959ed067"
dependencies = [
"gix-commitgraph",
"gix-date",
@ -1588,12 +1616,12 @@ dependencies = [
[[package]]
name = "gix-url"
version = "0.21.1"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4411bdbd1d46b35ae50e84c191660d437f89974e4236627785024be0b577170a"
checksum = "6059e15828df32027a7db9097e5a9baf320d2dcc10a4e1598ffe05be8dfd1fa6"
dependencies = [
"bstr",
"gix-features 0.32.1",
"gix-features",
"gix-path",
"home",
"thiserror",
@ -1611,9 +1639,9 @@ dependencies = [
[[package]]
name = "gix-validate"
version = "0.7.7"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba9b3737b2cef3dcd014633485f0034b0f1a931ee54aeb7d8f87f177f3c89040"
checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5"
dependencies = [
"bstr",
"thiserror",
@ -1621,22 +1649,38 @@ dependencies = [
[[package]]
name = "gix-worktree"
version = "0.23.1"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f8bb6dd57dc6c9dfa03cc2cf2cc0942edae405eb6dfd1c34dbd2be00a90cab2"
checksum = "a38eab0fdd752ecfa50130c127c9f42bd329bf7f4e52872f4ac24c12bbc02baf"
dependencies = [
"bstr",
"filetime",
"gix-attributes",
"gix-features 0.32.1",
"gix-filter",
"gix-fs 0.4.1",
"gix-features",
"gix-fs",
"gix-glob",
"gix-hash",
"gix-ignore",
"gix-index",
"gix-object",
"gix-path",
]
[[package]]
name = "gix-worktree-state"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44629a04d238493f0da657a0eee4d60086f0172c364ca4a71398b1898fda32a6"
dependencies = [
"bstr",
"gix-features",
"gix-filter",
"gix-fs",
"gix-glob",
"gix-hash",
"gix-index",
"gix-object",
"gix-path",
"gix-worktree",
"io-close",
"thiserror",
]
@ -1801,17 +1845,6 @@ dependencies = [
"once_cell",
]
[[package]]
name = "is-terminal"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
dependencies = [
"hermit-abi",
"rustix 0.38.4",
"windows-sys",
]
[[package]]
name = "is-wsl"
version = "0.4.0"
@ -1955,9 +1988,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
[[package]]
name = "mac-notification-sys"
version = "0.5.6"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5"
checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64"
dependencies = [
"cc",
"dirs-next",
@ -2078,6 +2111,17 @@ dependencies = [
"static_assertions",
]
[[package]]
name = "nix"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
dependencies = [
"bitflags 2.3.3",
"cfg-if",
"libc",
]
[[package]]
name = "nom"
version = "5.1.3"
@ -2106,9 +2150,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "notify-rust"
version = "4.8.0"
version = "4.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e"
checksum = "6d7b75c8958cb2eab3451538b32db8a7b74006abc33eb2e6a9a56d21e4775c2b"
dependencies = [
"log",
"mac-notification-sys",
@ -2619,13 +2663,13 @@ dependencies = [
[[package]]
name = "regex"
version = "1.9.3"
version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata 0.3.6",
"regex-automata 0.3.7",
"regex-syntax",
]
@ -2637,9 +2681,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
[[package]]
name = "regex-automata"
version = "0.3.6"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
dependencies = [
"aho-corasick",
"memchr",
@ -2648,9 +2692,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.7.4"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
[[package]]
name = "rust-ini"
@ -2706,9 +2750,9 @@ dependencies = [
[[package]]
name = "schemars"
version = "0.8.12"
version = "0.8.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161"
dependencies = [
"dyn-clone",
"indexmap 1.9.3",
@ -2719,9 +2763,9 @@ dependencies = [
[[package]]
name = "schemars_derive"
version = "0.8.12"
version = "0.8.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737"
dependencies = [
"proc-macro2",
"quote",
@ -2761,18 +2805,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.183"
version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.183"
version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
@ -2971,13 +3015,13 @@ dependencies = [
"dunce",
"gethostname",
"gix",
"gix-features 0.32.1",
"gix-features",
"guess_host_triple",
"home",
"indexmap 1.9.3",
"log",
"mockall",
"nix",
"nix 0.27.1",
"notify-rust",
"nu-ansi-term",
"once_cell",
@ -3027,7 +3071,7 @@ dependencies = [
"lazycell",
"libc",
"mach2",
"nix",
"nix 0.26.2",
"num-traits",
"uom",
"winapi",
@ -3093,9 +3137,9 @@ dependencies = [
[[package]]
name = "tempfile"
version = "3.7.1"
version = "3.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
dependencies = [
"cfg-if",
"fastrand 2.0.0",
@ -3176,18 +3220,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.40"
version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.40"
version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
dependencies = [
"proc-macro2",
"quote",
@ -3196,10 +3240,11 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.22"
version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
dependencies = [
"deranged",
"itoa",
"libc",
"num_threads",
@ -3216,9 +3261,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]]
name = "time-macros"
version = "0.2.9"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd"
dependencies = [
"time-core",
]
@ -3710,9 +3755,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winnow"
version = "0.5.0"
version = "0.5.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97"
dependencies = [
"memchr",
]
@ -3732,7 +3777,7 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
dependencies = [
"nix",
"nix 0.26.2",
"winapi",
]
@ -3769,7 +3814,7 @@ dependencies = [
"futures-sink",
"futures-util",
"hex",
"nix",
"nix 0.26.2",
"once_cell",
"ordered-stream",
"rand",

20
Cargo.toml
View File

@ -43,19 +43,19 @@ gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"]
[dependencies]
chrono = { version = "0.4.26", default-features = false, features = ["clock", "std", "wasmbind"] }
clap = { version = "4.3.21", features = ["derive", "cargo", "unicode"] }
clap_complete = "4.3.2"
clap = { version = "4.4.1", features = ["derive", "cargo", "unicode"] }
clap_complete = "4.4.0"
dirs-next = "2.0.0"
dunce = "1.0.4"
gethostname = "0.4.3"
# default feature restriction addresses https://github.com/starship/starship/issues/4251
gix = { version = "0.51.0", default-features = false, features = ["max-performance-safe"] }
gix-features = { version = "0.32.1", optional = true }
gix = { version = "0.52.0", default-features = false, features = ["max-performance-safe"] }
gix-features = { version = "0.33.0", optional = true }
indexmap = { version = "1.9.3", features = ["serde"] }
log = { version = "0.4.20", features = ["std"] }
# notify-rust is optional (on by default) because the crate doesn't currently build for darwin with nix
# see: https://github.com/NixOS/nixpkgs/issues/160876
notify-rust = { version = "4.8.0", optional = true }
notify-rust = { version = "4.9.0", optional = true }
nu-ansi-term = "0.49.0"
once_cell = "1.18.0"
open = "5.0.0"
@ -67,10 +67,10 @@ pest_derive = "2.7.2"
quick-xml = "0.30.0"
rand = "0.8.5"
rayon = "1.7.0"
regex = { version = "1.9.3", default-features = false, features = ["perf", "std", "unicode-perl"] }
regex = { version = "1.9.4", default-features = false, features = ["perf", "std", "unicode-perl"] }
rust-ini = "0.19.0"
semver = "1.0.18"
serde = { version = "1.0.183", features = ["derive"] }
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.105"
sha1 = "0.10.5"
shadow-rs = { version = "0.23.0", default-features = false }
@ -96,7 +96,7 @@ home = "0.5.5"
shell-words = "1.1.0"
[dependencies.schemars]
version = "0.8.12"
version = "0.8.13"
optional = true
features = ["preserve_order", "indexmap"]
@ -114,7 +114,7 @@ features = [
]
[target.'cfg(not(windows))'.dependencies]
nix = { version = "0.26.2", default-features = false, features = ["feature", "fs", "user"] }
nix = { version = "0.27.1", default-features = false, features = ["feature", "fs", "user"] }
[build-dependencies]
shadow-rs = { version = "0.23.0", default-features = false }
@ -125,7 +125,7 @@ winres = "0.1.12"
[dev-dependencies]
mockall = "0.11"
tempfile = "3.7.1"
tempfile = "3.8.0"
[profile.release]
codegen-units = 1

2
build.rs
View File

@ -22,7 +22,7 @@ fn gen_presets_hook(mut file: &File) -> SdResult<()> {
println!("cargo:rerun-if-changed=docs/.vuepress/public/presets/toml");
let paths = fs::read_dir("docs/.vuepress/public/presets/toml")?;
let mut sortedpaths = paths.collect::<io::Result<Vec<_>>>()?;
sortedpaths.sort_by_key(|e| e.path());
sortedpaths.sort_by_key(std::fs::DirEntry::path);
let mut presets = String::new();
let mut match_arms = String::new();

406
docs/package-lock.json generated
View File

@ -5,7 +5,7 @@
"packages": {
"": {
"devDependencies": {
"vuepress": "^1.9.9",
"vuepress": "^1.9.10",
"vuepress-plugin-code-copy": "^1.0.6",
"vuepress-plugin-sitemap": "^2.3.1",
"vuepress-theme-default-prefers-color-scheme": "^2.0.0"
@ -1697,9 +1697,9 @@
}
},
"node_modules/@types/connect-history-api-fallback": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
"integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
"integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
"dev": true,
"dependencies": {
"@types/express-serve-static-core": "*",
@ -1707,26 +1707,27 @@
}
},
"node_modules/@types/express": {
"version": "4.17.13",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
"integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
"version": "4.17.17",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
"integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
"dev": true,
"dependencies": {
"@types/body-parser": "*",
"@types/express-serve-static-core": "^4.17.18",
"@types/express-serve-static-core": "^4.17.33",
"@types/qs": "*",
"@types/serve-static": "*"
}
},
"node_modules/@types/express-serve-static-core": {
"version": "4.17.27",
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.27.tgz",
"integrity": "sha512-e/sVallzUTPdyOTiqi8O8pMdBBphscvI6E4JYaKlja4Lm+zh7UFSSdW5VMkRbhDtmrONqOUHOXRguPsDckzxNA==",
"version": "4.17.35",
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
"integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
"dev": true,
"dependencies": {
"@types/node": "*",
"@types/qs": "*",
"@types/range-parser": "*"
"@types/range-parser": "*",
"@types/send": "*"
}
},
"node_modules/@types/glob": {
@ -1745,10 +1746,16 @@
"integrity": "sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww==",
"dev": true
},
"node_modules/@types/http-errors": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
"integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
"dev": true
},
"node_modules/@types/http-proxy": {
"version": "1.17.8",
"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz",
"integrity": "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==",
"version": "1.17.11",
"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
"integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
"dev": true,
"dependencies": {
"@types/node": "*"
@ -1820,16 +1827,27 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
"dev": true
},
"node_modules/@types/serve-static": {
"version": "1.13.10",
"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
"integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
"node_modules/@types/send": {
"version": "0.17.1",
"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
"integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
"dev": true,
"dependencies": {
"@types/mime": "^1",
"@types/node": "*"
}
},
"node_modules/@types/serve-static": {
"version": "1.15.2",
"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
"integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
"dev": true,
"dependencies": {
"@types/http-errors": "*",
"@types/mime": "*",
"@types/node": "*"
}
},
"node_modules/@types/source-list-map": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
@ -1843,9 +1861,9 @@
"dev": true
},
"node_modules/@types/uglify-js": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",
"integrity": "sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==",
"version": "3.17.1",
"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.1.tgz",
"integrity": "sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==",
"dev": true,
"dependencies": {
"source-map": "^0.6.1"
@ -1861,9 +1879,9 @@
}
},
"node_modules/@types/webpack": {
"version": "4.41.32",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz",
"integrity": "sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==",
"version": "4.41.33",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz",
"integrity": "sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==",
"dev": true,
"dependencies": {
"@types/node": "*",
@ -1899,9 +1917,9 @@
}
},
"node_modules/@types/webpack-sources/node_modules/source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
"dev": true,
"engines": {
"node": ">= 8"
@ -2178,19 +2196,19 @@
"dev": true
},
"node_modules/@vuepress/core": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/core/-/core-1.9.9.tgz",
"integrity": "sha512-Ekgu409ZSgvAV9n14F3DaEWtgkwrEicg1nWs0gbxGgUCdREeX/7rwxSfKwWwBjCwfCUKR2L3+6pXGjzxex0t+g==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/core/-/core-1.9.10.tgz",
"integrity": "sha512-H9ddo5fSinPb8QYl8OJFbZikMpOW84bm/U3Drzz8CnCXNtpda7CU2wX/XzOhe98G8jp45xhtZRkxOrqzBBAShA==",
"dev": true,
"dependencies": {
"@babel/core": "^7.8.4",
"@vue/babel-preset-app": "^4.1.2",
"@vuepress/markdown": "1.9.9",
"@vuepress/markdown-loader": "1.9.9",
"@vuepress/plugin-last-updated": "1.9.9",
"@vuepress/plugin-register-components": "1.9.9",
"@vuepress/shared-utils": "1.9.9",
"@vuepress/types": "1.9.9",
"@vuepress/markdown": "1.9.10",
"@vuepress/markdown-loader": "1.9.10",
"@vuepress/plugin-last-updated": "1.9.10",
"@vuepress/plugin-register-components": "1.9.10",
"@vuepress/shared-utils": "1.9.10",
"@vuepress/types": "1.9.10",
"autoprefixer": "^9.5.1",
"babel-loader": "^8.0.4",
"bundle-require": "2.1.8",
@ -2230,12 +2248,12 @@
}
},
"node_modules/@vuepress/markdown": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/markdown/-/markdown-1.9.9.tgz",
"integrity": "sha512-JzFdBdGe5aoiKSaEgF+h3JLDXNVfWPI5DJWXrIt7rhhkMJesF6HowIznPLdXqukzHfXHcPvo9oQ4o6eT0YmVGA==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/markdown/-/markdown-1.9.10.tgz",
"integrity": "sha512-sXTLjeZzH8SQuAL5AEH0hhsMljjNJbzWbBvzaj5yQCCdf+3sp/dJ0kwnBSnQjFPPnzPg5t3tLKGUYHyW0KiKzA==",
"dev": true,
"dependencies": {
"@vuepress/shared-utils": "1.9.9",
"@vuepress/shared-utils": "1.9.10",
"markdown-it": "^8.4.1",
"markdown-it-anchor": "^5.0.2",
"markdown-it-chain": "^1.3.0",
@ -2245,69 +2263,69 @@
}
},
"node_modules/@vuepress/markdown-loader": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/markdown-loader/-/markdown-loader-1.9.9.tgz",
"integrity": "sha512-nyY+sytuQaDLEIk6Yj9JFUfSQpe9/sz30xQFkGCYqi0lQTRGQM6IcRDgfcTS7b25A0qRlwpDGBfKQiGGMZKSfg==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/markdown-loader/-/markdown-loader-1.9.10.tgz",
"integrity": "sha512-94BlwKc+lOaN/A5DkyA9KWHvMlMC1sWunAXE3Tv0WYzgYLDs9QqCsx7L5kLkpcOOVVm/8kBJumnXvVBwhqJddw==",
"dev": true,
"dependencies": {
"@vuepress/markdown": "1.9.9",
"@vuepress/markdown": "1.9.10",
"loader-utils": "^1.1.0",
"lru-cache": "^5.1.1"
}
},
"node_modules/@vuepress/plugin-active-header-links": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.9.9.tgz",
"integrity": "sha512-lTnIhbuALjOjFts33jJD8r4ScNBxnZ6MtmePKEwvYlC3J9uvngs1Htpb1JzLEX9QCydt+bhLmZ92bTXn/PdTpg==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.9.10.tgz",
"integrity": "sha512-2dRr3DE2UBFXhyMtLR3sGTdRyDM8YStuY6AOoQmoSgwy1IHt7PO7ypOuf1akF+1Nv8Q2aISU06q6TExZouu3Mw==",
"dev": true,
"dependencies": {
"@vuepress/types": "1.9.9",
"@vuepress/types": "1.9.10",
"lodash.debounce": "^4.0.8"
}
},
"node_modules/@vuepress/plugin-last-updated": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.9.9.tgz",
"integrity": "sha512-MV4csmM0/lye83VtkOc+b8fs0roi7mvE7BmCCOE39Z6t8nv/ZmEPOwKeHD0+hXPT+ZfoATYvDcsYU7uxbdw0Pw==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.9.10.tgz",
"integrity": "sha512-YxzWGF/OfU6WsHSynZFn74NGGp7dY27Bjy9JyyFo8wF5+2V1gpyDjveHKHGKugS/pMXlxfjzhv9E2Wmy9R7Iog==",
"dev": true,
"dependencies": {
"@vuepress/types": "1.9.9",
"@vuepress/types": "1.9.10",
"cross-spawn": "^6.0.5"
}
},
"node_modules/@vuepress/plugin-nprogress": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-nprogress/-/plugin-nprogress-1.9.9.tgz",
"integrity": "sha512-+3fLxjwTLH8MeU54E7i1ovRu9KzBom2lvSeUsu9B8PuLyrETAqW7Pe1H66awEEALEe0ZnnEU4d7SeVe9ljsLAQ==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-nprogress/-/plugin-nprogress-1.9.10.tgz",
"integrity": "sha512-I1kkm6yWUQd7vwiV3lEDVpVP0Lr04K0zlczU502lDUa1RufSZ7vt+mlF5fOM28GqT+pKTEToWmm+VNT/R3qvMQ==",
"dev": true,
"dependencies": {
"@vuepress/types": "1.9.9",
"@vuepress/types": "1.9.10",
"nprogress": "^0.2.0"
}
},
"node_modules/@vuepress/plugin-register-components": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-register-components/-/plugin-register-components-1.9.9.tgz",
"integrity": "sha512-tddnAiSmJsIWWPzE7TcbGU8xzndXf4a8i4BfIev2QzSUnIOQFZDGXUAsCkw4/f9N9UFxQSObjFPzTeUUxb7EvA==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-register-components/-/plugin-register-components-1.9.10.tgz",
"integrity": "sha512-sgdJ5OydTPZAoTkselpvVP3Xsd6bfZ0FpaxOTinal0gJ99h49lvLu9bvzMx13rdGRFO/kRXn0qQQpwKTAfTPqA==",
"dev": true,
"dependencies": {
"@vuepress/shared-utils": "1.9.9",
"@vuepress/types": "1.9.9"
"@vuepress/shared-utils": "1.9.10",
"@vuepress/types": "1.9.10"
}
},
"node_modules/@vuepress/plugin-search": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-search/-/plugin-search-1.9.9.tgz",
"integrity": "sha512-W/FE+YHoXDD4qk2wu5yRMkti271TA4y+7UBMrmCavvVAGrLIRnaZfswRUgIiDlEthBc+Pn8/As/Dy1jFTLBa9A==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-search/-/plugin-search-1.9.10.tgz",
"integrity": "sha512-bn2XJikaRgQZXvu8upCjOWrxbLHIRTqnJ3w7G0mo6jCYWGVsHNo6XhVpqylpLR2PWnHT/ImO2bGo38/5Bag/tQ==",
"dev": true,
"dependencies": {
"@vuepress/types": "1.9.9"
"@vuepress/types": "1.9.10"
}
},
"node_modules/@vuepress/shared-utils": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/shared-utils/-/shared-utils-1.9.9.tgz",
"integrity": "sha512-qhk/7QF5LgMEXhEB1hlqreGFgkz4p2pmaBBNFxnAnYmSwmyO+u/oFOpZLI16QRx9Wg6ekR2ENmByQLxV7y4lJg==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/shared-utils/-/shared-utils-1.9.10.tgz",
"integrity": "sha512-M9A3DocPih+V8dKK2Zg9FJQ/f3JZrYsdaM/vQ9F48l8bPlzxw5NvqXIYMK4kKcGEyerQNTWCudoCpLL5uiU0hg==",
"dev": true,
"dependencies": {
"chalk": "^2.3.2",
@ -2322,15 +2340,15 @@
}
},
"node_modules/@vuepress/theme-default": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/theme-default/-/theme-default-1.9.9.tgz",
"integrity": "sha512-de0FiOwM/h3rFTBSZK0NNBB117lA/e3IHusU7Xm2XeZRiZ/EE3yvbWclZnbbRNt3YjDMmrWXEW/kBTBxfiMuWQ==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/theme-default/-/theme-default-1.9.10.tgz",
"integrity": "sha512-XnXn9t+pYCIhWi3cZXJlighuy93FFm5yXdISAAlFlcNkshuGtqamkjacHV8q/QZMfOhSIs6wX7Hj88u2IsT5mw==",
"dev": true,
"dependencies": {
"@vuepress/plugin-active-header-links": "1.9.9",
"@vuepress/plugin-nprogress": "1.9.9",
"@vuepress/plugin-search": "1.9.9",
"@vuepress/types": "1.9.9",
"@vuepress/plugin-active-header-links": "1.9.10",
"@vuepress/plugin-nprogress": "1.9.10",
"@vuepress/plugin-search": "1.9.10",
"@vuepress/types": "1.9.10",
"docsearch.js": "^2.5.2",
"lodash": "^4.17.15",
"stylus": "^0.54.8",
@ -2340,9 +2358,9 @@
}
},
"node_modules/@vuepress/types": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.9.tgz",
"integrity": "sha512-ukGW49ILzLhIc7CltHMr+BeIjWKloJNN1mrvbDz3beycp9b9kgH+DXNdRIK9QCKr4fJsy7x08vNMwZr9Nq/PTQ==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.10.tgz",
"integrity": "sha512-TDNQn4og85onmBpLTTXXmncW3rUnYGr2MkuI8OIFJZetDNM49t1WbjNVlrT+kx7C6qXi6okDQgrHGYXajHZWfg==",
"dev": true,
"dependencies": {
"@types/markdown-it": "^10.0.0",
@ -7532,13 +7550,13 @@
}
},
"node_modules/http-proxy-middleware/node_modules/micromatch": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
"version": "4.0.5",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
"dev": true,
"dependencies": {
"braces": "^3.0.1",
"picomatch": "^2.2.3"
"braces": "^3.0.2",
"picomatch": "^2.3.1"
},
"engines": {
"node": ">=8.6"
@ -9987,9 +10005,9 @@
"dev": true
},
"node_modules/picomatch": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"dev": true,
"engines": {
"node": ">=8.6"
@ -13898,15 +13916,15 @@
"dev": true
},
"node_modules/vuepress": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/vuepress/-/vuepress-1.9.9.tgz",
"integrity": "sha512-CU94W3EdWaCavGx2VSvQJMI/hyv+m/YMdrvJJw67EVfmmJJDb1iTGrilDgLd0qsyrXzBy0Ru9Qi6rkf4IwcOTg==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/vuepress/-/vuepress-1.9.10.tgz",
"integrity": "sha512-UnGm9vjQvG918SZVNvgiUlNimLqawdYPq0aPRXDpEB1VksvqegVFy/GKdA8ShXJaEpOMPSt7YD4uK21jaMs3kA==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
"@vuepress/core": "1.9.9",
"@vuepress/theme-default": "1.9.9",
"@vuepress/types": "1.9.9",
"@vuepress/core": "1.9.10",
"@vuepress/theme-default": "1.9.10",
"@vuepress/types": "1.9.10",
"cac": "^6.5.6",
"envinfo": "^7.2.0",
"opencollective-postinstall": "^2.0.2",
@ -15986,9 +16004,9 @@
}
},
"@types/connect-history-api-fallback": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
"integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
"integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
"dev": true,
"requires": {
"@types/express-serve-static-core": "*",
@ -15996,26 +16014,27 @@
}
},
"@types/express": {
"version": "4.17.13",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
"integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
"version": "4.17.17",
"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
"integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
"dev": true,
"requires": {
"@types/body-parser": "*",
"@types/express-serve-static-core": "^4.17.18",
"@types/express-serve-static-core": "^4.17.33",
"@types/qs": "*",
"@types/serve-static": "*"
}
},
"@types/express-serve-static-core": {
"version": "4.17.27",
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.27.tgz",
"integrity": "sha512-e/sVallzUTPdyOTiqi8O8pMdBBphscvI6E4JYaKlja4Lm+zh7UFSSdW5VMkRbhDtmrONqOUHOXRguPsDckzxNA==",
"version": "4.17.35",
"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
"integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
"dev": true,
"requires": {
"@types/node": "*",
"@types/qs": "*",
"@types/range-parser": "*"
"@types/range-parser": "*",
"@types/send": "*"
}
},
"@types/glob": {
@ -16034,10 +16053,16 @@
"integrity": "sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww==",
"dev": true
},
"@types/http-errors": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz",
"integrity": "sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==",
"dev": true
},
"@types/http-proxy": {
"version": "1.17.8",
"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz",
"integrity": "sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==",
"version": "1.17.11",
"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz",
"integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
"dev": true,
"requires": {
"@types/node": "*"
@ -16109,16 +16134,27 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
"dev": true
},
"@types/serve-static": {
"version": "1.13.10",
"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
"integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
"@types/send": {
"version": "0.17.1",
"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz",
"integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
"dev": true,
"requires": {
"@types/mime": "^1",
"@types/node": "*"
}
},
"@types/serve-static": {
"version": "1.15.2",
"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.2.tgz",
"integrity": "sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==",
"dev": true,
"requires": {
"@types/http-errors": "*",
"@types/mime": "*",
"@types/node": "*"
}
},
"@types/source-list-map": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
@ -16132,9 +16168,9 @@
"dev": true
},
"@types/uglify-js": {
"version": "3.13.1",
"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",
"integrity": "sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==",
"version": "3.17.1",
"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.1.tgz",
"integrity": "sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==",
"dev": true,
"requires": {
"source-map": "^0.6.1"
@ -16149,9 +16185,9 @@
}
},
"@types/webpack": {
"version": "4.41.32",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz",
"integrity": "sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==",
"version": "4.41.33",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz",
"integrity": "sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==",
"dev": true,
"requires": {
"@types/node": "*",
@ -16195,9 +16231,9 @@
},
"dependencies": {
"source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
"dev": true
}
}
@ -16418,19 +16454,19 @@
}
},
"@vuepress/core": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/core/-/core-1.9.9.tgz",
"integrity": "sha512-Ekgu409ZSgvAV9n14F3DaEWtgkwrEicg1nWs0gbxGgUCdREeX/7rwxSfKwWwBjCwfCUKR2L3+6pXGjzxex0t+g==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/core/-/core-1.9.10.tgz",
"integrity": "sha512-H9ddo5fSinPb8QYl8OJFbZikMpOW84bm/U3Drzz8CnCXNtpda7CU2wX/XzOhe98G8jp45xhtZRkxOrqzBBAShA==",
"dev": true,
"requires": {
"@babel/core": "^7.8.4",
"@vue/babel-preset-app": "^4.1.2",
"@vuepress/markdown": "1.9.9",
"@vuepress/markdown-loader": "1.9.9",
"@vuepress/plugin-last-updated": "1.9.9",
"@vuepress/plugin-register-components": "1.9.9",
"@vuepress/shared-utils": "1.9.9",
"@vuepress/types": "1.9.9",
"@vuepress/markdown": "1.9.10",
"@vuepress/markdown-loader": "1.9.10",
"@vuepress/plugin-last-updated": "1.9.10",
"@vuepress/plugin-register-components": "1.9.10",
"@vuepress/shared-utils": "1.9.10",
"@vuepress/types": "1.9.10",
"autoprefixer": "^9.5.1",
"babel-loader": "^8.0.4",
"bundle-require": "2.1.8",
@ -16467,12 +16503,12 @@
}
},
"@vuepress/markdown": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/markdown/-/markdown-1.9.9.tgz",
"integrity": "sha512-JzFdBdGe5aoiKSaEgF+h3JLDXNVfWPI5DJWXrIt7rhhkMJesF6HowIznPLdXqukzHfXHcPvo9oQ4o6eT0YmVGA==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/markdown/-/markdown-1.9.10.tgz",
"integrity": "sha512-sXTLjeZzH8SQuAL5AEH0hhsMljjNJbzWbBvzaj5yQCCdf+3sp/dJ0kwnBSnQjFPPnzPg5t3tLKGUYHyW0KiKzA==",
"dev": true,
"requires": {
"@vuepress/shared-utils": "1.9.9",
"@vuepress/shared-utils": "1.9.10",
"markdown-it": "^8.4.1",
"markdown-it-anchor": "^5.0.2",
"markdown-it-chain": "^1.3.0",
@ -16482,69 +16518,69 @@
}
},
"@vuepress/markdown-loader": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/markdown-loader/-/markdown-loader-1.9.9.tgz",
"integrity": "sha512-nyY+sytuQaDLEIk6Yj9JFUfSQpe9/sz30xQFkGCYqi0lQTRGQM6IcRDgfcTS7b25A0qRlwpDGBfKQiGGMZKSfg==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/markdown-loader/-/markdown-loader-1.9.10.tgz",
"integrity": "sha512-94BlwKc+lOaN/A5DkyA9KWHvMlMC1sWunAXE3Tv0WYzgYLDs9QqCsx7L5kLkpcOOVVm/8kBJumnXvVBwhqJddw==",
"dev": true,
"requires": {
"@vuepress/markdown": "1.9.9",
"@vuepress/markdown": "1.9.10",
"loader-utils": "^1.1.0",
"lru-cache": "^5.1.1"
}
},
"@vuepress/plugin-active-header-links": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.9.9.tgz",
"integrity": "sha512-lTnIhbuALjOjFts33jJD8r4ScNBxnZ6MtmePKEwvYlC3J9uvngs1Htpb1JzLEX9QCydt+bhLmZ92bTXn/PdTpg==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.9.10.tgz",
"integrity": "sha512-2dRr3DE2UBFXhyMtLR3sGTdRyDM8YStuY6AOoQmoSgwy1IHt7PO7ypOuf1akF+1Nv8Q2aISU06q6TExZouu3Mw==",
"dev": true,
"requires": {
"@vuepress/types": "1.9.9",
"@vuepress/types": "1.9.10",
"lodash.debounce": "^4.0.8"
}
},
"@vuepress/plugin-last-updated": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.9.9.tgz",
"integrity": "sha512-MV4csmM0/lye83VtkOc+b8fs0roi7mvE7BmCCOE39Z6t8nv/ZmEPOwKeHD0+hXPT+ZfoATYvDcsYU7uxbdw0Pw==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.9.10.tgz",
"integrity": "sha512-YxzWGF/OfU6WsHSynZFn74NGGp7dY27Bjy9JyyFo8wF5+2V1gpyDjveHKHGKugS/pMXlxfjzhv9E2Wmy9R7Iog==",
"dev": true,
"requires": {
"@vuepress/types": "1.9.9",
"@vuepress/types": "1.9.10",
"cross-spawn": "^6.0.5"
}
},
"@vuepress/plugin-nprogress": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-nprogress/-/plugin-nprogress-1.9.9.tgz",
"integrity": "sha512-+3fLxjwTLH8MeU54E7i1ovRu9KzBom2lvSeUsu9B8PuLyrETAqW7Pe1H66awEEALEe0ZnnEU4d7SeVe9ljsLAQ==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-nprogress/-/plugin-nprogress-1.9.10.tgz",
"integrity": "sha512-I1kkm6yWUQd7vwiV3lEDVpVP0Lr04K0zlczU502lDUa1RufSZ7vt+mlF5fOM28GqT+pKTEToWmm+VNT/R3qvMQ==",
"dev": true,
"requires": {
"@vuepress/types": "1.9.9",
"@vuepress/types": "1.9.10",
"nprogress": "^0.2.0"
}
},
"@vuepress/plugin-register-components": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-register-components/-/plugin-register-components-1.9.9.tgz",
"integrity": "sha512-tddnAiSmJsIWWPzE7TcbGU8xzndXf4a8i4BfIev2QzSUnIOQFZDGXUAsCkw4/f9N9UFxQSObjFPzTeUUxb7EvA==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-register-components/-/plugin-register-components-1.9.10.tgz",
"integrity": "sha512-sgdJ5OydTPZAoTkselpvVP3Xsd6bfZ0FpaxOTinal0gJ99h49lvLu9bvzMx13rdGRFO/kRXn0qQQpwKTAfTPqA==",
"dev": true,
"requires": {
"@vuepress/shared-utils": "1.9.9",
"@vuepress/types": "1.9.9"
"@vuepress/shared-utils": "1.9.10",
"@vuepress/types": "1.9.10"
}
},
"@vuepress/plugin-search": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-search/-/plugin-search-1.9.9.tgz",
"integrity": "sha512-W/FE+YHoXDD4qk2wu5yRMkti271TA4y+7UBMrmCavvVAGrLIRnaZfswRUgIiDlEthBc+Pn8/As/Dy1jFTLBa9A==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/plugin-search/-/plugin-search-1.9.10.tgz",
"integrity": "sha512-bn2XJikaRgQZXvu8upCjOWrxbLHIRTqnJ3w7G0mo6jCYWGVsHNo6XhVpqylpLR2PWnHT/ImO2bGo38/5Bag/tQ==",
"dev": true,
"requires": {
"@vuepress/types": "1.9.9"
"@vuepress/types": "1.9.10"
}
},
"@vuepress/shared-utils": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/shared-utils/-/shared-utils-1.9.9.tgz",
"integrity": "sha512-qhk/7QF5LgMEXhEB1hlqreGFgkz4p2pmaBBNFxnAnYmSwmyO+u/oFOpZLI16QRx9Wg6ekR2ENmByQLxV7y4lJg==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/shared-utils/-/shared-utils-1.9.10.tgz",
"integrity": "sha512-M9A3DocPih+V8dKK2Zg9FJQ/f3JZrYsdaM/vQ9F48l8bPlzxw5NvqXIYMK4kKcGEyerQNTWCudoCpLL5uiU0hg==",
"dev": true,
"requires": {
"chalk": "^2.3.2",
@ -16559,15 +16595,15 @@
}
},
"@vuepress/theme-default": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/theme-default/-/theme-default-1.9.9.tgz",
"integrity": "sha512-de0FiOwM/h3rFTBSZK0NNBB117lA/e3IHusU7Xm2XeZRiZ/EE3yvbWclZnbbRNt3YjDMmrWXEW/kBTBxfiMuWQ==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/theme-default/-/theme-default-1.9.10.tgz",
"integrity": "sha512-XnXn9t+pYCIhWi3cZXJlighuy93FFm5yXdISAAlFlcNkshuGtqamkjacHV8q/QZMfOhSIs6wX7Hj88u2IsT5mw==",
"dev": true,
"requires": {
"@vuepress/plugin-active-header-links": "1.9.9",
"@vuepress/plugin-nprogress": "1.9.9",
"@vuepress/plugin-search": "1.9.9",
"@vuepress/types": "1.9.9",
"@vuepress/plugin-active-header-links": "1.9.10",
"@vuepress/plugin-nprogress": "1.9.10",
"@vuepress/plugin-search": "1.9.10",
"@vuepress/types": "1.9.10",
"docsearch.js": "^2.5.2",
"lodash": "^4.17.15",
"stylus": "^0.54.8",
@ -16577,9 +16613,9 @@
}
},
"@vuepress/types": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.9.tgz",
"integrity": "sha512-ukGW49ILzLhIc7CltHMr+BeIjWKloJNN1mrvbDz3beycp9b9kgH+DXNdRIK9QCKr4fJsy7x08vNMwZr9Nq/PTQ==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/@vuepress/types/-/types-1.9.10.tgz",
"integrity": "sha512-TDNQn4og85onmBpLTTXXmncW3rUnYGr2MkuI8OIFJZetDNM49t1WbjNVlrT+kx7C6qXi6okDQgrHGYXajHZWfg==",
"dev": true,
"requires": {
"@types/markdown-it": "^10.0.0",
@ -20757,13 +20793,13 @@
"dev": true
},
"micromatch": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
"version": "4.0.5",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
"dev": true,
"requires": {
"braces": "^3.0.1",
"picomatch": "^2.2.3"
"braces": "^3.0.2",
"picomatch": "^2.3.1"
}
},
"to-regex-range": {
@ -22715,9 +22751,9 @@
"dev": true
},
"picomatch": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
"dev": true
},
"pify": {
@ -25989,14 +26025,14 @@
"dev": true
},
"vuepress": {
"version": "1.9.9",
"resolved": "https://registry.npmjs.org/vuepress/-/vuepress-1.9.9.tgz",
"integrity": "sha512-CU94W3EdWaCavGx2VSvQJMI/hyv+m/YMdrvJJw67EVfmmJJDb1iTGrilDgLd0qsyrXzBy0Ru9Qi6rkf4IwcOTg==",
"version": "1.9.10",
"resolved": "https://registry.npmjs.org/vuepress/-/vuepress-1.9.10.tgz",
"integrity": "sha512-UnGm9vjQvG918SZVNvgiUlNimLqawdYPq0aPRXDpEB1VksvqegVFy/GKdA8ShXJaEpOMPSt7YD4uK21jaMs3kA==",
"dev": true,
"requires": {
"@vuepress/core": "1.9.9",
"@vuepress/theme-default": "1.9.9",
"@vuepress/types": "1.9.9",
"@vuepress/core": "1.9.10",
"@vuepress/theme-default": "1.9.10",
"@vuepress/types": "1.9.10",
"cac": "^6.5.6",
"envinfo": "^7.2.0",
"opencollective-postinstall": "^2.0.2",

2
docs/package.json
View File

@ -4,7 +4,7 @@
"build": "vuepress build"
},
"devDependencies": {
"vuepress": "^1.9.9",
"vuepress": "^1.9.10",
"vuepress-plugin-code-copy": "^1.0.6",
"vuepress-plugin-sitemap": "^2.3.1",
"vuepress-theme-default-prefers-color-scheme": "^2.0.0"

102
src/config.rs
View File

@ -287,64 +287,62 @@ pub fn parse_style_string(
) -> Option<nu_ansi_term::Style> {
style_string
.split_whitespace()
.fold(Some(nu_ansi_term::Style::new()), |maybe_style, token| {
maybe_style.and_then(|style| {
let token = token.to_lowercase();
.try_fold(nu_ansi_term::Style::new(), |style, token| {
let token = token.to_lowercase();
// Check for FG/BG identifiers and strip them off if appropriate
// If col_fg is true, color the foreground. If it's false, color the background.
let (token, col_fg) = if token.as_str().starts_with("fg:") {
(token.trim_start_matches("fg:").to_owned(), true)
} else if token.as_str().starts_with("bg:") {
(token.trim_start_matches("bg:").to_owned(), false)
} else {
(token, true) // Bare colors are assumed to color the foreground
};
// Check for FG/BG identifiers and strip them off if appropriate
// If col_fg is true, color the foreground. If it's false, color the background.
let (token, col_fg) = if token.as_str().starts_with("fg:") {
(token.trim_start_matches("fg:").to_owned(), true)
} else if token.as_str().starts_with("bg:") {
(token.trim_start_matches("bg:").to_owned(), false)
} else {
(token, true) // Bare colors are assumed to color the foreground
};
match token.as_str() {
"underline" => Some(style.underline()),
"bold" => Some(style.bold()),
"italic" => Some(style.italic()),
"dimmed" => Some(style.dimmed()),
"inverted" => Some(style.reverse()),
"blink" => Some(style.blink()),
"hidden" => Some(style.hidden()),
"strikethrough" => Some(style.strikethrough()),
// When the string is supposed to be a color:
// Decide if we yield none, reset background or set color.
color_string => {
if color_string == "none" && col_fg {
None // fg:none yields no style.
match token.as_str() {
"underline" => Some(style.underline()),
"bold" => Some(style.bold()),
"italic" => Some(style.italic()),
"dimmed" => Some(style.dimmed()),
"inverted" => Some(style.reverse()),
"blink" => Some(style.blink()),
"hidden" => Some(style.hidden()),
"strikethrough" => Some(style.strikethrough()),
// When the string is supposed to be a color:
// Decide if we yield none, reset background or set color.
color_string => {
if color_string == "none" && col_fg {
None // fg:none yields no style.
} else {
// Either bg or valid color or both.
let parsed = parse_color_string(
color_string,
context.and_then(|x| {
get_palette(
&x.root_config.palettes,
x.root_config.palette.as_deref(),
)
}),
);
// bg + invalid color = reset the background to default.
if !col_fg && parsed.is_none() {
let mut new_style = style;
new_style.background = Option::None;
Some(new_style)
} else {
// Either bg or valid color or both.
let parsed = parse_color_string(
color_string,
context.and_then(|x| {
get_palette(
&x.root_config.palettes,
x.root_config.palette.as_deref(),
)
}),
);
// bg + invalid color = reset the background to default.
if !col_fg && parsed.is_none() {
let mut new_style = style;
new_style.background = Option::None;
Some(new_style)
} else {
// Valid color, apply color to either bg or fg
parsed.map(|ansi_color| {
if col_fg {
style.fg(ansi_color)
} else {
style.on(ansi_color)
}
})
}
// Valid color, apply color to either bg or fg
parsed.map(|ansi_color| {
if col_fg {
style.fg(ansi_color)
} else {
style.on(ansi_color)
}
})
}
}
}
})
}
})
}

4
src/formatter/string_formatter.rs
View File

@ -546,12 +546,12 @@ mod tests {
#[test]
fn test_escaped_chars() {
const FORMAT_STR: &str = r#"\\\[\$text\]\(red bold\)"#;
const FORMAT_STR: &str = r"\\\[\$text\]\(red bold\)";
let formatter = StringFormatter::new(FORMAT_STR).unwrap().map(empty_mapper);
let result = formatter.parse(None, None).unwrap();
let mut result_iter = result.iter();
match_next!(result_iter, r#"\[$text](red bold)"#, None);
match_next!(result_iter, r"\[$text](red bold)", None);
}
#[test]

4
src/logger.rs
View File

@ -37,12 +37,12 @@ pub fn cleanup_log_files<P: AsRef<Path>>(path: P) {
let log_dir = path.as_ref();
let Ok(log_files) = fs::read_dir(log_dir) else {
// Avoid noisily handling errors in this cleanup function.
return
return;
};
for file in log_files {
// Skip files that can't be read.
let Ok (file) = file else {
let Ok(file) = file else {
continue;
};

2
src/module.rs
View File

@ -231,7 +231,7 @@ where
strs.into_iter()
.chain(std::iter::once(fill.ansi_string(fill_size)))
})
.chain(current.into_iter())
.chain(current)
.collect::<Vec<AnsiString>>()
}
}

14
src/modules/package.rs
View File

@ -194,7 +194,7 @@ fn get_meson_version(context: &Context, config: &PackageConfig) -> Option<String
.split_ascii_whitespace()
.collect::<String>();
let re = Regex::new(r#"project\([^())]*,version:'(?P<version>[^']+)'[^())]*\)"#).unwrap();
let re = Regex::new(r"project\([^())]*,version:'(?P<version>[^']+)'[^())]*\)").unwrap();
let caps = re.captures(&file_contents)?;
format_version(&caps["version"], config.version_format)
@ -487,12 +487,12 @@ mod tests {
fn test_extract_nimble_package_version() -> io::Result<()> {
let config_name = "test_project.nimble";
let config_content = r##"
let config_content = r#"
version = "0.1.0"
author = "Mr. nimble"
description = "A new awesome nimble package"
license = "MIT"
"##;
"#;
let project_dir = create_project_dir()?;
fill_config(&project_dir, config_name, Some(config_content))?;
@ -505,7 +505,7 @@ license = "MIT"
.cmd(
"nimble dump --json",
Some(CommandOutput {
stdout: r##"
stdout: r#"
{
"name": "test_project.nimble",
"version": "0.1.0",
@ -524,7 +524,7 @@ license = "MIT"
"srcDir": "",
"backend": "c"
}
"##
"#
.to_owned(),
stderr: String::new(),
}),
@ -547,12 +547,12 @@ license = "MIT"
) -> io::Result<()> {
let config_name = "test_project.nimble";
let config_content = r##"
let config_content = r#"
version = "0.1.0"
author = "Mr. nimble"
description = "A new awesome nimble package"
license = "MIT"
"##;
"#;
let project_dir = create_project_dir()?;
fill_config(&project_dir, config_name, Some(config_content))?;

2
src/modules/time.rs
View File

@ -81,7 +81,7 @@ fn create_offset_time_string(
if utc_time_offset_in_hours < 24_f32 && utc_time_offset_in_hours > -24_f32 {
let utc_offset_in_seconds: i32 = (utc_time_offset_in_hours * 3600_f32) as i32;
let Some(timezone_offset) = FixedOffset::east_opt(utc_offset_in_seconds) else {
return Err("Invalid offset")
return Err("Invalid offset");
};
log::trace!("Target timezone offset is {}", timezone_offset);