chore(cargo): Refactor Cargo.toml to reduce merge conflict

crates/ast_node/Cargo.toml

@@ -13,12 +13,13 @@ bench      = false
 proc-macro = true
 
 [dependencies]
-darling           = "0.13"
-pmutil            = "0.5.1"
-proc-macro2       = "1"
-quote             = "1"
+darling     = "0.13"
+pmutil      = "0.5.1"
+proc-macro2 = "1"
+quote       = "1"
+
 swc_macros_common = { version = "0.3.7", path = "../swc_macros_common" }
 
-[dependencies.syn]
-features = ["derive", "fold", "parsing", "printing", "visit-mut"]
-version  = "1"
+    [dependencies.syn]
+    features = ["derive", "fold", "parsing", "printing", "visit-mut"]
+    version  = "1"

crates/dbg-swc/Cargo.toml

@@ -12,14 +12,19 @@ bench = false
 name  = "dbg-swc"
 
 [dependencies]
-anyhow = "1.0.57"
-clap = { version = "3", features = ["derive"] }
-dialoguer = "0.10.2"
-flate2 = "1.0"
-rayon = "1.5.2"
-serde = "1"
-serde_json = "1"
-sha1 = "0.10.1"
+anyhow             = "1.0.57"
+clap               = { version = "3", features = ["derive"] }
+dialoguer          = "0.10.2"
+flate2             = "1.0"
+rayon              = "1.5.2"
+serde              = "1"
+serde_json         = "1"
+sha1               = "0.10.1"
+tempfile           = "3.4.0"
+tracing            = "0.1.34"
+tracing-subscriber = { version = "0.3.11", features = ["fmt", "env-filter"] }
+url                = "2"
+
 swc_atoms = { version = "0.4.39", path = "../swc_atoms" }
 swc_common = { version = "0.29.39", features = [
   "concurrent",
@@ -35,7 +40,3 @@ swc_ecma_transforms_base = { version = "0.122.16", path = "../swc_ecma_transform
 swc_ecma_visit = { version = "0.86.6", path = "../swc_ecma_visit" }
 swc_error_reporters = { version = "0.13.40", path = "../swc_error_reporters" }
 swc_timer = { version = "0.17.42", path = "../swc_timer" }
-tempfile = "3.4.0"
-tracing = "0.1.34"
-tracing-subscriber = { version = "0.3.11", features = ["fmt", "env-filter"] }
-url = "2"

crates/from_variant/Cargo.toml

@@ -1,22 +1,23 @@
 [package]
-authors = ["강동윤 <kdy1997.dev@gmail.com>"]
-description = "Automatically derive From impls for enums"
+authors       = ["강동윤 <kdy1997.dev@gmail.com>"]
+description   = "Automatically derive From impls for enums"
 documentation = "https://rustdoc.swc.rs/from_variant/"
-edition = "2021"
-license = "Apache-2.0"
-name = "from_variant"
-repository = "https://github.com/swc-project/swc.git"
-version = "0.1.5"
+edition       = "2021"
+license       = "Apache-2.0"
+name          = "from_variant"
+repository    = "https://github.com/swc-project/swc.git"
+version       = "0.1.5"
 
 [lib]
-bench = false
+bench      = false
 proc-macro = true
 
 [dependencies]
-pmutil = "0.5.3"
+pmutil      = "0.5.3"
 proc-macro2 = "1"
-swc_macros_common = {version = "0.3.7", path = "../swc_macros_common"}
 
-[dependencies.syn]
-features = ["derive", "fold", "parsing", "printing"]
-version = "1"
+swc_macros_common = { version = "0.3.7", path = "../swc_macros_common" }
+
+    [dependencies.syn]
+    features = ["derive", "fold", "parsing", "printing"]
+    version  = "1"

crates/jsdoc/Cargo.toml

@@ -18,8 +18,9 @@ swc_atoms  = { version = "0.4.39", path = "../swc_atoms" }
 swc_common = { version = "0.29.39", path = "../swc_common" }
 
 [dev-dependencies]
-anyhow          = "1"
-dashmap         = "5.1.0"
+anyhow  = "1"
+dashmap = "5.1.0"
+
 swc_ecma_ast    = { version = "0.100.5", path = "../swc_ecma_ast" }
 swc_ecma_parser = { version = "0.130.10", path = "../swc_ecma_parser" }
 testing         = { version = "0.31.42", path = "../testing" }

crates/preset_env_base/Cargo.toml

@@ -15,9 +15,10 @@ ahash           = "0.7.4"
 anyhow          = "1"
 browserslist-rs = "0.12.2"
 dashmap         = "5.1.0"
-from_variant    = { version = "0.1.5", path = "../from_variant" }
 once_cell       = "1.12.0"
 semver          = { version = "1.0.4", features = ["serde"] }
 serde           = { version = "1", features = ["derive"] }
 st-map          = "0.1.2"
 tracing         = { version = "0.1.32" }
+
+from_variant = { version = "0.1.5", path = "../from_variant" }

crates/swc/Cargo.toml

@@ -47,22 +47,25 @@ plugin_transform_schema_vtest = [
 ]
 
 [dependencies]
-ahash = "0.7.4"
-anyhow = "1"
-base64 = "0.13.0"
-dashmap = "5.1.0"
-either = "1"
-indexmap = { version = "1.6.1", features = ["serde"] }
+ahash        = "0.7.4"
+anyhow       = "1"
+base64       = "0.13.0"
+dashmap      = "5.1.0"
+either       = "1"
+indexmap     = { version = "1.6.1", features = ["serde"] }
 jsonc-parser = { version = "0.21.0", features = ["serde"] }
-lru = "0.7.1"
-once_cell = "1.10.0"
-parking_lot = "0.12.0"
-pathdiff = "0.2.0"
-regex = "1"
-rustc-hash = "1.1.0"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-sourcemap = "6"
+lru          = "0.7.1"
+once_cell    = "1.10.0"
+parking_lot  = "0.12.0"
+pathdiff     = "0.2.0"
+regex        = "1"
+rustc-hash   = "1.1.0"
+serde        = { version = "1", features = ["derive"] }
+serde_json   = "1"
+sourcemap    = "6"
+tracing      = "0.1.32"
+url          = "2.3.1"
+
 swc_atoms = { version = "0.4.39", path = "../swc_atoms" }
 swc_cached = { version = "0.3.15", path = "../swc_cached" }
 swc_common = { version = "0.29.39", path = "../swc_common", features = [
@@ -101,8 +104,7 @@ swc_plugin_proxy = { version = "0.29.5", path = "../swc_plugin_proxy", optional
 swc_plugin_runner = { version = "0.91.10", path = "../swc_plugin_runner", optional = true, default-features = false }
 swc_timer = { version = "0.17.42", path = "../swc_timer" }
 swc_visit = { version = "0.5.5", path = "../swc_visit" }
-tracing = "0.1.32"
-url = "2.3.1"
+
 
   [dependencies.napi-derive]
   default-features = false

crates/swc_bundler/Cargo.toml

@@ -1,72 +1,74 @@
 [package]
 authors = ["강동윤 <kdy1997.dev@gmail.com>"]
 # OUT_DIR is required for testing
-build = "build.rs"
-description = "Very fast ecmascript bundler"
+build         = "build.rs"
+description   = "Very fast ecmascript bundler"
 documentation = "https://rustdoc.swc.rs/swc_bundler/"
-edition = "2021"
-include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/**/*.js"]
-license = "Apache-2.0"
-name = "swc_bundler"
-repository = "https://github.com/swc-project/swc.git"
-version = "0.208.23"
+edition       = "2021"
+include       = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/**/*.js"]
+license       = "Apache-2.0"
+name          = "swc_bundler"
+repository    = "https://github.com/swc-project/swc.git"
+version       = "0.208.23"
 
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
+  [package.metadata.docs.rs]
+  all-features = true
+  rustdoc-args = ["--cfg", "docsrs"]
 
 [lib]
 bench = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
 concurrent = ["swc_common/concurrent", "dashmap", "rayon", "indexmap/rayon"]
-default = []
+default    = []
 
 [dependencies]
-ahash = "0.7"
-anyhow = "1"
-crc = "2.1.0"
-dashmap = {version = "5.1.0", optional = true}
-indexmap = "1.6.1"
-is-macro = "0.2.0"
-once_cell = "1.10.0"
-parking_lot = "0.12.0"
-petgraph = "0.6"
-radix_fmt = "1"
-rayon = {version = "1", optional = true}
+ahash         = "0.7"
+anyhow        = "1"
+crc           = "2.1.0"
+dashmap       = { version = "5.1.0", optional = true }
+indexmap      = "1.6.1"
+is-macro      = "0.2.0"
+once_cell     = "1.10.0"
+parking_lot   = "0.12.0"
+petgraph      = "0.6"
+radix_fmt     = "1"
+rayon         = { version = "1", optional = true }
 relative-path = "1.2"
-swc_atoms = {version = "0.4.39", path = "../swc_atoms"}
-swc_common = {version = "0.29.39", path = "../swc_common"}
-swc_ecma_ast = {version = "0.100.5", path = "../swc_ecma_ast"}
-swc_ecma_codegen = {version = "0.135.11", path = "../swc_ecma_codegen"}
-swc_ecma_loader = {version = "0.41.41", path = "../swc_ecma_loader"}
-swc_ecma_parser = {version = "0.130.10", path = "../swc_ecma_parser"}
-swc_ecma_transforms_base = {version = "0.122.16", path = "../swc_ecma_transforms_base"}
-swc_ecma_transforms_optimization = {version = "0.181.21", path = "../swc_ecma_transforms_optimization"}
-swc_ecma_utils = {version = "0.113.11", path = "../swc_ecma_utils"}
-swc_ecma_visit = {version = "0.86.6", path = "../swc_ecma_visit"}
-swc_fast_graph = {version = "0.17.41", path = "../swc_fast_graph/"}
-swc_graph_analyzer = {version = "0.18.44", path = "../swc_graph_analyzer/"}
-tracing = "0.1.32"
+tracing       = "0.1.32"
+
+swc_atoms                        = { version = "0.4.39", path = "../swc_atoms" }
+swc_common                       = { version = "0.29.39", path = "../swc_common" }
+swc_ecma_ast                     = { version = "0.100.5", path = "../swc_ecma_ast" }
+swc_ecma_codegen                 = { version = "0.135.11", path = "../swc_ecma_codegen" }
+swc_ecma_loader                  = { version = "0.41.41", path = "../swc_ecma_loader" }
+swc_ecma_parser                  = { version = "0.130.10", path = "../swc_ecma_parser" }
+swc_ecma_transforms_base         = { version = "0.122.16", path = "../swc_ecma_transforms_base" }
+swc_ecma_transforms_optimization = { version = "0.181.21", path = "../swc_ecma_transforms_optimization" }
+swc_ecma_utils                   = { version = "0.113.11", path = "../swc_ecma_utils" }
+swc_ecma_visit                   = { version = "0.86.6", path = "../swc_ecma_visit" }
+swc_fast_graph                   = { version = "0.17.41", path = "../swc_fast_graph/" }
+swc_graph_analyzer               = { version = "0.18.44", path = "../swc_graph_analyzer/" }
 
 [dev-dependencies]
-hex = "0.4"
-ntest = "0.7.2"
+hex        = "0.4"
+ntest      = "0.7.2"
 path-clean = "=0.1.0"
-reqwest = {version = "0.11.13", features = ["blocking"]}
-sha-1 = "0.10"
-swc_ecma_loader = {version = "0.41.41", path = "../swc_ecma_loader", features = [
+reqwest    = { version = "0.11.13", features = ["blocking"] }
+sha-1      = "0.10"
+tempfile   = "3.4.0"
+url        = "2.1.1"
+
+swc_ecma_loader = { version = "0.41.41", path = "../swc_ecma_loader", features = [
   "node",
   "cache",
-]}
-swc_ecma_minifier = {version = "0.175.23", path = "../swc_ecma_minifier", features = [
+] }
+swc_ecma_minifier = { version = "0.175.23", path = "../swc_ecma_minifier", features = [
   "concurrent",
-]}
-swc_ecma_transforms_proposal = {version = "0.156.18", path = "../swc_ecma_transforms_proposal"}
-swc_ecma_transforms_react = {version = "0.167.20", path = "../swc_ecma_transforms_react"}
-swc_ecma_transforms_typescript = {version = "0.171.20", path = "../swc_ecma_transforms_typescript"}
-swc_node_base = {version = "0.5.8", path = "../swc_node_base"}
-tempfile = "3.4.0"
-testing = {version = "0.31.42", path = "../testing"}
-url = "2.1.1"
+] }
+swc_ecma_transforms_proposal = { version = "0.156.18", path = "../swc_ecma_transforms_proposal" }
+swc_ecma_transforms_react = { version = "0.167.20", path = "../swc_ecma_transforms_react" }
+swc_ecma_transforms_typescript = { version = "0.171.20", path = "../swc_ecma_transforms_typescript" }
+swc_node_base = { version = "0.5.8", path = "../swc_node_base" }
+testing = { version = "0.31.42", path = "../testing" }

crates/swc_common/Cargo.toml

@@ -52,33 +52,35 @@ rkyv-bytecheck-impl = ["__rkyv", "rkyv-latest", "swc_atoms/rkyv-bytecheck-impl"]
 ahash                 = "0.7.4"
 anyhow                = { version = "1.0.45", optional = true }
 arbitrary             = { version = "1", optional = true, features = ["derive"] }
-ast_node              = { version = "0.8.8", path = "../ast_node" }
 atty                  = { version = "0.2", optional = true }
-better_scoped_tls     = { version = "0.1.0", path = "../better_scoped_tls" }
 bytecheck             = { version = "0.6.9", optional = true }
 cfg-if                = "1.0.0"
 either                = "1.5"
-from_variant          = { version = "0.1.5", path = "../from_variant" }
 new_debug_unreachable = "1.0.4"
 num-bigint            = "0.4"
 once_cell             = "1.10.0"
 parking_lot           = { version = "0.12.0", optional = true }
 rkyv                  = { version = "=0.7.37", optional = true }
 # This is to avoid cargo version selection conflict between rkyv=0.7.37 and other versions, as it is strictly pinned
 # cannot be merged.
-rkyv-latest          = { package = "rkyv-test", version = "=0.7.38-test.2", optional = true }
-rustc-hash           = "1.1.0"
-serde                = { version = "1.0.119", features = ["derive"] }
-siphasher            = "0.3.9"
-sourcemap            = { version = "6", optional = true }
-string_cache         = "0.8.7"
+rkyv-latest   = { package = "rkyv-test", version = "=0.7.38-test.2", optional = true }
+rustc-hash    = "1.1.0"
+serde         = { version = "1.0.119", features = ["derive"] }
+siphasher     = "0.3.9"
+sourcemap     = { version = "6", optional = true }
+string_cache  = "0.8.7"
+termcolor     = { version = "1.0", optional = true }
+tracing       = "0.1.32"
+unicode-width = "0.1.4"
+url           = "2.2.2"
+
+ast_node             = { version = "0.8.8", path = "../ast_node" }
+better_scoped_tls    = { version = "0.1.0", path = "../better_scoped_tls" }
+from_variant         = { version = "0.1.5", path = "../from_variant" }
 swc_atoms            = { version = "0.4.39", path = "../swc_atoms" }
 swc_eq_ignore_macros = { version = "0.1.1", path = "../swc_eq_ignore_macros" }
 swc_visit            = { version = "0.5.5", path = "../swc_visit" }
-termcolor            = { version = "1.0", optional = true }
-tracing              = "0.1.32"
-unicode-width        = "0.1.4"
-url                  = "2.2.2"
+
 
 [dev-dependencies]
 criterion  = "0.3"

crates/swc_config/Cargo.toml

@@ -9,9 +9,10 @@ repository    = "https://github.com/swc-project/swc.git"
 version       = "0.1.5"
 
 [dependencies]
-indexmap         = "1.6.1"
-serde            = { version = "1", features = ["derive"] }
-serde_json       = "1"
+indexmap   = "1.6.1"
+serde      = { version = "1", features = ["derive"] }
+serde_json = "1"
+
 swc_config_macro = { version = "0.1.1", path = "../swc_config_macro" }
 
 [lib]

crates/swc_config_macro/Cargo.toml

@@ -13,8 +13,9 @@ bench      = false
 proc-macro = true
 
 [dependencies]
-pmutil            = "0.5.3"
-proc-macro2       = "1"
-quote             = "1"
+pmutil      = "0.5.3"
+proc-macro2 = "1"
+quote       = "1"
+syn         = "1"
+
 swc_macros_common = { version = "0.3.7", path = "../swc_macros_common" }
-syn               = "1"

crates/swc_css_ast/Cargo.toml

@@ -19,10 +19,11 @@ rkyv-impl           = ["__rkyv", "rkyv", "swc_atoms/rkyv-impl", "swc_common/rkyv
 
 
 [dependencies]
-bytecheck   = { version = "0.6.9", optional = true }
-is-macro    = "0.2.0"
-rkyv        = { version = "=0.7.37", optional = true }
-serde       = { version = "1.0.127", features = ["derive"] }
+bytecheck = { version = "0.6.9", optional = true }
+is-macro  = "0.2.0"
+rkyv      = { version = "=0.7.37", optional = true }
+serde     = { version = "1.0.127", features = ["derive"] }
+
 string_enum = { version = "0.3.4", path = "../string_enum/" }
 swc_atoms   = { version = "0.4.39", path = "../swc_atoms" }
 swc_common  = { version = "0.29.39", path = "../swc_common" }