feat: if no commonjs specific syntax detected, treat module as esm (#12008)

JSerFeng · web-flow · commit 34fbd33e261c · 2025-10-29T13:13:13.000+08:00
diff --git a/crates/rspack_core/src/init_fragment.rs b/crates/rspack_core/src/init_fragment.rs
@@ -140,8 +140,9 @@ impl InitFragmentKey {
       | InitFragmentKey::ModuleExternal(_)
       | InitFragmentKey::ModuleDecorator(_)
       | InitFragmentKey::CommonJsExports(_)
+      | InitFragmentKey::ESMCompatibility
       | InitFragmentKey::Const(_) => first(fragments),
-      InitFragmentKey::ESMCompatibility | InitFragmentKey::Unique(_) => {
+      InitFragmentKey::Unique(_) => {
         debug_assert!(fragments.len() == 1, "fragment = {self:?}");
         first(fragments)
       }
diff --git a/crates/rspack_plugin_esm_library/src/esm_lib_parser_plugin.rs b/crates/rspack_plugin_esm_library/src/esm_lib_parser_plugin.rs
@@ -0,0 +1,32 @@
+use rspack_core::DependencyType;
+use rspack_plugin_javascript::{
+  JavascriptParserPlugin, dependency::ESMCompatibilityDependency, visitors::JavascriptParser,
+};
+pub struct EsmLibParserPlugin;
+
+impl JavascriptParserPlugin for EsmLibParserPlugin {
+  fn finish(&self, parser: &mut JavascriptParser) -> Option<bool> {
+    if parser.module_type.is_js_auto()
+      && matches!(
+        parser.build_meta.exports_type,
+        rspack_core::BuildMetaExportsType::Unset
+      )
+      && !parser.get_dependencies().iter().any(|dep| {
+        matches!(
+          dep.dependency_type(),
+          DependencyType::CjsExportRequire
+            | DependencyType::CjsExports
+            | DependencyType::CjsFullRequire
+            | DependencyType::CjsRequire
+            | DependencyType::CjsSelfReference
+            | DependencyType::CommonJSRequireContext
+        )
+      })
+    {
+      parser.build_meta.exports_type = rspack_core::BuildMetaExportsType::Namespace;
+      parser.add_presentational_dependency(Box::new(ESMCompatibilityDependency));
+    }
+
+    None
+  }
+}
diff --git a/crates/rspack_plugin_esm_library/src/lib.rs b/crates/rspack_plugin_esm_library/src/lib.rs
@@ -1,5 +1,6 @@
 mod chunk_link;
 mod dependency;
+mod esm_lib_parser_plugin;
 mod link;
 mod plugin;
 mod preserve_modules;
diff --git a/crates/rspack_plugin_esm_library/src/link.rs b/crates/rspack_plugin_esm_library/src/link.rs
@@ -1724,10 +1724,6 @@ impl EsmLibraryPlugin {
             continue;
           };
 
-          if !matches!(dep.dependency_type(), DependencyType::EsmImport) {
-            continue;
-          }
-
           let Some(conn) = module_graph.connection_by_dependency_id(dep_id) else {
             continue;
           };
@@ -1744,6 +1740,10 @@ impl EsmLibraryPlugin {
           //ensure chunk
           chunk_imports.entry(ref_module).or_default();
 
+          if !matches!(dep.dependency_type(), DependencyType::EsmImport) {
+            continue;
+          }
+
           if outgoing_module_info.is_external() {
             if ChunkGraph::get_module_id(&compilation.module_ids_artifact, ref_module).is_none() {
               // if module don't contains id, it no need to be required
diff --git a/crates/rspack_plugin_esm_library/src/plugin.rs b/crates/rspack_plugin_esm_library/src/plugin.rs
@@ -11,22 +11,25 @@ use rspack_core::{
   CompilationFinishModules, CompilationOptimizeChunks, CompilationParams, CompilationProcessAssets,
   CompilationRuntimeRequirementInTree, CompilerCompilation, ConcatenatedModuleInfo,
   ConcatenationScope, DependencyType, ExportsInfoGetter, ExternalModuleInfo, Logger, ModuleGraph,
-  ModuleIdentifier, ModuleInfo, Plugin, PrefetchExportsInfoMode, RuntimeCondition, RuntimeGlobals,
-  get_target, is_esm_dep_like,
+  ModuleIdentifier, ModuleInfo, ModuleType, NormalModuleFactoryParser, ParserAndGenerator,
+  ParserOptions, Plugin, PrefetchExportsInfoMode, RuntimeCondition, RuntimeGlobals, get_target,
+  is_esm_dep_like,
   rspack_sources::{ReplaceSource, Source},
 };
 use rspack_error::Result;
 use rspack_hook::{plugin, plugin_hook};
 use rspack_plugin_javascript::{
-  JavascriptModulesRenderChunkContent, JsPlugin, RenderSource, dependency::ImportDependencyTemplate,
+  JavascriptModulesRenderChunkContent, JsPlugin, RenderSource,
+  dependency::ImportDependencyTemplate, parser_and_generator::JavaScriptParserAndGenerator,
 };
 use rspack_util::fx_hash::FxHashMap;
 use sugar_path::SugarPath;
 use tokio::sync::{Mutex, RwLock};
 
 use crate::{
   chunk_link::ChunkLinkContext, dependency::dyn_import::DynamicImportDependencyTemplate,
-  preserve_modules::preserve_modules, runtime::RegisterModuleRuntime,
+  esm_lib_parser_plugin::EsmLibParserPlugin, preserve_modules::preserve_modules,
+  runtime::RegisterModuleRuntime,
 };
 
 pub static CONCATENATED_MODULES_MAP_FOR_CODEGEN: LazyLock<
@@ -120,10 +123,13 @@ async fn finish_modules(&self, compilation: &mut Compilation) -> Result<()> {
     } else if ModuleGraph::is_async(compilation, module_identifier) {
       logger.debug(format!("module {module_identifier} is an async module"));
       should_scope_hoisting = false;
-    } else if !module.build_info().strict {
-      logger.debug(format!("module {module_identifier} is not strict module"));
-      should_scope_hoisting = false;
-    } else if module_graph
+    }
+    // TODO: support config to disable scope hoisting for non strict module
+    //  else if !module.build_info().strict {
+    //   logger.debug(format!("module {module_identifier} is not strict module"));
+    //   should_scope_hoisting = false;
+    // }
+    else if module_graph
       .get_incoming_connections(module_identifier)
       .filter_map(|conn| module_graph.dependency_by_id(&conn.dependency_id))
       .any(|dep| {
@@ -483,6 +489,21 @@ async fn optimize_chunks(&self, compilation: &mut Compilation) -> Result<Option<
   Ok(None)
 }
 
+#[plugin_hook(NormalModuleFactoryParser for EsmLibraryPlugin)]
+async fn parse(
+  &self,
+  module_type: &ModuleType,
+  parser: &mut dyn ParserAndGenerator,
+  _parser_options: Option<&ParserOptions>,
+) -> Result<()> {
+  if module_type.is_js_like()
+    && let Some(parser) = parser.downcast_mut::<JavaScriptParserAndGenerator>()
+  {
+    parser.add_parser_plugin(Box::new(EsmLibParserPlugin {}));
+  }
+  Ok(())
+}
+
 impl Plugin for EsmLibraryPlugin {
   fn apply(&self, ctx: &mut ApplyContext) -> Result<()> {
     ctx.compiler_hooks.compilation.tap(compilation::new(self));
@@ -524,6 +545,8 @@ impl Plugin for EsmLibraryPlugin {
       .optimize_chunks
       .tap(optimize_chunks::new(self));
 
+    ctx.normal_module_factory_hooks.parser.tap(parse::new(self));
+
     Ok(())
   }
 }
diff --git a/crates/rspack_plugin_javascript/src/visitors/dependency/parser/mod.rs b/crates/rspack_plugin_javascript/src/visitors/dependency/parser/mod.rs
@@ -326,7 +326,7 @@ pub struct JavascriptParser<'parser> {
   pub resource_data: &'parser ResourceData,
   pub(crate) compiler_options: &'parser CompilerOptions,
   pub(crate) javascript_options: &'parser JavascriptParserOptions,
-  pub(crate) module_type: &'parser ModuleType,
+  pub module_type: &'parser ModuleType,
   pub(crate) module_layer: Option<&'parser ModuleLayer>,
   pub module_identifier: &'parser ModuleIdentifier,
   pub(crate) plugin_drive: Rc<JavaScriptParserPluginDrive>,
@@ -566,6 +566,10 @@ impl<'parser> JavascriptParser<'parser> {
     self.dependencies.len()
   }
 
+  pub fn get_dependencies(&self) -> &[BoxDependency] {
+    &self.dependencies
+  }
+
   pub fn get_dependency_mut(&mut self, idx: usize) -> Option<&mut BoxDependency> {
     self.dependencies.get_mut(idx)
   }
diff --git a/tests/rspack-test/esmOutputCases/dynamic-import/basic/__snapshots__/esm.snap.txt b/tests/rspack-test/esmOutputCases/dynamic-import/basic/__snapshots__/esm.snap.txt
@@ -1,89 +1,18 @@
 ```mjs title=dynamic_js.mjs
-import { __webpack_require__ } from "./runtime.mjs";
-__webpack_require__.add({
-"./dynamic.js": 
-/*!********************!*\
-  !*** ./dynamic.js ***!
-  \********************/
-(function (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-__webpack_require__.d(__webpack_exports__, {
-  "default": () => (__WEBPACK_DEFAULT_EXPORT__)
-});
-/* ESM default export */ const __WEBPACK_DEFAULT_EXPORT__ = (42);
+// ./dynamic.js
+/* ESM default export */ const dynamic = (42);
 
-
-}),
-});
+export { dynamic };
 
 ```
 
 ```mjs title=main.mjs
-import { __webpack_require__ } from "./runtime.mjs";
-__webpack_require__.add({
-"./index.js": 
-/*!******************!*\
-  !*** ./index.js ***!
-  \******************/
-(function (__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
+// ./index.js
 it('should support dynamic import', async () => {
-	const value = await import("./dynamic_js.mjs").then(__webpack_require__.bind(__webpack_require__, /*! ./dynamic */ "./dynamic.js"))
+	const value = await import("./dynamic_js.mjs").then((mod) => ({ default: mod.dynamic }))
 	expect(value.default).toBe(42)
 })
 
 
 
-}),
-});
-const index = __webpack_require__("./index.js");
-
-
-```
-
-```mjs title=runtime.mjs
-
-var __webpack_modules__ = {};
-// The module cache
-var __webpack_module_cache__ = {};
-// The require function
-function __webpack_require__(moduleId) {
-// Check if module is in cache
-var cachedModule = __webpack_module_cache__[moduleId];
-if (cachedModule !== undefined) {
-return cachedModule.exports;
-}
-// Create a new module (and put it into the cache)
-var module = (__webpack_module_cache__[moduleId] = {
-exports: {}
-});
-// Execute the module function
-__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-
-// Return the exports of the module
-return module.exports;
-}
-// expose the modules object (__webpack_modules__)
-__webpack_require__.m = __webpack_modules__;
-
-// esm library register module runtime
-(() => {
-__webpack_require__.add = function registerModules(modules) { Object.assign(__webpack_require__.m, modules) }
-
-})();
-// webpack/runtime/define_property_getters
-(() => {
-__webpack_require__.d = (exports, definition) => {
-	for(var key in definition) {
-        if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
-            Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
-        }
-    }
-};
-})();
-// webpack/runtime/has_own_property
-(() => {
-__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
-})();
-
-export { __webpack_require__ };
-
 ```
diff --git a/tests/rspack-test/esmOutputCases/interop/raw-import/__snapshots__/esm.snap.txt b/tests/rspack-test/esmOutputCases/interop/raw-import/__snapshots__/esm.snap.txt
@@ -1,28 +1,11 @@
 ```mjs title=main.mjs
-import { __webpack_require__ } from "./runtime.mjs";
-__webpack_require__.add({
-"./bar.js": 
-/*!****************!*\
-  !*** ./bar.js ***!
-  \****************/
-(function () {
+// ./bar.js
 globalThis.bar = 'bar';
 
-
-}),
-"./foo.js": 
-/*!****************!*\
-  !*** ./foo.js ***!
-  \****************/
-(function () {
+// ./foo.js
 globalThis.foo = 'foo';
 
-
-}),
-});
 // ./index.js
-__webpack_require__("./bar.js");
-__webpack_require__("./foo.js");
 
 
 
@@ -32,39 +15,4 @@ it('should have correct import', () => {
 })
 
 
-```
-
-```mjs title=runtime.mjs
-
-var __webpack_modules__ = {};
-// The module cache
-var __webpack_module_cache__ = {};
-// The require function
-function __webpack_require__(moduleId) {
-// Check if module is in cache
-var cachedModule = __webpack_module_cache__[moduleId];
-if (cachedModule !== undefined) {
-return cachedModule.exports;
-}
-// Create a new module (and put it into the cache)
-var module = (__webpack_module_cache__[moduleId] = {
-exports: {}
-});
-// Execute the module function
-__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-
-// Return the exports of the module
-return module.exports;
-}
-// expose the modules object (__webpack_modules__)
-__webpack_require__.m = __webpack_modules__;
-
-// esm library register module runtime
-(() => {
-__webpack_require__.add = function registerModules(modules) { Object.assign(__webpack_require__.m, modules) }
-
-})();
-
-export { __webpack_require__ };
-
 ```
diff --git a/tests/rspack-test/esmOutputCases/new-url/keep-new-url/__snapshots__/esm.snap.txt b/tests/rspack-test/esmOutputCases/new-url/keep-new-url/__snapshots__/esm.snap.txt
@@ -5,19 +5,6 @@
 ```mjs title=main.mjs
 import { __webpack_require__ } from "./runtime.mjs";
 __webpack_require__.add({
-"./index.js": 
-/*!******************!*\
-  !*** ./index.js ***!
-  \******************/
-(function (__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
-
-function neverUse() {
-	new URL("./ef46db3751d8e999.js", import.meta.url)(function foo() {})();
-}
-neverUse.bind(neverUse)
-
-
-}),
 "./asset.js": 
 /*!******************!*\
   !*** ./asset.js ***!
@@ -27,7 +14,12 @@ module.exports = __webpack_require__.p + "ef46db3751d8e999.js";
 
 }),
 });
-const index = __webpack_require__("./index.js");
+// ./index.js
+
+function neverUse() {
+	new URL("./ef46db3751d8e999.js", import.meta.url)(function foo() {})();
+}
+neverUse.bind(neverUse)
 
 
 ```
diff --git a/tests/rspack-test/esmOutputCases/preserve-modules/basic/__snapshots__/esm.snap.txt b/tests/rspack-test/esmOutputCases/preserve-modules/basic/__snapshots__/esm.snap.txt
diff --git a/tests/rspack-test/esmOutputCases/split-chunks/move-entry/__snapshots__/esm.snap.txt b/tests/rspack-test/esmOutputCases/split-chunks/move-entry/__snapshots__/esm.snap.txt
