feat(parser): add new javascript parser options

web-infra-dev · Sep 23, 2024 · 8ed9800 · 8ed9800
1 parent 45a3997
commit 8ed9800
Show file tree

Hide file tree

Showing 10 changed files with 482 additions and 2 deletions.
diff --git a/crates/node_binding/binding.d.ts b/crates/node_binding/binding.d.ts
@@ -1417,6 +1417,10 @@ export interface RawJavascriptParserOptions {
   worker: Array<string>
   overrideStrict?: string
   importMeta: boolean
+  requireAsExpression: boolean
+  requireDynamic: boolean
+  requireResolve: boolean
+  importDynamic: boolean
 }
 
 export interface RawLazyCompilationOption {

diff --git a/crates/rspack_binding_options/src/options/raw_module/mod.rs b/crates/rspack_binding_options/src/options/raw_module/mod.rs
@@ -272,6 +272,10 @@ pub struct RawJavascriptParserOptions {
   pub worker: Vec<String>,
   pub override_strict: Option<String>,
   pub import_meta: bool,
+  pub require_as_expression: bool,
+  pub require_dynamic: bool,
+  pub require_resolve: bool,
+  pub import_dynamic: bool,
 }
 
 impl From<RawJavascriptParserOptions> for JavascriptParserOptions {
@@ -301,6 +305,10 @@ impl From<RawJavascriptParserOptions> for JavascriptParserOptions {
         .override_strict
         .map(|e| OverrideStrict::from(e.as_str())),
       import_meta: value.import_meta,
+      require_as_expression: value.require_as_expression,
+      require_dynamic: value.require_dynamic,
+      require_resolve: value.require_resolve,
+      import_dynamic: value.import_dynamic,
     }
   }
 }

diff --git a/crates/rspack_core/src/options/module.rs b/crates/rspack_core/src/options/module.rs
@@ -235,6 +235,10 @@ pub struct JavascriptParserOptions {
   pub worker: Vec<String>,
   pub override_strict: Option<OverrideStrict>,
   pub import_meta: bool,
+  pub require_as_expression: bool,
+  pub require_dynamic: bool,
+  pub require_resolve: bool,
+  pub import_dynamic: bool,
 }
 
 #[derive(Debug, Clone, MergeFrom)]

diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/common_js_imports_parse_plugin.rs b/crates/rspack_plugin_javascript/src/parser_plugin/common_js_imports_parse_plugin.rs
@@ -91,6 +91,10 @@ pub struct CommonJsImportsParserPlugin;
 
 impl CommonJsImportsParserPlugin {
   fn process_resolve(&self, parser: &mut JavascriptParser, call_expr: &CallExpr, weak: bool) {
+    if !parser.javascript_options.require_resolve {
+      return;
+    }
+
     if call_expr.args.len() != 1 {
       return;
     }
@@ -268,6 +272,10 @@ impl CommonJsImportsParserPlugin {
       }
     }
 
+    if !parser.javascript_options.require_dynamic && !param.is_string() {
+      return Some(true);
+    }
+
     // FIXME: should support `LocalModuleDependency`
     if self
       .process_require_item(parser, call_expr.span, &param)
@@ -290,6 +298,10 @@ impl CommonJsImportsParserPlugin {
     parser: &mut JavascriptParser,
     ident: &Ident,
   ) -> Option<bool> {
+    if !parser.javascript_options.require_as_expression {
+      return Some(true);
+    }
+
     let start = ident.span().real_lo();
     let end = ident.span().real_hi();
     let mut dep = CommonJsRequireContextDependency::new(

diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/import_parser_plugin.rs b/crates/rspack_plugin_javascript/src/parser_plugin/import_parser_plugin.rs
@@ -141,6 +141,10 @@ impl JavascriptParserPlugin for ImportParserPlugin {
       parser.blocks.push(Box::new(block));
       Some(true)
     } else {
+      if !parser.javascript_options.import_dynamic {
+        return Some(true);
+      }
+
       let ContextModuleScanResult {
         context,
         reg,

diff --git a/packages/rspack-test-tools/tests/__snapshots__/Defaults.test.js.snap b/packages/rspack-test-tools/tests/__snapshots__/Defaults.test.js.snap
@@ -167,6 +167,8 @@ Object {
         "importMeta": true,
         "overrideStrict": undefined,
         "reexportExportsPresence": undefined,
+        "requireDynamic": true,
+        "requireResolve": true,
         "strictExportPresence": false,
         "url": true,
         "worker": Array [

diff --git a/packages/rspack/etc/api.md b/packages/rspack/etc/api.md
diff --git a/packages/rspack/src/config/adapter.ts b/packages/rspack/src/config/adapter.ts
@@ -685,7 +685,11 @@ function getRawJavascriptParserOptions(
 					? ["..."]
 					: []
 				: parser.worker ?? ["..."],
-		overrideStrict: parser.overrideStrict
+		overrideStrict: parser.overrideStrict,
+		requireAsExpression: parser.requireAsExpression ?? true,
+		requireDynamic: parser.requireDynamic ?? true,
+		requireResolve: parser.requireResolve ?? true,
+		importDynamic: parser.importDynamic ?? true
 	};
 }
 

diff --git a/packages/rspack/src/config/defaults.ts b/packages/rspack/src/config/defaults.ts
@@ -246,6 +246,10 @@ const applyJavascriptParserOptionsDefaults = (
 	D(parserOptions, "importExportsPresence", undefined);
 	D(parserOptions, "reexportExportsPresence", undefined);
 	D(parserOptions, "strictExportPresence", false);
+	D(parserOptions, "requireAsExpression", true);
+	D(parserOptions, "requireDynamic", true);
+	D(parserOptions, "requireResolve", true);
+	D(parserOptions, "importDynamic", true);
 	D(parserOptions, "worker", ["..."]);
 	D(parserOptions, "overrideStrict", undefined);
 	D(parserOptions, "importMeta", true);

diff --git a/packages/rspack/src/config/zod.ts b/packages/rspack/src/config/zod.ts
@@ -601,6 +601,10 @@ const reexportExportsPresence = z
 const strictExportPresence = z.boolean();
 const worker = z.array(z.string()).or(z.boolean());
 const overrideStrict = z.enum(["strict", "non-strict"]);
+const requireAsExpression = z.boolean();
+const requireDynamic = z.boolean();
+const requireResolve = z.boolean();
+const importDynamic = z.boolean();
 
 const javascriptParserOptions = z.strictObject({
 	dynamicImportMode: dynamicImportMode.optional(),
@@ -616,7 +620,13 @@ const javascriptParserOptions = z.strictObject({
 	reexportExportsPresence: reexportExportsPresence.optional(),
 	strictExportPresence: strictExportPresence.optional(),
 	worker: worker.optional(),
-	overrideStrict: overrideStrict.optional()
+	overrideStrict: overrideStrict.optional(),
+	// #region Not available in webpack yet.
+	requireAsExpression: requireAsExpression.optional(),
+	requireDynamic: requireDynamic.optional(),
+	requireResolve: requireResolve.optional(),
+	importDynamic: importDynamic.optional()
+	// #endregion
 });
 export type JavascriptParserOptions = z.infer<typeof javascriptParserOptions>;