fix: generate correct worker expression with trusted types (#8143)

web-infra-dev · Oct 18, 2024 · ddd7eb9 · ddd7eb9 · rspack-bot · Oct 18, 2024
1 parent 1c7a37c
commit ddd7eb9
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 20 deletions.
diff --git a/crates/rspack_plugin_javascript/src/parser_plugin/worker_plugin.rs b/crates/rspack_plugin_javascript/src/parser_plugin/worker_plugin.rs
@@ -74,6 +74,7 @@ fn parse_new_worker_options_from_comments(
 fn add_dependencies(
   parser: &mut JavascriptParser,
   span: Span,
+  first_arg: &ExprOrSpread,
   parsed_path: ParsedNewWorkerPath,
   parsed_options: Option<ParsedNewWorkerOptions>,
 ) {
@@ -124,7 +125,7 @@ fn add_dependencies(
       .dependencies
       .push(Box::new(CreateScriptUrlDependency::new(
         span.into(),
-        parsed_path.range.into(),
+        first_arg.span().into(),
       )));
   }
 
@@ -156,11 +157,15 @@ fn add_dependencies(
   }
 }
 
-fn handle_worker(
+fn handle_worker<'a>(
   parser: &mut JavascriptParser,
-  args: &[ExprOrSpread],
+  args: &'a [ExprOrSpread],
   span: Span,
-) -> Option<(ParsedNewWorkerPath, Option<ParsedNewWorkerOptions>)> {
+) -> Option<(
+  ParsedNewWorkerPath,
+  Option<ParsedNewWorkerOptions>,
+  &'a ExprOrSpread,
+)> {
   if let Some(expr_or_spread) = args.first()
     && let ExprOrSpread {
       spread: None,
@@ -190,7 +195,7 @@ fn handle_worker(
         // new Worker(/* options */ new URL("worker.js"))
         parse_new_worker_options_from_comments(parser, expr_or_spread.span(), span)
       });
-    Some((path, options))
+    Some((path, options, expr_or_spread))
   } else {
     None
   }
@@ -333,8 +338,14 @@ impl JavascriptParserPlugin for WorkerPlugin {
       && value.contains(&members.iter().map(|id| id.as_str()).join("."))
     {
       return handle_worker(parser, &call_expr.args, call_expr.span).map(
-        |(parsed_path, parsed_options)| {
-          add_dependencies(parser, call_expr.span, parsed_path, parsed_options);
+        |(parsed_path, parsed_options, first_arg)| {
+          add_dependencies(
+            parser,
+            call_expr.span,
+            first_arg,
+            parsed_path,
+            parsed_options,
+          );
           if let Some(callee) = call_expr.callee.as_expr() {
             parser.walk_expression(callee);
           }
@@ -362,8 +373,14 @@ impl JavascriptParserPlugin for WorkerPlugin {
         .contains(&(ids, settings.source.to_string()))
       {
         return handle_worker(parser, &call_expr.args, call_expr.span).map(
-          |(parsed_path, parsed_options)| {
-            add_dependencies(parser, call_expr.span, parsed_path, parsed_options);
+          |(parsed_path, parsed_options, first_arg)| {
+            add_dependencies(
+              parser,
+              call_expr.span,
+              first_arg,
+              parsed_path,
+              parsed_options,
+            );
             if let Some(callee) = call_expr.callee.as_expr() {
               parser.walk_expression(callee);
             }
@@ -376,13 +393,21 @@ impl JavascriptParserPlugin for WorkerPlugin {
     if !self.call_syntax.contains(for_name) {
       return None;
     }
-    handle_worker(parser, &call_expr.args, call_expr.span).map(|(parsed_path, parsed_options)| {
-      add_dependencies(parser, call_expr.span, parsed_path, parsed_options);
-      if let Some(callee) = call_expr.callee.as_expr() {
-        parser.walk_expression(callee);
-      }
-      true
-    })
+    handle_worker(parser, &call_expr.args, call_expr.span).map(
+      |(parsed_path, parsed_options, first_arg)| {
+        add_dependencies(
+          parser,
+          call_expr.span,
+          first_arg,
+          parsed_path,
+          parsed_options,
+        );
+        if let Some(callee) = call_expr.callee.as_expr() {
+          parser.walk_expression(callee);
+        }
+        true
+      },
+    )
   }
 
   fn new_expression(
@@ -405,8 +430,14 @@ impl JavascriptParserPlugin for WorkerPlugin {
           .args
           .as_ref()
           .and_then(|args| handle_worker(parser, args, new_expr.span))
-          .map(|(parsed_path, parsed_options)| {
-            add_dependencies(parser, new_expr.span, parsed_path, parsed_options);
+          .map(|(parsed_path, parsed_options, first_arg)| {
+            add_dependencies(
+              parser,
+              new_expr.span,
+              first_arg,
+              parsed_path,
+              parsed_options,
+            );
             parser.walk_expression(&new_expr.callee);
             true
           });
@@ -420,8 +451,14 @@ impl JavascriptParserPlugin for WorkerPlugin {
       .args
       .as_ref()
       .and_then(|args| handle_worker(parser, args, new_expr.span))
-      .map(|(parsed_path, parsed_options)| {
-        add_dependencies(parser, new_expr.span, parsed_path, parsed_options);
+      .map(|(parsed_path, parsed_options, first_arg)| {
+        add_dependencies(
+          parser,
+          new_expr.span,
+          first_arg,
+          parsed_path,
+          parsed_options,
+        );
         parser.walk_expression(&new_expr.callee);
         true
       })

diff --git a/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/index.js b/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/index.js
@@ -0,0 +1,45 @@
+const fs = __non_webpack_require__("fs");
+const path = __non_webpack_require__("path");
+
+
+function createWorker() {
+	new Worker(new URL("./worker.js", import.meta.url), {
+		type: "module"
+	});
+}
+
+createWorker;
+
+it("should generate correct new Worker statement", async () => {
+	const content = fs.readFileSync(__filename, "utf-8");
+	const method = "__webpack_require__.tu";
+	expect(content).toContain(`new Worker(${method}(new URL(`)
+});
+
+
+function createWorkerWithChunkName() {
+	new Worker(/* webpackChunkName: "someChunkName" */new URL("./worker.js", import.meta.url));
+}
+
+createWorkerWithChunkName
+
+it("should generate correct new Worker statement with magic comments", async () => {
+	const content = fs.readFileSync(__filename, "utf-8");
+	const chunkName = "someChunkName";
+	expect(content).toContain(`new Worker(/* webpackChunkName: "${chunkName}" */__webpack_require__.tu(new URL(`)
+	expect(fs.existsSync(path.join(__dirname, `${chunkName}.js`))).toBeTruthy();
+});
+
+
+function createWorkerWithChunkNameInnner() {
+	new Worker(new URL(/* webpackChunkName: "someChunkName2" */ "./worker.js", import.meta.url));
+}
+
+createWorkerWithChunkNameInnner
+
+it("should generate correct new Worker statement with magic comments", async () => {
+	const content = fs.readFileSync(__filename, "utf-8");
+	const chunkName = "someChunkName2";
+	expect(content).toContain(`new Worker(__webpack_require__.tu(new URL(/* webpackChunkName: "${chunkName}" */`)
+	expect(fs.existsSync(path.join(__dirname, `${chunkName}.js`))).toBeTruthy();
+});
diff --git a/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/module.js b/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/module.js
@@ -0,0 +1,3 @@
+export function upper(s) {
+	return s.toUpperCase();
+}
diff --git a/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/rspack.config.js b/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/rspack.config.js
@@ -0,0 +1,12 @@
+module.exports = {
+	output: {
+		filename: "[name].js",
+		chunkFilename: "[name].js",
+		trustedTypes: true
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	target: "web"
+};
diff --git a/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/test.config.js b/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/test.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+	findBundle: function (i, options) {
+		return ["main.js"];
+	}
+};
diff --git a/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/worker.js b/packages/rspack-test-tools/tests/configCases/trusted-types/web-worker/worker.js
@@ -0,0 +1,3 @@
+onmessage = async event => {
+	postMessage(`data: ${event.data}, thanks`);
+};
suite	result
modernjs	✅ success
_selftest	✅ success
rspress	✅ success
rslib	❌ failure
rsbuild	✅ success
examples	✅ success
devserver	✅ success
Name	Base (2024-10-18 d01e85c)	Current	Change
10000_development-mode + exec	2.14 s ± 16 ms	2.1 s ± 27 ms	-1.82 %
10000_development-mode_hmr + exec	673 ms ± 11 ms	668 ms ± 24 ms	-0.73 %
10000_production-mode + exec	2.68 s ± 42 ms	2.65 s ± 34 ms	-1.19 %
arco-pro_development-mode + exec	1.79 s ± 90 ms	1.78 s ± 87 ms	-0.82 %
arco-pro_development-mode_hmr + exec	427 ms ± 1.4 ms	426 ms ± 1.4 ms	-0.22 %
arco-pro_production-mode + exec	3.18 s ± 64 ms	3.19 s ± 107 ms	+0.47 %
arco-pro_production-mode_generate-package-json-webpack-plugin + exec	3.17 s ± 81 ms	3.28 s ± 93 ms	+3.72 %
threejs_development-mode_10x + exec	1.61 s ± 18 ms	1.61 s ± 19 ms	-0.03 %
threejs_development-mode_10x_hmr + exec	756 ms ± 12 ms	755 ms ± 6.5 ms	-0.03 %
threejs_production-mode_10x + exec	4.94 s ± 35 ms	5 s ± 50 ms	+1.18 %