fix: 🐛 dep to module id

web-infra-dev · IWANABETHATGUY · Feb 1, 2024 · Jan 23, 2024 · Jan 23, 2024 · Jan 23, 2024
commit e185b39a581c9986a2405b92746a3439b570fd2e
diff --git a/crates/rspack_core/src/concatenated_module.rs b/crates/rspack_core/src/concatenated_module.rs
@@ -29,7 29,7 @@ use swc_core::{
 use swc_node_comments::SwcComments;
 
 use crate::{
- filter_runtime, impl_source_map_config, merge_runtime_condition,
  define_es_module_flag_statement, filter_runtime, impl_source_map_config, merge_runtime_condition,
  merge_runtime_condition_non_false, property_access, property_name,
  reserved_names::RESERVED_NAMES, returning_function, runtime_condition_expression,
  subtract_runtime_condition, AsyncDependenciesBlockId, BoxDependency, BuildContext, BuildInfo,
@@ -629,9 629,7 @@ impl Module for ConcatenatedModule {
  module_to_info_map.insert(id, module_info);
  }
 
- // TODO: recover
- // let mut all_used_names = HashSet::from_iter(RESERVED_NAMES.iter().map(|item| item.to_string()));
- let mut all_used_names = HashSet::from_iter([]);
  let mut all_used_names = HashSet::from_iter(RESERVED_NAMES.iter().map(|item| item.to_string()));
 
  for module in modules_with_info.iter() {
  let ModuleInfoOrReference::Concatenated(m) = module else {
@@ -673,7 671,6 @@ impl Module for ConcatenatedModule {
  info.binding_to_ref = binding_to_ref;
  }
  }
- dbg!(&all_used_names);
 
  for info in module_to_info_map.values_mut() {
  // Get used names in the scope
@@ -752,7 749,6 @@ impl Module for ConcatenatedModule {
  info.name = Some(external_name.as_str().into());
  }
  }
- // dbg!(&exports_type, info.id());
  // Handle additional logic based on module build meta
  if exports_type != Some(BuildMetaExportsType::Namespace) {
  let external_name_interop = Self::find_new_name(
@@ -845,8 841,7 @@ impl Module for ConcatenatedModule {
  let final_name = Self::get_final_name(
  &compilation.module_graph,
  &referenced_info_id,
- // TODO: remove clone
- export_name.clone(),
  export_name,
  &mut module_to_info_map,
  runtime,
  &mut needed_namespace_objects,
@@ -856,7 851,6 @@ impl Module for ConcatenatedModule {
  asi_safe,
  &context,
  );
- // dbg!(&reference_ident, &final_name, &export_name);
  // We assume this should be concatenated module info because previous loop
  let info = module_to_info_map
  .get_mut(&module_info_id)
@@ -940,14 934,13 @@ impl Module for ConcatenatedModule {
  != UsageState::Unused
  {
  result.add(RawSource::from("// ESM COMPAT FLAG\n"));
- // TODO:
- // result.add(
- // &runtime_template
- // .define_es_module_flag_statement(this.exports_argument, runtime_requirements),
- // );
  result.add(RawSource::from(define_es_module_flag_statement(
  self.get_exports_argument(),
  &mut runtime_requirements,
  )));
  }
 
- // Assuming the necessary Rust imports and dependencies are declared
  // Assuming the necessary imports and dependencies are declared
 
  // Define exports
  if !exports_map.is_empty() {

diff --git a/crates/rspack_core/src/dependency/runtime_template.rs b/crates/rspack_core/src/dependency/runtime_template.rs
@@ -11,9 11,10 @@ use tracing::instrument::WithSubscriber;
 
 use crate::{
  get_import_var, property_access, to_comment, to_normal_comment, AsyncDependenciesBlockId,
- ChunkGraph, Compilation, DependenciesBlock, DependencyId, ExportsType, FakeNamespaceObjectMode,
- InitFragmentExt, InitFragmentKey, InitFragmentStage, ModuleGraph, ModuleIdentifier,
- NormalInitFragment, RuntimeCondition, RuntimeGlobals, RuntimeSpec, TemplateContext,
  ChunkGraph, Compilation, DependenciesBlock, DependencyId, ExportsArgument, ExportsType,
  FakeNamespaceObjectMode, InitFragmentExt, InitFragmentKey, InitFragmentStage, ModuleGraph,
  ModuleIdentifier, NormalInitFragment, RuntimeCondition, RuntimeGlobals, RuntimeSpec,
  TemplateContext,
 };
 
 pub fn runtime_condition_expression(
@@ -569,6 570,9 @@ pub fn module_id(
  request: &str,
  weak: bool,
 ) -> String {
  dbg!(&compilation
  .module_graph
  .module_identifier_by_dependency_id(id));
  if let Some(module_identifier) = compilation
  .module_graph
  .module_identifier_by_dependency_id(id)
@@ -648,6 652,7 @@ pub fn module_namespace_promise(
  .module_identifier_by_dependency_id(dep_id)
  .is_none()
  {
  dbg!(&dep_id.get_dependency(&compilation.module_graph));
  return missing_module_promise(request);
  };
 
@@ -898,6 903,19 @@ pub fn async_module_factory(
  )
 }
 
 pub fn define_es_module_flag_statement(
  exports_argument: ExportsArgument,
  runtime_requirements: &mut RuntimeGlobals,
 ) -> String {
  runtime_requirements.insert(RuntimeGlobals::MAKE_NAMESPACE_OBJECT);
  runtime_requirements.insert(RuntimeGlobals::EXPORTS);
 
  format!(
  "{}({});\n",
  RuntimeGlobals::MAKE_NAMESPACE_OBJECT,
  exports_argument
  )
 }
 mod test_items_to_regexp {
 
  use super::items_to_regexp;

diff --git a/crates/rspack_core/src/module_graph/mod.rs b/crates/rspack_core/src/module_graph/mod.rs
@@ -302,9 302,9 @@ impl ModuleGraph {
  .insert(new_connection, condition.clone());
  }
 
- // self
- // .dependency_id_to_connection_id
- // .insert(new_connection.dependency_id, new_connection_id);
  self
   .dependency_id_to_module_identifier
   .insert(new_connection.dependency_id, module_identifier);
 
  self
  .connection_id_to_dependency_id

diff --git a/crates/rspack_core/src/utils/concatenated_module_visitor.rs b/crates/rspack_core/src/utils/concatenated_module_visitor.rs
@@ -45,6 45,7 @@ impl Visit for IdentCollector {
  }
  }
 
  /// https://github.com/webpack/webpack/blob/1f99ad6367f2b8a6ef17cce0e058f7a67fb7db18/lib/optimize/ConcatenatedModule.js#L1173-L1197
  fn visit_class_expr(&mut self, node: &ClassExpr) {
  if let Some(ref ident) = node.ident
  && node.class.super_class.is_some()

diff --git a/examples/esModule/index.js b/examples/esModule/index.js
@@ -0,0 1,6 @@
 it("should have the __esModule flag", () => {
  return import("./module").then(mod => {
  expect(mod.__esModule).toBe(true);
  expect(mod.default).toBe(84);
  })
 })
diff --git a/examples/esModule/module.js b/examples/esModule/module.js
@@ -0,0 1,3 @@
 import other from "./other";
 
 export default other * 2;
diff --git a/examples/esModule/other.js b/examples/esModule/other.js
@@ -0,0 1 @@
 export default 42;
diff --git a/examples/esModule/package.json b/examples/esModule/package.json
@@ -0,0 1,8 @@
 {
  "scripts": {
  "build": "rspack build"
  },
  "dependencies": {
  "@rspack/cli": "workspace:^"
  }
 }
diff --git a/examples/esModule/rspack.config.js b/examples/esModule/rspack.config.js
@@ -0,0 1,22 @@
 /** @type {import("@rspack/core").Configuration} */
 module.exports = {
  mode: 'production',
  entry: {
  "main": "./index.js"
  },
  experiments: {
  rspackFuture: {
  newTreeshaking: true,
  }
  },
  optimization: {
  mangleExports: false,
  moduleIds: 'named',
  concatenateModules: true,
  usedExports: true,
  sideEffects: true,
  providedExports: true,
  minimize: false,
 
  }
 };
diff --git a/examples/harmony-pure-default/index.js b/examples/harmony-pure-default/index.js
@@ -1,16 1,15 @@
-import x1, { value as v1 } from "./module1";
-import x2, { value as v2 } from "./module2";
-// import { value as v3 } from "./module3";
 // import x1, { value as v1 } from "./module1";
 // import x2, { value as v2 } from "./module2";
 import { value as v3 } from "./module3";
 // import x4, { value as v4 } from "./module4";
 
 it("should not execute exports when annotated with pure comment", () => {
  expect(v1).toBe(42);
  expect(v2).toBe(42);
- // expect(v3).toBe(42);
- // expect(v4).toBe(42);
  expect(v3).toBe(42);
  expect(v4).toBe(42);
 });
 
-var x = (function() {
 var x = /*#__PURE__*/(function() {
  return x1 x2 x4;
 });
-x
diff --git a/examples/harmony-pure-default/module3.js b/examples/harmony-pure-default/module3.js
@@ -7,3 7,5 @@ const inc = () => {
 export default /*#__PURE__*/(inc());
 
 export { value };
 
 export const cccc = inc();
diff --git a/examples/harmony-pure-default/package.json b/examples/harmony-pure-default/package.json
@@ -4,6 4,5 @@
  },
  "dependencies": {
  "@rspack/cli": "workspace:^"
- },
- "sideEffects": true
  }
 }
diff --git a/webpack-test/configCases/scope-hoisting/harmony-pure-default/test.filter.js b/webpack-test/configCases/scope-hoisting/harmony-pure-default/test.filter.js
@@ -1 1,8 @@
-module.exports = () => {return true}
 const { FilteredStatus } = require("../../../lib/util/filterUtil")
 
 module.exports = () => {
  return [
  FilteredStatus.PARTIAL_PASS,
  "https://github.com/web-infra-dev/rspack/issues/5460"
  ]
 }