Merge branch 'main' into release_1_0_0_beta_5

web-infra-dev · Aug 15, 2024 · fa952e5 · fa952e5
2 parents fc2d840 + 2bca663
commit fa952e5
Show file tree

Hide file tree

Showing 48 changed files with 141 additions and 1,277 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,13 +70,13 @@ napi-derive = { version = "2" }
 
 # Must be pinned with the same swc versions
 #rkyv                = { version = "=0.7.44" }                           # synced with swc wasm plugin
-swc_config          = { version = "=0.1.14" }
-swc_core            = { version = "0.99.5", default-features = false }
-swc_ecma_minifier   = { version = "=0.200.3", default-features = false }
-swc_error_reporters = { version = "=0.20.0" }
-swc_html            = { version = "=0.145.0" }
-swc_html_minifier   = { version = "=0.142.2" }
-swc_node_comments   = { version = "=0.23.0" }
+swc_config          = { version = "=0.1.15" }
+swc_core            = { version = "=0.100.7", default-features = false }
+swc_ecma_minifier   = { version = "=0.201.0", default-features = false }
+swc_error_reporters = { version = "=0.21.0" }
+swc_html            = { version = "=0.146.1" }
+swc_html_minifier   = { version = "=0.143.1", default-features = false }
+swc_node_comments   = { version = "=0.24.0" }
 
 
 [workspace.metadata.release]

diff --git a/crates/node_binding/binding.d.ts b/crates/node_binding/binding.d.ts
@@ -267,7 +267,6 @@ export enum BuiltinPluginName {
   CopyRspackPlugin = 'CopyRspackPlugin',
   HtmlRspackPlugin = 'HtmlRspackPlugin',
   SwcJsMinimizerRspackPlugin = 'SwcJsMinimizerRspackPlugin',
-  SwcCssMinimizerRspackPlugin = 'SwcCssMinimizerRspackPlugin',
   LightningCssMinimizerRspackPlugin = 'LightningCssMinimizerRspackPlugin',
   BundlerInfoRspackPlugin = 'BundlerInfoRspackPlugin',
   CssExtractRspackPlugin = 'CssExtractRspackPlugin',
@@ -1715,12 +1714,6 @@ export interface RawStatsOptions {
   colors: boolean
 }
 
-export interface RawSwcCssMinimizerRspackPluginOptions {
-  test?: string | RegExp | (string | RegExp)[]
-  include?: string | RegExp | (string | RegExp)[]
-  exclude?: string | RegExp | (string | RegExp)[]
-}
-
 export interface RawSwcJsMinimizerOptions {
   compress: any
   mangle: any

diff --git a/crates/rspack_ast/Cargo.toml b/crates/rspack_ast/Cargo.toml
@@ -21,12 +21,6 @@ swc_core = { workspace = true, features = [
   "ecma_transforms_module",
   "swc_ecma_codegen",
   "swc_ecma_visit",
-  "css_ast",
-  "css_codegen",
-  "css_parser",
-  "css_utils",
-  "css_visit",
-  "css_modules",
 ] }
 swc_error_reporters = { workspace = true }
 swc_node_comments = { workspace = true }
diff --git a/crates/rspack_ast/src/ast/css.rs b/crates/rspack_ast/src/ast/css.rs
diff --git a/crates/rspack_ast/src/ast/mod.rs b/crates/rspack_ast/src/ast/mod.rs
@@ -1,2 +1 @@
-pub mod css;
 pub mod javascript;
diff --git a/crates/rspack_ast/src/lib.rs b/crates/rspack_ast/src/lib.rs
@@ -1,7 +1,5 @@
 mod ast;
 
-pub use crate::ast::css;
-use crate::ast::css::Ast as CssAst;
 pub use crate::ast::javascript;
 use crate::ast::javascript::Ast as JsAst;
 
@@ -11,21 +9,12 @@ use crate::ast::javascript::Ast as JsAst;
 #[derive(Debug, Clone, Hash)]
 pub enum RspackAst {
   JavaScript(JsAst),
-  Css(CssAst),
 }
 
 impl RspackAst {
   pub fn as_javascript(&self) -> Option<&JsAst> {
     match self {
       RspackAst::JavaScript(program) => Some(program),
-      RspackAst::Css(_) => None,
-    }
-  }
-
-  pub fn as_css(&self) -> Option<&CssAst> {
-    match self {
-      RspackAst::Css(stylesheet) => Some(stylesheet),
-      RspackAst::JavaScript(_) => None,
     }
   }
 }
diff --git a/crates/rspack_ast_viewer/Cargo.toml b/crates/rspack_ast_viewer/Cargo.toml
diff --git a/crates/rspack_ast_viewer/LICENSE b/crates/rspack_ast_viewer/LICENSE
diff --git a/crates/rspack_ast_viewer/README.md b/crates/rspack_ast_viewer/README.md
diff --git a/crates/rspack_ast_viewer/src/main.rs b/crates/rspack_ast_viewer/src/main.rs
diff --git a/crates/rspack_binding_options/Cargo.toml b/crates/rspack_binding_options/Cargo.toml
@@ -61,7 +61,6 @@ rspack_plugin_runtime_chunk           = { version = "0.1.0", path = "../rspack_p
 rspack_plugin_schemes                 = { version = "0.1.0", path = "../rspack_plugin_schemes" }
 rspack_plugin_size_limits             = { version = "0.1.0", path = "../rspack_plugin_size_limits" }
 rspack_plugin_split_chunks            = { version = "0.1.0", path = "../rspack_plugin_split_chunks" }
-rspack_plugin_swc_css_minimizer       = { version = "0.1.0", path = "../rspack_plugin_swc_css_minimizer" }
 rspack_plugin_swc_js_minimizer        = { version = "0.1.0", path = "../rspack_plugin_swc_js_minimizer" }
 rspack_plugin_warn_sensitive_module   = { version = "0.1.0", path = "../rspack_plugin_warn_sensitive_module" }
 rspack_plugin_wasm                    = { version = "0.1.0", path = "../rspack_plugin_wasm" }