From c2d1a6c9fee715d72594389360b47ed2395d8745 Mon Sep 17 00:00:00 2001 From: Redfire Date: Sat, 2 Dec 2023 19:40:56 +0800 Subject: [PATCH] chore(deps): Update `base64` to `v0.21` (#8369) --- Cargo.lock | 53 ++++++++++++------- crates/swc/Cargo.toml | 2 +- crates/swc/src/lib.rs | 9 ++-- crates/swc_bundler/Cargo.toml | 2 +- crates/swc_compiler_base/Cargo.toml | 2 +- crates/swc_compiler_base/src/lib.rs | 7 +-- crates/swc_ecma_codegen/Cargo.toml | 2 +- crates/swc_ecma_codegen/tests/sourcemap.rs | 3 +- crates/swc_ecma_transforms_react/Cargo.toml | 2 +- .../src/refresh/hook.rs | 3 +- crates/swc_ecma_transforms_testing/Cargo.toml | 2 +- crates/swc_ecma_transforms_testing/src/lib.rs | 3 +- 12 files changed, 53 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 721420b48213..edeecaf20eb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -284,12 +284,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.0" @@ -3155,11 +3149,11 @@ checksum = "e3a8614ee435691de62bcffcf4a66d91b3594bf1428a5722e79103249a095690" [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.13.1", + "base64", "bytes", "encoding_rs", "futures-core", @@ -3180,6 +3174,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -3796,7 +3791,7 @@ version = "0.269.76" dependencies = [ "ansi_term", "anyhow", - "base64 0.13.1", + "base64", "criterion", "dashmap", "either", @@ -3978,7 +3973,7 @@ name = "swc_compiler_base" version = "0.3.80" dependencies = [ "anyhow", - "base64 0.13.1", + "base64", "napi", "napi-derive", "pathdiff", @@ -4276,7 +4271,7 @@ dependencies = [ name = "swc_ecma_codegen" version = "0.146.37" dependencies = [ - "base64 0.13.1", + "base64", "criterion", "memchr", "num-bigint", @@ -4885,7 +4880,7 @@ dependencies = [ name = "swc_ecma_transforms_react" version = "0.180.60" dependencies = [ - "base64 0.13.1", + "base64", "dashmap", "indexmap 1.9.3", "once_cell", @@ -4915,7 +4910,7 @@ version = "0.137.51" dependencies = [ "ansi_term", "anyhow", - "base64 0.13.1", + "base64", "hex", "serde", "serde_json", @@ -5478,6 +5473,27 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -6614,7 +6630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02ba1b6e7ad252e691a86d727aa422fbc5ed95e9bca4ec8547869e9b5779f8f3" dependencies = [ "anyhow", - "base64 0.21.0", + "base64", "byteorder", "bytes", "indexmap 1.9.3", @@ -6899,11 +6915,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] diff --git a/crates/swc/Cargo.toml b/crates/swc/Cargo.toml index 1648c6a2f920..0c56fdb389d0 100644 --- a/crates/swc/Cargo.toml +++ b/crates/swc/Cargo.toml @@ -49,7 +49,7 @@ plugin_transform_host_native = [ [dependencies] anyhow = "1" -base64 = "0.13.0" +base64 = "0.21.0" dashmap = "5.4.0" either = "1" indexmap = { version = "1.9.3", features = ["serde"] } diff --git a/crates/swc/src/lib.rs b/crates/swc/src/lib.rs index 26edea353344..c70276c53058 100644 --- a/crates/swc/src/lib.rs +++ b/crates/swc/src/lib.rs @@ -120,6 +120,7 @@ use std::{ use anyhow::{bail, Context, Error}; use atoms::JsWord; +use base64::prelude::{Engine, BASE64_STANDARD}; use common::{collections::AHashMap, comments::SingleThreadedComments, errors::HANDLER}; use jsonc_parser::{parse_to_serde_value, ParseOptions}; use once_cell::sync::Lazy; @@ -265,11 +266,9 @@ impl Compiler { let content = url.path()[idx + "base64,".len()..].trim(); - let res = base64::decode_config( - content.as_bytes(), - base64::Config::new(base64::CharacterSet::Standard, true), - ) - .context("failed to decode base64-encoded source map")?; + let res = BASE64_STANDARD + .decode(content.as_bytes()) + .context("failed to decode base64-encoded source map")?; Ok(Some(sourcemap::SourceMap::from_slice(&res).context( "failed to read input source map from inlined base64 encoded \ diff --git a/crates/swc_bundler/Cargo.toml b/crates/swc_bundler/Cargo.toml index 227417b2153f..ead2dcc684bf 100644 --- a/crates/swc_bundler/Cargo.toml +++ b/crates/swc_bundler/Cargo.toml @@ -54,7 +54,7 @@ swc_graph_analyzer = { version = "0.22.12", path = "../swc_graph_a hex = "0.4" ntest = "0.7.2" path-clean = "=0.1.0" -reqwest = { version = "0.11.13", features = ["blocking"] } +reqwest = { version = "0.11.14", features = ["blocking"] } sha-1 = "0.10" tempfile = "3.6.0" url = "2.4.0" diff --git a/crates/swc_compiler_base/Cargo.toml b/crates/swc_compiler_base/Cargo.toml index e1de461a8572..1642eaec1503 100644 --- a/crates/swc_compiler_base/Cargo.toml +++ b/crates/swc_compiler_base/Cargo.toml @@ -14,7 +14,7 @@ node = ["napi", "napi-derive"] [dependencies] anyhow = "1.0.75" -base64 = "0.13.0" +base64 = "0.21.0" pathdiff = "0.2.0" serde = { version = "1.0.188", features = ["derive"] } sourcemap = "6.2" diff --git a/crates/swc_compiler_base/src/lib.rs b/crates/swc_compiler_base/src/lib.rs index a222467cd0d0..f7efc5aeab82 100644 --- a/crates/swc_compiler_base/src/lib.rs +++ b/crates/swc_compiler_base/src/lib.rs @@ -4,6 +4,7 @@ use std::{ }; use anyhow::{Context, Error}; +use base64::prelude::{Engine, BASE64_STANDARD}; use serde::{ de::{Unexpected, Visitor}, Deserialize, Deserializer, Serialize, Serializer, @@ -212,11 +213,7 @@ where let map = String::from_utf8(buf).context("source map is not utf-8")?; src.push_str("\n//# sourceMappingURL=data:application/json;base64,"); - base64::encode_config_buf( - map.as_bytes(), - base64::Config::new(base64::CharacterSet::Standard, true), - &mut src, - ); + BASE64_STANDARD.encode_string(map.as_bytes(), &mut src); (src, None) } }; diff --git a/crates/swc_ecma_codegen/Cargo.toml b/crates/swc_ecma_codegen/Cargo.toml index 554267084bba..a3eec9bb9aa2 100644 --- a/crates/swc_ecma_codegen/Cargo.toml +++ b/crates/swc_ecma_codegen/Cargo.toml @@ -31,7 +31,7 @@ swc_ecma_ast = { version = "0.110.11", path = "../swc_ecma_ast" } swc_ecma_codegen_macros = { version = "0.7.3", path = "../swc_ecma_codegen_macros" } [dev-dependencies] -base64 = "0.13" +base64 = "0.21" criterion = "0.5" serde_json = "1" diff --git a/crates/swc_ecma_codegen/tests/sourcemap.rs b/crates/swc_ecma_codegen/tests/sourcemap.rs index dd8358b06dfc..c55ede261912 100644 --- a/crates/swc_ecma_codegen/tests/sourcemap.rs +++ b/crates/swc_ecma_codegen/tests/sourcemap.rs @@ -1,5 +1,6 @@ use std::{fs::read_to_string, path::PathBuf}; +use base64::prelude::{Engine, BASE64_STANDARD}; use rustc_hash::FxHashSet; use sourcemap::SourceMap; use swc_common::{comments::SingleThreadedComments, source_map::SourceMapGenConfig}; @@ -489,7 +490,7 @@ fn visualizer_url(code: &str, map: &SourceMap) -> String { let code_len = format!("{}\0", code.len()); let map_len = format!("{}\0", map.len()); - let hash = base64::encode(format!("{}{}{}{}", code_len, code, map_len, map)); + let hash = BASE64_STANDARD.encode(format!("{}{}{}{}", code_len, code, map_len, map)); format!("https://evanw.github.io/source-map-visualization/#{}", hash) } diff --git a/crates/swc_ecma_transforms_react/Cargo.toml b/crates/swc_ecma_transforms_react/Cargo.toml index 0ca7a67da9e2..249996e90828 100644 --- a/crates/swc_ecma_transforms_react/Cargo.toml +++ b/crates/swc_ecma_transforms_react/Cargo.toml @@ -18,7 +18,7 @@ default = ["serde-impl"] serde-impl = ["serde"] [dependencies] -base64 = "0.13.0" +base64 = "0.21.0" dashmap = "5.4.0" indexmap = "1.9.3" once_cell = "1.18.0" diff --git a/crates/swc_ecma_transforms_react/src/refresh/hook.rs b/crates/swc_ecma_transforms_react/src/refresh/hook.rs index 065743b8499f..9a846100be36 100644 --- a/crates/swc_ecma_transforms_react/src/refresh/hook.rs +++ b/crates/swc_ecma_transforms_react/src/refresh/hook.rs @@ -1,5 +1,6 @@ use std::{fmt::Write, mem}; +use base64::prelude::{Engine, BASE64_STANDARD}; use sha1::{Digest, Sha1}; use swc_common::{util::take::Take, SourceMap, SourceMapper, Spanned, SyntaxContext, DUMMY_SP}; use swc_ecma_ast::*; @@ -104,7 +105,7 @@ impl<'a> HookRegister<'a> { } else { let mut hasher = Sha1::new(); hasher.update(sign); - base64::encode(hasher.finalize()) + BASE64_STANDARD.encode(hasher.finalize()) }; args.push( diff --git a/crates/swc_ecma_transforms_testing/Cargo.toml b/crates/swc_ecma_transforms_testing/Cargo.toml index ce641e33109d..5fbbeb94f3df 100644 --- a/crates/swc_ecma_transforms_testing/Cargo.toml +++ b/crates/swc_ecma_transforms_testing/Cargo.toml @@ -14,7 +14,7 @@ bench = false [dependencies] ansi_term = "0.12.1" anyhow = "1" -base64 = "0.13" +base64 = "0.21" hex = "0.4.3" serde = "1" serde_json = "1" diff --git a/crates/swc_ecma_transforms_testing/src/lib.rs b/crates/swc_ecma_transforms_testing/src/lib.rs index 2836914b2f02..fbfca77521a9 100644 --- a/crates/swc_ecma_transforms_testing/src/lib.rs +++ b/crates/swc_ecma_transforms_testing/src/lib.rs @@ -16,6 +16,7 @@ use std::{ use ansi_term::Color; use anyhow::Error; +use base64::prelude::{Engine, BASE64_STANDARD}; use serde::de::DeserializeOwned; use sha1::{Digest, Sha1}; use swc_common::{ @@ -902,7 +903,7 @@ fn visualizer_url(code: &str, map: &sourcemap::SourceMap) -> String { let code_len = format!("{}\0", code.len()); let map_len = format!("{}\0", map.len()); - let hash = base64::encode(format!("{}{}{}{}", code_len, code, map_len, map)); + let hash = BASE64_STANDARD.encode(format!("{}{}{}{}", code_len, code, map_len, map)); format!("https://evanw.github.io/source-map-visualization/#{}", hash) }