Skip to content

Commit

Permalink
Updated Dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Redfire75369 committed Oct 18, 2023
1 parent fbb774a commit c3d9073
Show file tree
Hide file tree
Showing 9 changed files with 183 additions and 214 deletions.
326 changes: 149 additions & 177 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ default-features = false
features = ["http1", "logging", "tls12", "webpki-tokio"]

[workspace.dependencies.tokio]
version = "1.32.0"
features = ["rt"]
version = "1.33.0"
default-features = false
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ features = ["fetch", "promise-logger"]

[dependencies.tokio]
workspace = true
features = ["macros"]
features = ["macros", "rt"]

[features]
debugmozjs = ["ion/debugmozjs"]
Expand Down
4 changes: 2 additions & 2 deletions ion-proc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ convert_case = "0.6.0"
either = "1.9.0"
quote = "1.0.33"
prettyplease = "0.2.15"
proc-macro2 = "1.0.67"
proc-macro2 = "1.0.69"

[dependencies.syn]
version = "2.0.37"
version = "2.0.38"
features = ["extra-traits", "full", "visit-mut"]

[lib]
Expand Down
4 changes: 2 additions & 2 deletions ion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ authors = ["Redfire <[email protected]>"]
license = "MPL-2.0"

[dependencies]
bitflags = "2.4.0"
byteorder = "1.4.3"
bitflags = "2.4.1"
byteorder = "1.5.0"
bytemuck = "1.14.0"
libffi = "3.2.0"
typed-arena = "2.0.2"
Expand Down
2 changes: 1 addition & 1 deletion modules/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ version = "0.1.14"
features = ["fs"]

[dev-dependencies.tokio]
version = "1.32.0"
version = "1.33.0"
features = ["macros", "rt"]

[features]
Expand Down
27 changes: 14 additions & 13 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dirs = "5.0.1"
encoding_rs = "0.8.33"
form_urlencoded = "1.2.0"
indexmap = "2.0.2"
os_str_bytes = "6.5.1"
paste = "1.0.14"
sha3 = "0.10.8"
term-table = "1.3.2"
Expand Down Expand Up @@ -47,20 +46,22 @@ path = "../ion"
features = ["macros", "sourcemap"]

[dependencies.swc_core]
version = "0.79.69"
features = ["common"]

[dependencies.swc_common]
version = "0.31.21"
features = ["sourcemap", "tty-emitter"]

[dependencies.swc_ecmascript]
version = "0.231.59"
features = ["codegen", "parser", "transforms", "typescript", "visit"]
version = "0.86.4"
features = [
"common",
"common_sourcemap",
"common_tty",
"ecma_ast",
"ecma_codegen",
"ecma_parser",
"ecma_transforms",
"ecma_parser_typescript",
"ecma_transforms_typescript",
"ecma_visit",
]

[dependencies.tokio]
version = "1.32.0"
default-features = false
workspace = true
features = ["sync"]

[features]
Expand Down
3 changes: 1 addition & 2 deletions runtime/src/cache/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use std::str::{from_utf8, Utf8Error};
use base64_url::encode;
use dirs::home_dir;
use dunce::canonicalize;
use os_str_bytes::OsStrBytes;
use sha3::{Digest, Sha3_512};
use sourcemap::SourceMap;

Expand Down Expand Up @@ -52,7 +51,7 @@ impl Cache {
let folder = canonical.parent().ok_or(Error::Other)?;
let folder_name = folder.file_name().and_then(OsStr::to_str).ok_or(Error::Other)?;

let hash = hash(folder.to_raw_bytes(), Some(16));
let hash = hash(folder.as_os_str().to_str().unwrap().as_bytes(), Some(16));
let folder = self.dir.join(format!("{}-{}", folder_name, hash));
Ok(folder)
}
Expand Down
25 changes: 11 additions & 14 deletions runtime/src/typescript.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ use swc_core::common::comments::{Comments, SingleThreadedComments};
use swc_core::common::errors::{ColorConfig, Handler};
use swc_core::common::input::StringInput;
use swc_core::common::sync::Lrc;
use swc_ecmascript::ast::EsVersion;
use swc_ecmascript::codegen::{Config as CodegenConfig, Emitter};
use swc_ecmascript::codegen::text_writer::JsWriter;
use swc_ecmascript::parser::{Capturing, Parser, Syntax};
use swc_ecmascript::parser::lexer::Lexer;
use swc_ecmascript::transforms::{fixer, hygiene, resolver};
use swc_ecmascript::transforms::typescript::strip;
use swc_ecmascript::visit::FoldWith;
use swc_core::ecma::ast::EsVersion;
use swc_core::ecma::codegen::{Config as CodegenConfig, Emitter};
use swc_core::ecma::codegen::text_writer::JsWriter;
use swc_core::ecma::parser::{Capturing, Parser, Syntax};
use swc_core::ecma::parser::lexer::Lexer;
use swc_core::ecma::transforms::base::fixer::fixer;
use swc_core::ecma::transforms::base::hygiene::hygiene;
use swc_core::ecma::transforms::base::resolver;
use swc_core::ecma::transforms::typescript::strip;
use swc_core::ecma::visit::FoldWith;

use crate::config::Config;

Expand Down Expand Up @@ -115,12 +117,7 @@ fn initialise_emitter<'a>(
source_map: Lrc<SwcSourceMap>, comments: &'a dyn Comments, buffer: &'a mut Vec<u8>, mappings: &'a mut Vec<(BytePos, LineCol)>,
) -> Emitter<'a, JsWriter<'a, &'a mut Vec<u8>>, SwcSourceMap> {
Emitter {
cfg: CodegenConfig {
target: EsVersion::Es2022,
ascii_only: false,
minify: false,
omit_last_semi: false,
},
cfg: CodegenConfig::default().with_target(EsVersion::Es2022),
cm: source_map.clone(),
comments: Some(comments),
wr: JsWriter::new(source_map, "\n", buffer, Some(mappings)),
Expand Down

0 comments on commit c3d9073

Please sign in to comment.