Skip to content
This repository has been archived by the owner on Aug 31, 2023. It is now read-only.

Changed internal rome dependencies to workspace #4515

Closed
wants to merge 2 commits into from
Closed

Changed internal rome dependencies to workspace #4515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d94848
Refactored local dependencies
gautamprikshit1 May 20, 2023
ef91020
Merge branch 'rome:main' into workspace_dep_refactor
gautamprikshit1 May 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
521 changes: 310 additions & 211 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 34 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,37 @@ quote = { version = "1.0.21" }
lazy_static = "1.4.0"
bpaf = { version = "0.7.10", features = ["derive"] }
bitflags = "2.2.1"


rome_rowan = { path = "./crates/rome_rowan" }
rome_console = { path = "./crates/rome_console" }
rome_diagnostics = { path = "./crates/rome_diagnostics" }
rome_deserialize = { path = "./crates/rome_deserialize" }
rome_json_parser = { path = "./crates/rome_json_parser" }
rome_aria_metadata = { path = "./crates/rome_aria_metadata" }
rome_formatter = { path = "./crates/rome_formatter" }
rome_service = { path = "./crates/rome_service" }
rome_flags = { path = "./crates/rome_flags" }
rome_fs = { path = "./crates/rome_fs"}
rome_text_edit = { path = "./crates/rome_text_edit" }
rome_lsp = { path = "./crates/rome_lsp"}
rome_text_size = { path = "./crates/rome_text_size"}
rome_json_formatter = { path = "./crates/rome_json_formatter"}
rome_json_syntax = { path = "./crates/rome_json_syntax"}
rome_migrate = { path = "./crates/rome_migrate"}
rome_js_formatter = { path = "./crates/rome_js_formatter" }
rome_markup = { path = "./crates/rome_markup"}
rome_css_syntax = { path = "./crates/rome_css_syntax" }
rome_diagnostics_macros = { path = "./crates/rome_diagnostics_macros" }
rome_diagnostics_categories = { path = "./crates/rome_diagnostics_categories" }
rome_control_flow = { path = "./crates/rome_control_flow" }
rome_js_semantic = { path = "./crates/rome_js_semantic" }
rome_js_syntax = { path = "./crates/rome_js_syntax" }
rome_js_factory = { path = "./crates/rome_js_factory" }
rome_js_unicode_table = { path = "./crates/rome_js_unicode_table" }
rome_aria = { path = "./crates/rome_aria" }
rome_parser = { path = "./crates/rome_parser" }
rome_formatter_test = { path = "./crates/rome_formatter_test" }
rome_json_factory = { path = "./crates/rome_json_factory" }
rome_analyze = { path = "./crates/rome_analyze" }
tests_macros = { path = "./crates/tests_macros" }
rome_js_parser = { path = "./crates/rome_js_parser" }
rome_js_analyze = { path = "./crates/rome_js_analyze"}
10 changes: 5 additions & 5 deletions crates/rome_analyze/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ license.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_rowan = { path = "../rome_rowan" }
rome_console = { path = "../rome_console" }
rome_diagnostics = { path = "../rome_diagnostics" }
rome_json_parser = { path = "../rome_json_parser" }
rome_deserialize = { path = "../rome_deserialize"}
rome_rowan.workspace = true
rome_console.workspace = true
rome_diagnostics.workspace = true
rome_json_parser.workspace = true
rome_deserialize.workspace = true
bitflags.workspace = true
rustc-hash = { workspace = true }
serde = { version = "1.0.136", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/rome_aria/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ license.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_aria_metadata = { path = "../rome_aria_metadata" }
rome_aria_metadata.workspace = true
36 changes: 18 additions & 18 deletions crates/rome_cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ name = "rome"
path = "src/main.rs"

[dependencies]
rome_formatter = { path = "../rome_formatter" }
rome_diagnostics = { path = "../rome_diagnostics" }
rome_service = { path = "../rome_service" }
rome_flags = { path = "../rome_flags" }
rome_fs = { path = "../rome_fs" }
rome_console = { path = "../rome_console" }
rome_text_edit = { path = "../rome_text_edit" }
rome_lsp = { path = "../rome_lsp" }
rome_deserialize = { path = "../rome_deserialize" }
rome_formatter.workspace = true
rome_diagnostics.workspace = true
rome_service.workspace = true
rome_flags.workspace = true
rome_fs.workspace = true
rome_console.workspace = true
rome_text_edit.workspace = true
rome_lsp.workspace = true
rome_deserialize.workspace = true
pico-args = { version ="0.5.0", features=["eq-separator"] }
bpaf = { workspace = true }
tracing = { workspace = true }
Expand All @@ -36,12 +36,12 @@ serde_json = { version = "1.0.74" }
tokio = { workspace = true, features = ["io-std", "io-util", "net", "time", "rt","sync", "rt-multi-thread", "macros"] }
anyhow = "1.0.52"
dashmap = { workspace = true }
rome_text_size = { path = "../rome_text_size" }
rome_json_parser = { path = "../rome_json_parser" }
rome_json_formatter = { path = "../rome_json_formatter" }
rome_json_syntax = { path = "../rome_json_syntax" }
rome_migrate = { path = "../rome_migrate" }
rome_rowan = { path = "../rome_rowan" }
rome_text_size.workspace = true
rome_json_parser.workspace = true
rome_json_formatter.workspace = true
rome_json_syntax.workspace = true
rome_migrate.workspace = true
rome_rowan.workspace = true
indexmap = { workspace = true }

[target.'cfg(unix)'.dependencies]
Expand All @@ -57,6 +57,6 @@ tikv-jemallocator = "0.5.0"
[dev-dependencies]
insta = { workspace = true }
tokio = { workspace = true, features = ["io-util"] }
rome_json_formatter = { path = "../rome_json_formatter" }
rome_js_formatter = { path = "../rome_js_formatter" }
rome_json_parser = { path = "../rome_json_parser" }
rome_json_formatter.workspace = true
rome_js_formatter.workspace = true
rome_json_parser.workspace = true
4 changes: 2 additions & 2 deletions crates/rome_console/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ documentation = "https://rustdocs.rome.tools/rome_console/index.html"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_markup = { version = "0.0.1", path = "../rome_markup" }
rome_markup.workspace = true
atty = "0.2.14"
rome_text_size = { version = "0.0.1", path = "../rome_text_size"}
rome_text_size.workspace = true
termcolor = "1.1.2"
unicode-width = "0.1.9"
serde = { version = "1.0.133", optional = true, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/rome_control_flow/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ license.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_rowan = { path = "../rome_rowan" }
rome_rowan.workspace = true
4 changes: 2 additions & 2 deletions crates/rome_css_factory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ license.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_rowan = { path = "../rome_rowan" }
rome_css_syntax = { path = "../rome_css_syntax" }
rome_rowan.workspace = true
rome_css_syntax.workspace = true
2 changes: 1 addition & 1 deletion crates/rome_css_syntax/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ license.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_rowan = { path = "../rome_rowan" }
rome_rowan.workspace = true
10 changes: 5 additions & 5 deletions crates/rome_deserialize/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ license.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_console = { path = "../rome_console" }
rome_diagnostics = { path = "../rome_diagnostics"}
rome_json_parser = { path = "../rome_json_parser" }
rome_json_syntax = { path = "../rome_json_syntax" }
rome_console = { workspace = true }
rome_diagnostics = { workspace = true }
rome_json_parser = { workspace = true }
rome_json_syntax = { workspace = true }
tracing = { workspace = true }
indexmap = { workspace = true }
rome_rowan = { path = "../rome_rowan" }
rome_rowan = { workspace = true }
serde = "1.0.150"
serde_json = "1.0.89"
12 changes: 6 additions & 6 deletions crates/rome_diagnostics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ name = "serde"
test = true

[dependencies]
rome_rowan = { version = "0.0.1", path = "../rome_rowan" }
rome_console = { version = "0.0.1", path = "../rome_console", features = ["serde_markup"] }
rome_diagnostics_macros = { version = "0.0.1", path = "../rome_diagnostics_macros" }
rome_diagnostics_categories = { version = "0.0.1", path = "../rome_diagnostics_categories", features = ["serde"] }
rome_text_edit = { version = "0.0.1", path = "../rome_text_edit" }
rome_text_size = { version = "0.0.1", path = "../rome_text_size" }
rome_rowan = { workspace = true }
rome_console = { workspace = true, features = ["serde_markup"] }
rome_diagnostics_macros = { workspace = true }
rome_diagnostics_categories = { workspace = true, features = ["serde"] }
rome_text_edit = { workspace = true }
rome_text_size = { workspace = true }
unicode-width = "0.1.9"
serde = { version = "1.0.133", features = ["derive"] }
termcolor = "1.1.2"
Expand Down
10 changes: 5 additions & 5 deletions crates/rome_formatter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation = "https://rustdocs.rome.tools/rome_formatter/index.html"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_rowan = { version = "0.0.1", path = "../rome_rowan" }
rome_rowan = { workspace = true }
tracing = { workspace = true }
serde = { version = "1.0.136", features = ["derive"], optional = true }
cfg-if = "1.0.0"
Expand All @@ -22,12 +22,12 @@ countme = { workspace = true }
drop_bomb = "0.1.5"
indexmap = { workspace = true }
unicode-width = "0.1.9"
rome_diagnostics = { version = "0.0.1", path = "../rome_diagnostics" }
rome_console = { version = "0.0.1", path = "../rome_console" }
rome_diagnostics = { workspace = true }
rome_console = { workspace = true }

[dev-dependencies]
rome_js_parser = { path = "../rome_js_parser" }
rome_js_syntax = { path = "../rome_js_syntax" }
rome_js_parser = { workspace = true }
rome_js_syntax = { workspace = true }
insta = { workspace = true }

[features]
Expand Down
14 changes: 7 additions & 7 deletions crates/rome_formatter_test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ license.workspace = true
[dependencies]
serde = { version = "1", features = ["derive"] }
serde_json = "1"
rome_parser = { path = "../rome_parser" }
rome_diagnostics = { path = "../rome_diagnostics" }
rome_formatter = { path = "../rome_formatter" }
rome_rowan = { path = "../rome_rowan" }
rome_console = { path = "../../crates/rome_console" }
rome_fs = { path = "../rome_fs" }
rome_service = { path = "../rome_service" }
rome_parser = { workspace = true }
rome_diagnostics = { workspace = true }
rome_formatter = { workspace = true }
rome_rowan = { workspace = true }
rome_console = { workspace = true }
rome_fs = { workspace = true }
rome_service = { workspace = true }
similar = "2.1.0"
similar-asserts = "1.2.0"
insta = { workspace = true, features = ["glob"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/rome_fs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ license.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_diagnostics = { path = "../rome_diagnostics" }
rome_console = { path = "../rome_console" }
rome_diagnostics = { workspace = true }
rome_console = { workspace = true }
indexmap = { workspace = true }
parking_lot = { version = "0.12.0", features = ["arc_lock"] }
rayon = "1.5.1"
Expand Down
32 changes: 16 additions & 16 deletions crates/rome_js_analyze/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ repository.workspace = true
license.workspace = true

[dependencies]
rome_analyze = { path = "../rome_analyze" }
rome_control_flow = { path = "../rome_control_flow" }
rome_rowan = { path = "../rome_rowan" }
rome_js_semantic = { path = "../rome_js_semantic" }
rome_js_syntax = { path = "../rome_js_syntax" }
rome_js_factory = { path = "../rome_js_factory" }
rome_js_unicode_table = { path = "../rome_js_unicode_table" }
rome_json_syntax = { path = "../rome_json_syntax" }
rome_json_factory = { path = "../rome_json_factory" }
rome_console = { path = "../rome_console" }
rome_diagnostics = { path = "../rome_diagnostics" }
rome_deserialize = { path = "../rome_deserialize" }
rome_aria = { path = "../rome_aria" }
rome_analyze = { workspace = true }
rome_control_flow = { workspace = true }
rome_rowan = { workspace = true }
rome_js_semantic = { workspace = true }
rome_js_syntax = { workspace = true }
rome_js_factory = { workspace = true }
rome_js_unicode_table = { workspace = true }
rome_json_syntax = { workspace = true }
rome_json_factory = { workspace = true }
rome_console = { workspace = true }
rome_diagnostics = { workspace = true }
rome_deserialize = { workspace = true }
rome_aria = { workspace = true }
roaring = "0.10.1"
rustc-hash = { workspace = true }
serde = { version = "1.0.136", features = ["derive"] }
Expand All @@ -28,9 +28,9 @@ lazy_static = { workspace = true }
natord = "1.0.9"

[dev-dependencies]
tests_macros = { path = "../tests_macros" }
rome_text_edit = { path = "../rome_text_edit" }
rome_js_parser = { path = "../rome_js_parser", features = ["tests"] }
tests_macros = { workspace = true }
rome_text_edit = { workspace = true }
rome_js_parser = { workspace = true }
insta = { workspace = true, features = ["glob"] }
countme = { workspace = true, features = ["enable"] }
similar = "2.1.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/rome_js_factory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ documentation = "https://rustdocs.rome.tools/rome_js_factory/index.html"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
rome_rowan = { version = "0.0.1",path = "../rome_rowan" }
rome_js_syntax = { version = "0.0.2",path = "../rome_js_syntax" }
rome_rowan = { workspace = true }
rome_js_syntax = { workspace = true }
30 changes: 15 additions & 15 deletions crates/rome_js_formatter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@ categories = [

[dependencies]
cfg-if = "1.0.0"
rome_js_syntax = { version = "0.0.2", path = "../rome_js_syntax" }
rome_json_syntax = { version = "0.0.1", path = "../rome_json_syntax" }
rome_js_factory = { version = "0.0.2", path = "../rome_js_factory" }
rome_formatter = { version = "0.0.1", path = "../rome_formatter" }
rome_rowan = { version = "0.0.1", path = "../rome_rowan" }
rome_text_size = { version = "0.0.1", path = "../rome_text_size" }
rome_diagnostics_categories = { version = "0.0.1", path = "../rome_diagnostics_categories" }
rome_deserialize = { path = "../rome_deserialize", version = "0.0.0" }
rome_js_syntax = { workspace = true }
rome_json_syntax = { workspace = true }
rome_js_factory = { workspace = true }
rome_formatter = { workspace = true }
rome_rowan = { workspace = true }
rome_text_size = { workspace = true }
rome_diagnostics_categories = { workspace = true }
rome_deserialize = { workspace = true }
tracing = { workspace = true }
unicode-width = "0.1.9"
serde = { version = "1.0.136", features = ["derive"], optional = true }
schemars = { version = "0.8.10", optional = true }

[dev-dependencies]
rome_parser = { path = "../rome_parser" }
rome_formatter_test = { path = "../rome_formatter_test" }
rome_fs = { path = "../rome_fs" }
rome_js_parser = { path = "../rome_js_parser" }
rome_js_factory = { path = "../rome_js_factory" }
rome_parser = { workspace = true }
rome_formatter_test = { workspace = true }
rome_fs = { workspace = true }
rome_js_parser = { workspace = true }
rome_js_factory = { workspace = true }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tests_macros = { path = "../tests_macros" }
tests_macros = { workspace = true }
insta = { workspace = true, features = ["glob"] }
rome_diagnostics = { path = "../rome_diagnostics" }
rome_diagnostics = { workspace = true }
countme = { workspace = true, features = ["enable"] }
quickcheck = "1.0.3"
quickcheck_macros = "1.0.0"
Expand Down
16 changes: 8 additions & 8 deletions crates/rome_js_parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ categories = ["parser-implementations", "development-tools"]
homepage.workspace = true

[dependencies]
rome_console = { version = "0.0.1", path = "../rome_console" }
rome_diagnostics = { version = "0.0.1", path = "../rome_diagnostics" }
rome_js_syntax = { version = "0.0.2", path = "../rome_js_syntax" }
rome_js_factory = { version = "0.0.2", path = "../rome_js_factory" }
rome_js_unicode_table = { version = "0.0.1", path = "../rome_js_unicode_table" }
rome_rowan = { version = "0.0.1", path = "../rome_rowan" }
rome_parser = { version = "0.0.1", path = "../rome_parser" }
rome_console = { workspace = true }
rome_diagnostics = { workspace = true }
rome_js_syntax = { workspace = true }
rome_js_factory = { workspace = true }
rome_js_unicode_table = { workspace = true }
rome_rowan = { workspace = true }
rome_parser = { workspace = true }
drop_bomb = "0.1.5"
bitflags.workspace = true
indexmap = { workspace = true }
Expand All @@ -26,7 +26,7 @@ smallvec = { version = "1.8.0", features = ["union", "const_new"] }
tracing = { workspace = true }

[dev-dependencies]
tests_macros = { path = "../tests_macros" }
tests_macros = { workspace = true }
expect-test = "1.2.2"
quickcheck = "1.0.3"
quickcheck_macros = "1.0.0"
Expand Down
12 changes: 6 additions & 6 deletions crates/rome_js_semantic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ description = "Semantic model for the JavaScript language"
repository.workspace = true

[dependencies]
rome_rowan = { path = "../rome_rowan" }
rome_js_syntax = { path = "../rome_js_syntax" }
rome_rowan = { workspace = true }
rome_js_syntax = { workspace = true }
rust-lapper = "1.0.1"
rustc-hash = { workspace = true }

[dev-dependencies]
rome_markup = { path = "../rome_markup" }
rome_diagnostics = { path = "../rome_diagnostics" }
rome_console = { path = "../rome_console" }
rome_js_parser = { path = "../rome_js_parser" }
rome_markup = { workspace = true }
rome_diagnostics = { workspace = true }
rome_console = { workspace = true }
rome_js_parser = { workspace = true }
Loading