Merge branch 'main' into feat/mf-layers

Author: ScriptedAlchemy

crates/rspack_plugin_javascript/src/dependency/commonjs/common_js_export_require_dependency.rs

@@ -17,6 +17,7 @@ use rustc_hash::FxHashSet;
 use swc_core::atoms::Atom;
 
 use super::ExportsBase;
+use crate::dependency::commonjs::PROTOTYPE_PROPS;
 
 #[cacheable]
 #[allow(unused)]
@@ -229,7 +230,7 @@ impl Dependency for CommonJsExportRequireDependency {
         exports: ExportsOfExportsSpec::Names(vec![ExportNameOrSpec::ExportSpec(ExportSpec {
           name: name.to_owned(),
           from: Some(from.to_owned()),
-          can_mangle: Some(false),
+          can_mangle: Some(!PROTOTYPE_PROPS.contains(&name.as_str())),
           export: Some(if ids.is_empty() {
             Nullable::Null
           } else {
@@ -289,7 +290,7 @@ impl Dependency for CommonJsExportRequireDependency {
       Some(ExportsSpec {
         exports: ExportsOfExportsSpec::Names(vec![ExportNameOrSpec::ExportSpec(ExportSpec {
           name: name.to_owned(),
-          can_mangle: Some(false),
+          can_mangle: Some(!PROTOTYPE_PROPS.contains(&name.as_str())),
           ..Default::default()
         })]),
         dependencies: None,

crates/rspack_plugin_javascript/src/dependency/commonjs/common_js_exports_dependency.rs

@@ -51,6 +51,23 @@ impl ExportsBase {
   }
 }
 
+// we can't mangle names that are in an empty object because one could access the prototype property
+// when export isn't set yet. It's different for different targets. so here we only list common properties.
+pub static PROTOTYPE_PROPS: [&str; 12] = [
+  "constructor",
+  "__defineGetter__",
+  "__defineSetter__",
+  "hasOwnProperty",
+  "__lookupGetter__",
+  "__lookupSetter__",
+  "isPrototypeOf",
+  "propertyIsEnumerable",
+  "toString",
+  "valueOf",
+  "__proto__",
+  "toLocaleString",
+];
+
 #[cacheable]
 #[derive(Debug, Clone)]
 pub struct CommonJsExportsDependency {
@@ -103,9 +120,10 @@ impl Dependency for CommonJsExportsDependency {
     _mg_cache: &ModuleGraphCacheArtifact,
     _exports_info_artifact: &ExportsInfoArtifact,
   ) -> Option<ExportsSpec> {
+    let name = self.names[0].clone();
     let vec = vec![ExportNameOrSpec::ExportSpec(ExportSpec {
-      name: self.names[0].clone(),
-      can_mangle: Some(false), // in webpack, object own property may not be mangled
+      can_mangle: Some(!PROTOTYPE_PROPS.contains(&name.as_str())),
+      name,
       ..Default::default()
     })];
     Some(ExportsSpec {

crates/rspack_plugin_javascript/src/dependency/commonjs/mod.rs

@@ -14,6 +14,7 @@ mod require_resolve_header_dependency;
 pub use common_js_export_require_dependency::{
   CommonJsExportRequireDependency, CommonJsExportRequireDependencyTemplate,
 };
+use common_js_exports_dependency::PROTOTYPE_PROPS;
 pub use common_js_exports_dependency::{
   CommonJsExportsDependency, CommonJsExportsDependencyTemplate, ExportsBase,
 };

packages/rspack/hot/emitter.js

@@ -20,6 +20,4 @@ EventEmitter.prototype.emit = function (eventName) {
 
 var emitter = new EventEmitter();
 
-// TODO: remove default export when rspack-dev-server refactored
-export default emitter;
 export { emitter };

packages/rspack/hot/log.js

@@ -84,6 +84,4 @@ log.groupEnd = groupEnd;
 log.setLogLevel = setLogLevel;
 log.formatError = formatError;
 
-// TODO: remove default export when rspack-dev-server refactored
-export default log;
 export { log };

tests/rspack-test/configCases/mangle/mangle-with-object-prop/index.js

@@ -1,13 +1,12 @@
 import { moduleId, setToString, toString, abc, a, $1, __1 } from "./module";
-// TODO: support CJS mangle exports
-// const moduleId2 = require("./commonjs").moduleId;
-// const toString2 = require("./commonjs").toString;
-// const setToString2 = require("./commonjs").setToString;
-// const abc2 = require("./commonjs").abc;
-// const a2 = require("./commonjs").a;
-// const equals2 = require("./commonjs")["="];
-// const $12 = require("./commonjs").$1;
-// const __12 = require("./commonjs").__1;
+const moduleId2 = require("./commonjs").moduleId;
+const toString2 = require("./commonjs").toString;
+const setToString2 = require("./commonjs").setToString;
+const abc2 = require("./commonjs").abc;
+const a2 = require("./commonjs").a;
+const equals2 = require("./commonjs")["="];
+const $12 = require("./commonjs").$1;
+const __12 = require("./commonjs").__1;
 
 it("should mangle names and remove exports even with toString named export (ESM)", () => {
 	expect(abc).toBe("abc");
@@ -28,23 +27,23 @@ it("should mangle names and remove exports even with toString named export (ESM)
 	);
 });
 
-// it("should mangle names and remove exports even with toString named export (CJS)", () => {
-// 	expect(abc2).toBe("abc");
-// 	expect(toString2).toBe(Object.prototype.toString);
-// 	setToString2();
-// 	const toString3 = require("./commonjs").toString;
-// 	expect(toString3()).toBe("toString");
-// 	expect(a2).toBe("single char");
-// 	expect(equals2).toBe("single char non-identifier");
-// 	expect($12).toBe("double char");
-// 	expect(__12).toBe("3 chars");
-// 	expect(
-// 		Object.keys(require.cache[moduleId2].exports)
-// 			.map(p => p.length)
-// 			.sort()
-// 	).toEqual(
-// 		OPTIMIZATION === "deterministic"
-// 			? [1, 2, 2, 2, 2, 2, 2, 8]
-// 			: [1, 1, 1, 1, 1, 1, 1, 8]
-// 	);
-// });
+it("should mangle names and remove exports even with toString named export (CJS)", () => {
+	expect(abc2).toBe("abc");
+	expect(toString2).toBe(Object.prototype.toString);
+	setToString2();
+	const toString3 = require("./commonjs").toString;
+	expect(toString3()).toBe("toString");
+	expect(a2).toBe("single char");
+	expect(equals2).toBe("single char non-identifier");
+	expect($12).toBe("double char");
+	expect(__12).toBe("3 chars");
+	expect(
+		Object.keys(require.cache[moduleId2].exports)
+			.map(p => p.length)
+			.sort()
+	).toEqual(
+		OPTIMIZATION === "deterministic"
+			? [1, 2, 2, 2, 2, 2, 2, 8]
+			: [1, 1, 1, 1, 1, 1, 1, 8]
+	);
+});

tests/rspack-test/esmOutputCases/basic/split-runtime-chunk/__snapshots__/esm.snap.txt

@@ -7,7 +7,7 @@ const other = __webpack_require__("./other.js");
 
 
 it('should have correct value', () => {
-  expect((0,other.value)()).toBe(42)
+  expect((0,other.U)()).toBe(42)
 })
 
 ```
@@ -20,7 +20,7 @@ __webpack_require__.add({
   !*** ./other.js ***!
   \******************/
 (__unused_rspack_module, exports) {
-exports.value = () => 42
+exports.U = () => 42
 
 },
 });

tests/rspack-test/esmOutputCases/interop/contains-cjs/__snapshots__/esm.snap.txt

@@ -17,7 +17,7 @@ exports.foo = 42
 (__unused_rspack_module, exports) {
 var __webpack_unused_export__;
 __webpack_unused_export__ = true
-exports["default"] = 'esm'
+exports.A = 'esm'
 
 
 },
@@ -34,7 +34,7 @@ it('should have correct import', () => {
 	expect(foo).toHaveProperty('foo')
 	expect(foo.foo).toBe(42)
 
-	expect(from_esm["default"]).toBe('esm')
+	expect(from_esm.A).toBe('esm')
 
 	expect(foo.foo).toBe(42)
 	expect((/* inlined export .value */"value")).toBe('value')

tests/rspack-test/esmOutputCases/interop/type-module/__snapshots__/esm.snap.txt

@@ -16,7 +16,7 @@ exports[exportSymbol()] = () => 'bar'
   !*** ./cjs.cjs ***!
   \*****************/
 (__unused_rspack_module, exports) {
-exports.foo = () => 'foo'
+exports.p = () => 'foo'
 
 
 },
@@ -37,9 +37,9 @@ const cjs_unknown = __webpack_require__("./cjs-unknown.cjs");
 var bar_0 = cjs_unknown.bar;
 
 const cjs = __webpack_require__("./cjs.cjs");
-var foo_0 = cjs.foo;
+var p = cjs.p;
 
-export { bar_0 as bar, foo_0 as foo };
+export { bar_0 as bar, p as foo };
 export default cjs_unknown;
 
 ```

tests/rspack-test/esmOutputCases/namespace/basic/__snapshots__/esm.snap.txt

@@ -6,7 +6,7 @@ __webpack_require__.add({
   !*** ./foo.js ***!
   \****************/
 (__unused_rspack_module, exports) {
-exports.foo = 123
+exports.p = 123
 
 
 },
@@ -16,8 +16,8 @@ const foo = __webpack_require__("./foo.js");
 
 
 it('should import namespace', () => {
-	expect(foo.foo).toBe(123);
-	expect(foo.foo).toBe(123);
+	expect(foo.p).toBe(123);
+	expect(foo.p).toBe(123);
 })