Skip to content

Commit faf66d2

Browse files
Merge branch 'main' into olszewski/chore_proc_macro_config
2 parents e93b0aa + 8cffabe commit faf66d2

31 files changed

+159
-11840
lines changed

Cargo.toml

-36
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,8 @@ strip = true
4040
# ref: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#inheriting-a-dependency-from-a-workspace
4141
[workspace.dependencies]
4242
async-recursion = "1.0.2"
43-
# Keep consistent with preset_env_base through swc_core
44-
browserslist-rs = { version = "0.16.0" }
4543
miette = { version = "5.10.0", features = ["fancy"] }
4644
markdown = "1.0.0-alpha.18"
47-
mdxjs = "0.2.5"
48-
modularize_imports = { version = "0.68.7" }
49-
styled_components = { version = "0.96.6" }
50-
styled_jsx = { version = "0.73.10" }
51-
swc_core = { version = "0.96.9", features = [
52-
"ecma_loader_lru",
53-
"ecma_loader_parking_lot",
54-
] }
55-
swc_emotion = { version = "0.72.6" }
56-
swc_relay = { version = "0.44.5" }
57-
testing = { version = "0.36.0" }
58-
# Temporary: Reference the latest git minor version of pathfinder_simd until it's published.
59-
pathfinder_simd = "0.5.3"
6045

6146
turbo-updater = { path = "crates/turborepo-updater" }
6247
turbopath = { path = "crates/turborepo-paths" }
@@ -85,13 +70,6 @@ turborepo-vt100 = { path = "crates/turborepo-vt100" }
8570
# and some aren't buildable with rustls.
8671
reqwest = { version = "=0.11.17", default-features = false }
8772

88-
chromiumoxide = { version = "0.5.0", features = [
89-
"tokio-runtime",
90-
], default-features = false }
91-
# For matching on errors from chromiumoxide. Keep in
92-
# sync with chromiumoxide's tungstenite requirement.
93-
tungstenite = "0.18.0"
94-
9573
anyhow = "1.0.69"
9674
assert_cmd = "2.0.8"
9775
async-compression = { version = "0.3.13", default-features = false, features = [
@@ -116,7 +94,6 @@ clap_complete = "4.5.24"
11694
concurrent-queue = "2.5.0"
11795
console = "0.15.5"
11896
console-subscriber = "0.1.8"
119-
criterion = "0.4.0"
12097
crossbeam-channel = "0.5.8"
12198
dashmap = "5.4.0"
12299
derive_setters = "0.1.6"
@@ -127,40 +104,30 @@ futures = "0.3.26"
127104
futures-retry = "0.6.0"
128105
hex = "0.4.3"
129106
httpmock = { version = "0.6.8", default-features = false }
130-
image = { version = "0.25.0", default-features = false }
131107
indexmap = "1.9.2"
132108
indicatif = "0.17.3"
133109
indoc = "2.0.0"
134110
itertools = "0.10.5"
135111
lazy_static = "1.4.0"
136-
lightningcss = { version = "1.0.0-alpha.57", features = [
137-
"serde",
138-
"visitor",
139-
"into_owned",
140-
] }
141112
merge = "0.1.0"
142113
mime = "0.3.16"
143114
notify = "6.1.1"
144115
once_cell = "1.17.1"
145116
owo-colors = "3.5.0"
146-
parcel_selectors = "0.26.0"
147117
parking_lot = "0.12.1"
148118
path-clean = "1.0.1"
149119
pathdiff = "0.2.1"
150120
petgraph = "0.6.3"
151121
pin-project-lite = "0.2.9"
152122
port_scanner = "0.1.5"
153-
postcard = "1.0.4"
154123
predicates = "2.1.5"
155124
pretty_assertions = "1.3.0"
156125
proc-macro2 = "1.0.79"
157-
qstring = "0.7.2"
158126
quote = "1.0.23"
159127
radix_trie = "0.2.1"
160128
rand = "0.8.5"
161129
ratatui = "0.26.1"
162130
regex = "1.7.0"
163-
rstest = "0.16.0"
164131
rustc-hash = "1.1.0"
165132
semver = "1.0.16"
166133
serde = { version = "1.0.152", features = ["derive"] }
@@ -175,7 +142,6 @@ smallvec = { version = "1.13.1", features = [
175142
"union",
176143
"const_new",
177144
] }
178-
sourcemap = "8.0.1"
179145
syn = "1.0.107"
180146
tempfile = "3.3.0"
181147
test-case = "3.0.0"
@@ -186,11 +152,9 @@ tokio-util = { version = "0.7.7", features = ["io"] }
186152
tracing = "0.1.37"
187153
tracing-appender = "0.2.2"
188154
tracing-subscriber = "0.3.16"
189-
triomphe = "0.1.13"
190155
tui-term = { version = "=0.1.9", default-features = false }
191156
url = "2.2.2"
192157
urlencoding = "2.1.2"
193158
webbrowser = "0.8.7"
194159
which = "4.4.0"
195160
unicode-segmentation = "1.10.1"
196-
unsize = "1.1.0"

crates/turborepo-lib/build.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
88
);
99
let capnpc_result = capnpc::CompilerCommand::new()
1010
.file("./src/hash/proto.capnp")
11-
.import_path("./src/hash/std") // we need to include the 'stdlib' for capnp-go
1211
.default_parent_module(vec!["hash".to_string()])
1312
.run();
1413

crates/turborepo-lib/src/hash/proto.capnp

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
using Go = import "/go.capnp";
2-
31
@0xe1dde60149aeb063;
42

5-
$Go.package("capnp");
6-
$Go.import("capnp");
7-
83
struct TaskHashable {
94
globalHash @0 :Text;
105
taskDependencyHashes @1 :List(Text);

crates/turborepo-lib/src/hash/std/capnp/c++.capnp

-29
This file was deleted.

crates/turborepo-lib/src/hash/std/capnp/compat/json.capnp

-118
This file was deleted.

0 commit comments

Comments
 (0)