Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove builtin:sass-loader for 0.5 #5177

Merged
merged 2 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ pnpm-lock.yaml

# Loaders

/crates/rspack_loader_sass @web-infra-dev/rspack-dx
/crates/rspack_loader_swc @web-infra-dev/rspack-dx

# Plugins
Expand Down
71 changes: 0 additions & 71 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/rspack_binding_options/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ rspack_identifier = { path = "../rspack_identifier" }
rspack_ids = { path = "../rspack_ids" }
rspack_loader_react_refresh = { path = "../rspack_loader_react_refresh" }
rspack_loader_runner = { path = "../rspack_loader_runner" }
rspack_loader_sass = { path = "../rspack_loader_sass" }
rspack_loader_swc = { path = "../rspack_loader_swc" }
rspack_napi_shared = { path = "../rspack_napi_shared" }
rspack_plugin_asset = { path = "../rspack_plugin_asset" }
Expand Down
9 changes: 0 additions & 9 deletions crates/rspack_binding_options/src/options/raw_module/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use rspack_core::{
};
use rspack_error::{internal_error, miette::IntoDiagnostic};
use rspack_loader_react_refresh::REACT_REFRESH_LOADER_IDENTIFIER;
use rspack_loader_sass::SASS_LOADER_IDENTIFIER;
use rspack_loader_swc::SWC_LOADER_IDENTIFIER;
use rspack_napi_shared::threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode};
use rspack_napi_shared::{get_napi_env, NapiResultExt};
Expand All @@ -26,14 +25,6 @@ pub use self::js_loader::*;
use crate::RawResolveOptions;

pub fn get_builtin_loader(builtin: &str, options: Option<&str>) -> BoxLoader {
if builtin.starts_with(SASS_LOADER_IDENTIFIER) {
return Arc::new(rspack_loader_sass::SassLoader::new(
serde_json::from_str(options.unwrap_or("{}")).unwrap_or_else(|e| {
panic!("Could not parse builtin:sass-loader options: {options:?}, error: {e:?}")
}),
));
}

if builtin.starts_with(SWC_LOADER_IDENTIFIER) {
return Arc::new(
rspack_loader_swc::SwcLoader::new(
Expand Down
1 change: 0 additions & 1 deletion crates/rspack_binding_values/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ rspack_identifier = { path = "../rspack_identifier" }
rspack_ids = { path = "../rspack_ids" }
rspack_loader_react_refresh = { path = "../rspack_loader_react_refresh" }
rspack_loader_runner = { path = "../rspack_loader_runner" }
rspack_loader_sass = { path = "../rspack_loader_sass" }
rspack_loader_swc = { path = "../rspack_loader_swc" }
rspack_napi_shared = { path = "../rspack_napi_shared" }
rspack_plugin_asset = { path = "../rspack_plugin_asset" }
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion crates/rspack_error/tests/fixtures/sass-warnings/index.js

This file was deleted.

3 changes: 0 additions & 3 deletions crates/rspack_error/tests/fixtures/sass-warnings/index.scss

This file was deleted.

14 changes: 0 additions & 14 deletions crates/rspack_error/tests/fixtures/sass-warnings/test.config.json

This file was deleted.

2 changes: 1 addition & 1 deletion crates/rspack_loader_runner/src/loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ pub(crate) mod test {

impl Identifiable for Builtin {
fn identifier(&self) -> Identifier {
"builtin:sass-loader".into()
"builtin:test-loader".into()
}
}

Expand Down
25 changes: 0 additions & 25 deletions crates/rspack_loader_sass/Cargo.toml

This file was deleted.

22 changes: 0 additions & 22 deletions crates/rspack_loader_sass/LICENSE

This file was deleted.

Loading
Loading