feat: use shorthand function

Author: JSerFeng

crates/node_binding/napi-binding.d.ts

@@ -2079,6 +2079,7 @@ export interface RawEntryDynamicResult {
 
 export interface RawEnvironment {
   const?: boolean
+  methodShorthand?: boolean
   arrowFunction?: boolean
   nodePrefixForCoreModules?: boolean
   asyncFunction?: boolean

crates/rspack/tests/snapshots/defaults__default_options.snap

@@ -100,6 +100,7 @@ CompilerOptions {
             const: Some(
                 false,
             ),
+            method_shorthand: None,
             arrow_function: Some(
                 false,
             ),

crates/rspack_binding_api/src/raw_options/raw_output.rs

@@ -44,6 +44,7 @@ impl From<RawCrossOriginLoading> for CrossOriginLoading {
 #[napi(object)]
 pub struct RawEnvironment {
   pub r#const: Option<bool>,
+  pub method_shorthand: Option<bool>,
   pub arrow_function: Option<bool>,
   pub node_prefix_for_core_modules: Option<bool>,
   pub async_function: Option<bool>,
@@ -63,6 +64,7 @@ impl From<RawEnvironment> for Environment {
   fn from(value: RawEnvironment) -> Self {
     Self {
       r#const: value.r#const,
+      method_shorthand: value.method_shorthand,
       arrow_function: value.arrow_function,
       node_prefix_for_core_modules: value.node_prefix_for_core_modules,
       async_function: value.async_function,

crates/rspack_core/src/options/output.rs

@@ -503,6 +503,7 @@ pub struct LibraryCustomUmdObject {
 #[derive(Debug, Default, Copy, Clone)]
 pub struct Environment {
   pub r#const: Option<bool>,
+  pub method_shorthand: Option<bool>,
   pub arrow_function: Option<bool>,
   pub node_prefix_for_core_modules: Option<bool>,
   pub async_function: Option<bool>,
@@ -523,6 +524,10 @@ impl Environment {
     self.r#const.unwrap_or_default()
   }
 
+  pub fn supports_method_shorthand(&self) -> bool {
+    self.method_shorthand.unwrap_or_default()
+  }
+
   pub fn supports_arrow_function(&self) -> bool {
     self.arrow_function.unwrap_or_default()
   }

crates/rspack_plugin_javascript/src/runtime.rs

@@ -154,6 +154,11 @@ pub async fn render_module(
     }
   };
 
+  let use_method_shorthand = compilation
+    .options
+    .output
+    .environment
+    .supports_method_shorthand();
   hooks
     .render_module_content
     .call(
@@ -173,7 +178,10 @@ pub async fn render_module(
     sources.add(RawStringSource::from(
       serde_json::to_string(&module_id).to_rspack_result()?,
     ));
-    sources.add(RawStringSource::from_static(": "));
+
+    if !use_method_shorthand {
+      sources.add(RawStringSource::from_static(": "));
+    }
 
     let mut post_module_container = {
       let runtime_requirements = ChunkGraph::get_module_runtime_requirements(
@@ -212,16 +220,29 @@ pub async fn render_module(
 
       let mut container_sources = ConcatSource::default();
 
-      container_sources.add(RawStringSource::from(format!(
-        "(function ({}) {{\n",
-        args.join(", ")
-      )));
+      if use_method_shorthand {
+        container_sources.add(RawStringSource::from(format!("({}) {{\n", args.join(", "))));
+      } else {
+        container_sources.add(RawStringSource::from(format!(
+          "(function ({}) {{\n",
+          args.join(", ")
+        )));
+      }
       if module.build_info().strict && !all_strict {
         container_sources.add(RawStringSource::from_static("\"use strict\";\n"));
       }
       container_sources.add(render_source.source);
-      container_sources.add(RawStringSource::from_static("\n\n})"));
-      container_sources.add(RawStringSource::from_static(",\n"));
+
+      if compilation
+        .options
+        .output
+        .environment
+        .supports_method_shorthand()
+      {
+        container_sources.add(RawStringSource::from_static("\n\n},\n"));
+      } else {
+        container_sources.add(RawStringSource::from_static("\n\n}),\n"));
+      }
 
       RenderSource {
         source: container_sources.boxed(),

packages/rspack/etc/core.api.md

@@ -2211,6 +2211,7 @@ interface EnvConfig {
 
 // @public
 export type Environment = {
+    methodShorthand?: boolean;
     arrowFunction?: boolean;
     asyncFunction?: boolean;
     bigIntLiteral?: boolean;

packages/rspack/src/config/adapter.ts

@@ -123,6 +123,7 @@ function getRawOutputEnvironment(
 ): RawEnvironment {
 	return {
 		const: Boolean(environment.const),
+		methodShorthand: Boolean(environment.methodShorthand),
 		arrowFunction: Boolean(environment.arrowFunction),
 		nodePrefixForCoreModules: Boolean(environment.nodePrefixForCoreModules),
 		asyncFunction: Boolean(environment.asyncFunction),

packages/rspack/src/config/browserslistTargetHandler.ts

@@ -99,6 +99,25 @@ export const resolve = (
 			kaios: [2, 5],
 			node: [6, 0]
 		}),
+		shorthandMethod: rawChecker({
+			chrome: 47,
+			and_chr: 47,
+			edge: 12,
+			firefox: 34,
+			and_ff: 34,
+			// ie: Not supported,
+			opera: 34,
+			op_mob: 34,
+			safari: 9,
+			ios_saf: 9,
+			samsung: 5,
+			android: 47,
+			// baidu: Not tracked,
+			and_qq: [14, 9],
+			and_uc: [15, 5],
+			kaios: [2, 5],
+			node: [4, 9]
+		}),
 		arrowFunction: rawChecker({
 			chrome: 45,
 			and_chr: 45,

packages/rspack/src/config/defaults.ts

@@ -650,6 +650,8 @@ const applyOutputDefaults = (
 	F(environment, "globalThis", () => tp?.globalThis);
 	F(environment, "bigIntLiteral", () => tp && optimistic(tp.bigIntLiteral));
 	F(environment, "const", () => tp && optimistic(tp.const));
+	// IGNORE(output.environment.methodShorthand): will align method shorthand optimization for webpack soon
+	F(environment, "methodShorthand", () => tp && optimistic(tp.methodShorthand));
 	F(environment, "arrowFunction", () => tp && optimistic(tp.arrowFunction));
 	F(environment, "asyncFunction", () => tp && optimistic(tp.asyncFunction));
 	F(environment, "forOf", () => tp && optimistic(tp.forOf));

packages/rspack/src/config/target.ts

@@ -76,6 +76,8 @@ export type EcmaTargetProperties = {
 	bigIntLiteral: boolean | null;
 	/**  const and let variable declarations are available */
 	const: boolean | null;
+	/**  method shorthand in object is available  */
+	shorthandMethod: boolean | null;
 	/**  arrow functions are available */
 	arrowFunction: boolean | null;
 	/**  for of iteration is available */
@@ -243,6 +245,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				const: v(6),
 				templateLiteral: v(4),
 				optionalChaining: v(14),
+				methodShorthand: v(4),
 				arrowFunction: v(6),
 				asyncFunction: v(7, 6),
 				forOf: v(5),
@@ -289,6 +292,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				const: v(1, 1),
 				templateLiteral: v(1, 1),
 				optionalChaining: v(8),
+				methodShorthand: v(1, 1),
 				arrowFunction: v(1, 1),
 				asyncFunction: v(1, 7),
 				forOf: v(0, 36),
@@ -327,6 +331,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				const: v(0, 15),
 				templateLiteral: v(0, 13),
 				optionalChaining: v(0, 44),
+				methodShorthand: v(0, 15),
 				arrowFunction: v(0, 15),
 				asyncFunction: v(0, 21),
 				forOf: v(0, 13),
@@ -349,6 +354,7 @@ You can also more options via the 'target' option: 'browserslist' / 'browserslis
 				const: v >= 2015,
 				templateLiteral: v >= 2015,
 				optionalChaining: v >= 2020,
+				methodShorthand: v >= 2015,
 				arrowFunction: v >= 2015,
 				forOf: v >= 2015,
 				destructuring: v >= 2015,