Skip to content

Commit 22afe05

Browse files
committed
fix: ci error
1 parent 8fa04e7 commit 22afe05

File tree

10 files changed

+12
-63
lines changed

10 files changed

+12
-63
lines changed

.cargo/config.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup,-no_fixup_chains,-al
4343

4444
# To be able to run unit tests on Linux, support compilation to 'x86_64-unknown-linux-gnu'.
4545
[target.'cfg(target_os = "linux")']
46-
rustflags = [
47-
"-C", "link-args=-Wl,--warn-unresolved-symbols"
48-
]
46+
rustflags = ["-C", "link-args=-Wl,--warn-unresolved-symbols"]
4947

5048
# To be able to run unit tests on Windows, support compilation to 'x86_64-pc-windows-msvc'.
5149
# Use Hybrid CRT to reduce the size of the binary (Coming by default with Windows 10 and later versions).

.github/workflows/ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ on:
2121
tags-ignore:
2222
- "**"
2323

24-
env:
25-
# Since CI builds are more akin to from-scratch builds, incremental compilation adds unnecessary dependency-tracking and IO overhead, reducing caching effectiveness.
26-
# https://github.com/rust-lang/rust-analyzer/blob/25368d24308d6a94ffe8b99f0122bcf5a2175322/.github/workflows/ci.yaml#L11
27-
CARGO_INCREMENTAL: 0
28-
TMPDIR: target/tmpdir
29-
3024
concurrency:
3125
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
3226
cancel-in-progress: ${{ github.ref_name != 'main' }}
@@ -226,7 +220,7 @@ jobs:
226220
uses: ./.github/actions/pnpm-cache
227221
with:
228222
run-install: false
229-
223+
230224
- name: Run Cargo Check
231225
run: cargo check --workspace --all-targets --locked # Not using --release because it uses too much cache, and is also slow.
232226

Cargo.lock

Lines changed: 0 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/next-custom-transforms/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ anyhow = { workspace = true }
2121
chrono = "0.4"
2222
easy-error = "1.0.0"
2323
either = "1"
24-
fxhash = "0.2.1"
2524
hex = "0.4.3"
2625
indoc = { workspace = true }
2726
lazy_static = { workspace = true }

crates/node_binding/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ serde_json = { workspace = true }
6161
swc_core = { workspace = true, default-features = false, features = ["ecma_transforms_react"] }
6262
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "test-util", "parking_lot"] }
6363

64-
65-
json = { workspace = true }
6664
rspack_loader_lightningcss = { workspace = true }
6765
rspack_loader_preact_refresh = { workspace = true }
6866
rspack_loader_react_refresh = { workspace = true }

crates/rspack_loader_next_app/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ version = "0.2.0"
1010
async-recursion = { workspace = true }
1111
async-trait = { workspace = true }
1212
base64-simd = { version = "0.8.0", features = ["alloc"] }
13-
cow-utils = { workspace = true }
14-
dashmap = { workspace = true }
1513
futures = { workspace = true }
1614
json = { workspace = true }
1715
lazy-regex = "3.4.1"

crates/rspack_plugin_next_flight_client_entry/Cargo.toml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,26 @@ version = "0.2.0"
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
rspack_cacheable = { workspace = true }
12-
rspack_collections = { workspace = true }
13-
rspack_core = { workspace = true }
14-
rspack_error = { workspace = true }
15-
rspack_hook = { workspace = true }
16-
rspack_loader_runner = { workspace = true }
17-
rspack_paths = { workspace = true }
18-
rspack_plugin_runtime = { workspace = true }
19-
rspack_util = { workspace = true }
11+
rspack_collections = { workspace = true }
12+
rspack_core = { workspace = true }
13+
rspack_error = { workspace = true }
14+
rspack_hook = { workspace = true }
15+
rspack_paths = { workspace = true }
16+
rspack_util = { workspace = true }
2017

2118
async-trait = { workspace = true }
2219
derive_more = { workspace = true }
2320
form_urlencoded = "1.2.1"
2421
futures = { workspace = true }
25-
hashlink = { workspace = true }
2622
indexmap = { workspace = true }
27-
itertools = { workspace = true }
2823
lazy-regex = "3.4.1"
2924
querystring = { version = "1.1.0" }
3025
regex = { workspace = true }
3126
rspack_plugin_javascript = { workspace = true }
3227
rustc-hash = { workspace = true }
3328
serde = { workspace = true }
3429
serde_json = { workspace = true }
35-
serde_urlencoded = "0.7.1"
3630
sugar_path = { workspace = true }
37-
tokio = { workspace = true, features = ["rt"] }
3831
tracing = { workspace = true }
3932

4033
[package.metadata.cargo-shear]

crates/rspack_plugin_next_flight_client_entry/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,10 +930,10 @@ impl FlightClientEntryPlugin {
930930
}
931931
visited_entry.insert(request);
932932

933-
let Some(connction) = module_graph.connection_by_dependency_id(dependency_id) else {
933+
let Some(connection) = module_graph.connection_by_dependency_id(dependency_id) else {
934934
continue;
935935
};
936-
let Some(resolved_module) = module_graph.module_by_identifier(&connction.resolved_module)
936+
let Some(resolved_module) = module_graph.module_by_identifier(&connection.resolved_module)
937937
else {
938938
continue;
939939
};

packages/rspack/src/Dependency.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export class Dependency {
4747
if (binding) {
4848
return binding.request;
4949
}
50+
return undefined;
5051
}
5152

5253
get critical(): boolean {

packages/rspack/src/builtin-plugin/FlightClientEntryPlugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
BuiltinPluginName,
3-
RawFlightClientEntryPluginOptions
3+
type RawFlightClientEntryPluginOptions
44
} from "@rspack/binding";
55

66
import { create } from "./base";

0 commit comments

Comments
 (0)