chore: merge origin main

Author: SyMind

.github/workflows/ci-dylint.yaml

@@ -0,0 +1,59 @@
+name: CI-Dylint
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - '.github/workflows/ci-dylint.yaml'
+      - '.github/actions/rustup/**'
+      - 'crates/**'
+      - 'linting/**'
+      - 'Cargo.lock'
+      - 'Cargo.toml'
+      - 'rust-toolchain.toml'
+  merge_group:
+    types: [checks_requested]
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - v1.x
+    paths:
+      - '.github/workflows/ci-dylint.yaml'
+      - '.github/actions/rustup/**'
+      - 'crates/**'
+      - 'linting/**'
+      - 'Cargo.lock'
+      - 'Cargo.toml'
+      - 'rust-toolchain.toml'
+    tags-ignore:
+      - '**'
+
+jobs:
+  dylint:
+    name: Dylint
+    runs-on: ${{ fromJSON(vars.LINUX_SELF_HOSTED_RUNNER_LABELS || '"ubuntu-22.04"') }}
+    steps:
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
+
+      - name: Install Rust Toolchain
+        uses: ./.github/actions/rustup
+        with:
+          save-if: true
+          key: dylint
+
+      - name: Run Cargo codegen
+        run: cargo codegen
+
+      - name: Install Dylint Toolchain
+        run: rustup toolchain install nightly-2025-10-31 -c rustc-dev -c llvm-tools-preview -c rust-src
+
+      - name: Install cargo-dylint
+        run: cargo install cargo-dylint dylint-link --locked
+
+      - name: Test rspack_collection_hasher
+        working-directory: linting/rspack_collection_hasher
+        run: cargo test --lib
+
+      - name: Run dylint
+        run: cargo dylint --all

.github/workflows/release-canary.yml

@@ -35,12 +35,14 @@ permissions:
 jobs:
   get-runner-labels:
     name: Get Runner Labels
+    if: ${{ github.repository == 'web-infra-dev/rspack' }}
     uses: ./.github/workflows/get-runner-labels.yml
     with:
       force-use-github-runner: true
 
   build:
     name: Build Canary
+    if: ${{ github.repository == 'web-infra-dev/rspack' }}
     needs: [get-runner-labels]
     strategy:
       fail-fast: false
@@ -76,6 +78,7 @@ jobs:
 
   release:
     name: Release Canary
+    if: ${{ github.repository == 'web-infra-dev/rspack' }}
     runs-on: ubuntu-latest
     needs: build
     environment: npm-canary

Cargo.lock

@@ -15,6 +15,10 @@ version       = "0.100.0-beta.6"
 
 [workspace.metadata.cargo-shear]
 ignored = ["swc", "rspack"]
+
+[workspace.metadata.dylint]
+libraries = [{ path = "linting/*" }]
+
 [workspace.dependencies]
 aho-corasick        = { version = "1.1.4", default-features = false }
 anyhow              = { version = "1.0.102", default-features = false, features = ["backtrace", "std"] }
@@ -439,7 +443,10 @@ unused_lifetimes                       = "warn"
 unused_macro_rules                     = "warn"
 
 [workspace.lints.rust.unexpected_cfgs]
-check-cfg = ['cfg(allocative)']
+check-cfg = [
+  'cfg(allocative)',
+  'cfg(dylint_lib, values("rspack_collection_hasher"))',
+]
 level     = "warn"
 
 [workspace.lints.clippy]

Cargo.toml

@@ -19,7 +19,6 @@ loaders               = ["loader_lightningcss", "loader_preact_refresh", "loader
 bitflags            = { workspace = true }
 derive_more         = { workspace = true }
 enum-tag            = { workspace = true }
-indexmap            = { workspace = true, features = ["rayon"] }
 regex               = { workspace = true }
 rspack_browserslist = { workspace = true }
 rspack_core         = { workspace = true }
@@ -54,6 +53,7 @@ rspack_plugin_swc_js_minimizer        = { workspace = true }
 rspack_plugin_wasm                    = { workspace = true }
 rspack_plugin_worker                  = { workspace = true }
 rspack_tasks                          = { workspace = true }
+rspack_util                           = { workspace = true }
 # Loaders
 rspack_loader_lightningcss   = { workspace = true, optional = true }
 rspack_loader_preact_refresh = { workspace = true, optional = true }

crates/rspack/Cargo.toml

@@ -9,6 +9,7 @@ mod target;
 pub use builder_context::BuilderContext;
 pub use devtool::Devtool;
 use rspack_tasks::CURRENT_COMPILER_CONTEXT;
+use rspack_util::fx_hash::FxIndexMap;
 pub use target::Targets;
 
 macro_rules! d {
@@ -39,7 +40,6 @@ use builder_context::BuiltinPluginOptions;
 use derive_more::Debug;
 use devtool::DevtoolFlags;
 use externals::ExternalsPresets;
-use indexmap::IndexMap;
 use regex::Regex;
 use rspack_core::{
   AssetParserDataUrl, AssetParserDataUrlOptions, AssetParserOptions, BoxPlugin, ByDependency,
@@ -569,7 +569,7 @@ pub struct CompilerOptionsBuilder {
   /// The environment in which the code should run.
   target: Option<Targets>,
   /// The entry point of the application.
-  entry: IndexMap<String, EntryDescription>,
+  entry: FxIndexMap<String, EntryDescription>,
   /// External libraries that should not be bundled.
   externals: Option<Vec<ExternalItem>>,
   /// The type of externals.
@@ -1382,11 +1382,10 @@ fn get_resolve_defaults(mode: Mode, target_properties: &TargetProperties, css: b
 
   // Add CSS dependencies if enabled
   if css {
-    let mut style_conditions = vec!["webpack".to_string()];
-    style_conditions.push(match mode {
+    let mut style_conditions = vec![match mode {
       Mode::Development => "development".to_string(),
       _ => "production".to_string(),
-    });
+    }];
     style_conditions.push("style".to_string());
 
     by_dependency.push((
@@ -2657,7 +2656,7 @@ impl OutputOptionsBuilder {
     target_properties: Option<&TargetProperties>,
     is_affected_by_browserslist: bool,
     development: bool,
-    entry: &IndexMap<String, EntryDescription>,
+    entry: &FxIndexMap<String, EntryDescription>,
     _future_defaults: bool,
   ) -> Result<OutputOptions> {
     let tp = target_properties;

crates/rspack/src/builder/mod.rs

@@ -115,7 +115,7 @@ use rspack_core::{
 use rspack_error::Diagnostic;
 use rspack_fs::{IntermediateFileSystem, NativeFileSystem, ReadableFileSystem};
 use rspack_tasks::{CURRENT_COMPILER_CONTEXT, CompilerContext, within_compiler_context_sync};
-use rustc_hash::FxHashMap;
+use rustc_hash::{FxHashMap, FxHashSet};
 use swc_core::common::util::take::Take;
 
 use crate::{
@@ -381,8 +381,8 @@ impl JsCompiler {
           async move {
             compiler
               .rebuild(
-                changed_files.into_iter().collect::<HashSet<_>>(),
-                removed_files.into_iter().collect::<HashSet<_>>(),
+                changed_files.into_iter().collect::<FxHashSet<_>>(),
+                removed_files.into_iter().collect::<FxHashSet<_>>(),
               )
               .await
               .to_napi_result_with_message(|e| {

crates/rspack_binding_api/src/lib.rs

@@ -10,6 +10,7 @@ use rspack_core::{CompilationId, CompilerId, Module, ModuleIdentifier};
 use rspack_napi::threadsafe_function::ThreadsafeFunction;
 use rspack_plugin_lazy_compilation::{Backend, LazyCompilationTest, LazyCompilationTestCheck};
 use rspack_regex::RspackRegex;
+use rustc_hash::FxHashSet as HashSet;
 
 use crate::module::ModuleObject;
 
@@ -86,15 +87,15 @@ pub struct RawModuleInfo {
 
 #[napi(object, object_to_js = false)]
 pub struct RawLazyCompilationOption {
-  pub current_active_modules: ThreadsafeFunction<(), std::collections::HashSet<String>>,
+  pub current_active_modules: ThreadsafeFunction<(), HashSet<String>>,
   pub test: Option<RawLazyCompilationTest>,
   pub entries: bool,
   pub imports: bool,
   pub client: String,
 }
 
 pub(crate) struct JsBackend {
-  current_active_modules: ThreadsafeFunction<(), std::collections::HashSet<String>>,
+  current_active_modules: ThreadsafeFunction<(), HashSet<String>>,
 }
 
 impl std::fmt::Debug for JsBackend {

crates/rspack_binding_api/src/raw_options/raw_builtins/raw_lazy_compilation.rs

@@ -13,6 +13,7 @@ use rspack_plugin_rsdoctor::{
   RsdoctorSideEffect, RsdoctorSideEffectLocation, RsdoctorSourcePosition, RsdoctorSourceRange,
   RsdoctorStatement, RsdoctorVariable,
 };
+use rustc_hash::FxHashSet;
 
 #[napi(object)]
 pub struct JsRsdoctorModule {
@@ -582,27 +583,27 @@ impl From<RawRsdoctorPluginOptions> for RsdoctorPluginOptions {
 
     Self {
       module_graph_features: match value.module_graph_features {
-        Either::A(true) => HashSet::from([
+        Either::A(true) => FxHashSet::from_iter([
           RsdoctorPluginModuleGraphFeature::ModuleGraph,
           RsdoctorPluginModuleGraphFeature::ModuleIds,
           RsdoctorPluginModuleGraphFeature::ModuleSources,
         ]),
-        Either::A(false) => HashSet::new(),
+        Either::A(false) => FxHashSet::default(),
         Either::B(features) => features
           .into_iter()
           .map(RsdoctorPluginModuleGraphFeature::from)
-          .collect::<HashSet<_>>(),
+          .collect::<FxHashSet<_>>(),
       },
       chunk_graph_features: match value.chunk_graph_features {
-        Either::A(true) => HashSet::from([
+        Either::A(true) => FxHashSet::from_iter([
           RsdoctorPluginChunkGraphFeature::ChunkGraph,
           RsdoctorPluginChunkGraphFeature::Assets,
         ]),
-        Either::A(false) => HashSet::new(),
+        Either::A(false) => FxHashSet::default(),
         Either::B(features) => features
           .into_iter()
           .map(RsdoctorPluginChunkGraphFeature::from)
-          .collect::<HashSet<_>>(),
+          .collect::<FxHashSet<_>>(),
       },
       source_map_features,
     }