fix: return url in CreateScriptUrlRuntimeModule (#8088)

* fix: return url in CreateScriptUrlRuntimeModule * fix: return url in CreateScriptUrlRuntimeModule * fix: return url in CreateScriptUrlRuntimeModule
web-infra-dev · Oct 11, 2024 · 3153da6 · 3153da6 · rspack-bot · Oct 11, 2024
1 parent 6f08e69
commit 3153da6
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 1 deletion.
diff --git a/crates/rspack_plugin_runtime/src/runtime_module/create_script_url.rs b/crates/rspack_plugin_runtime/src/runtime_module/create_script_url.rs
@@ -37,7 +37,7 @@ impl RuntimeModule for CreateScriptUrlRuntimeModule {
             RuntimeGlobals::GET_TRUSTED_TYPES_POLICY
           )
         } else {
-          "'{url}'".to_string()
+          "url".to_string()
         }
       ))
       .boxed(),

diff --git a/packages/rspack-test-tools/src/compare/replace-runtime-module-name.ts b/packages/rspack-test-tools/src/compare/replace-runtime-module-name.ts
@@ -9,6 +9,8 @@ const RUNTIME_MODULE_NAME_MAPPING = {
 	"webpack/runtime/compat": "webpack/runtime/compat",
 	"webpack/runtime/create_fake_namespace_object":
 		"webpack/runtime/create fake namespace object",
+	"webpack/runtime/create_script_url":
+		"webpack/runtime/trusted types script url",
 	"webpack/runtime/create_script": "webpack/runtime/trusted types script",
 	"webpack/runtime/define_property_getters":
 		"webpack/runtime/define property getters",

diff --git a/...sts/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/rspack.config.js b/...sts/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/rspack.config.js
@@ -0,0 +1,10 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	output: {
+		trustedTypes: "customPolicyName",
+		chunkLoading: "import-scripts"
+	},
+	entry: {
+		other: "./src/index"
+	}
+};
diff --git a/...s/tests/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/src/index.js b/...s/tests/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/src/index.js
@@ -0,0 +1,5 @@
+const worker = new Worker(new URL("./worker.js", import.meta.url), {
+  type: "module",
+  name: "worker1"
+});
+worker.postMessage("ok");
diff --git a/.../tests/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/src/module.js b/.../tests/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/src/module.js
@@ -0,0 +1,3 @@
+export function upper(str) {
+	return str.toUpperCase();
+}
diff --git a/.../tests/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/src/worker.js b/.../tests/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/src/worker.js
@@ -0,0 +1,4 @@
+onmessage = async event => {
+	const { upper } = await import("./module");
+	postMessage(`data: ${upper(event.data)}, thanks`);
+};
diff --git a/...tests/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/test.config.js b/...tests/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/test.config.js
@@ -0,0 +1,5 @@
+/** @type {import("../../..").TDiffCaseConfig} */
+module.exports = {
+	modules: false,
+	runtimeModules: true
+};
diff --git a/...ts/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/webpack.config.js b/...ts/runtimeDiffCases/runtime-module/create-script-url#with-trusted-types/webpack.config.js
@@ -0,0 +1,10 @@
+/** @type {import("webpack").Configuration} */
+module.exports = {
+	output: {
+		trustedTypes: "customPolicyName",
+		chunkLoading: "import-scripts"
+	},
+	entry: {
+		other: "./src/index"
+	}
+};
diff --git a/...spack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/rspack.config.js b/...spack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/rspack.config.js
@@ -0,0 +1,16 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+	entry: {
+		other: "./src/index"
+	},
+	plugins: [{
+		apply(compiler) {
+			const { RuntimeGlobals } = compiler.webpack;
+			compiler.hooks.thisCompilation.tap("testPlugin", (compilation) => {
+				compilation.hooks.additionalTreeRuntimeRequirements.tap("testPlugin", (chunk, set) => {
+					set.add(RuntimeGlobals.createScriptUrl);
+				});
+			});
+		}
+	}]
+};
diff --git a/...es/rspack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/src/index.js b/...es/rspack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/src/index.js
@@ -0,0 +1,5 @@
+const worker = new Worker(new URL("./worker.js", import.meta.url), {
+  type: "module",
+  name: "worker1"
+});
+worker.postMessage("ok");
diff --git a/...s/rspack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/src/module.js b/...s/rspack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/src/module.js
@@ -0,0 +1,3 @@
+export function upper(str) {
+	return str.toUpperCase();
+}
diff --git a/...s/rspack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/src/worker.js b/...s/rspack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/src/worker.js
@@ -0,0 +1,4 @@
+onmessage = async event => {
+	const { upper } = await import("./module");
+	postMessage(`data: ${upper(event.data)}, thanks`);
+};
diff --git a/.../rspack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/test.config.js b/.../rspack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/test.config.js
@@ -0,0 +1,5 @@
+/** @type {import("../../..").TDiffCaseConfig} */
+module.exports = {
+	modules: false,
+	runtimeModules: true
+};
diff --git a/...pack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/webpack.config.js b/...pack-test-tools/tests/runtimeDiffCases/runtime-module/create-script-url/webpack.config.js
@@ -0,0 +1,16 @@
+/** @type {import("webpack").Configuration} */
+module.exports = {
+	entry: {
+		other: "./src/index"
+	},
+	plugins: [{
+		apply(compiler) {
+			const { RuntimeGlobals } = compiler.webpack;
+			compiler.hooks.thisCompilation.tap("testPlugin", (compilation) => {
+				compilation.hooks.additionalTreeRuntimeRequirements.tap("testPlugin", (chunk, set) => {
+					set.add(RuntimeGlobals.createScriptUrl);
+				});
+			});
+		}
+	}]
+};
Name	Base (2024-10-11 598d44e)	Current	Change
10000_development-mode + exec	2.16 s ± 42 ms	2.17 s ± 26 ms	+0.48 %
10000_development-mode_hmr + exec	682 ms ± 13 ms	687 ms ± 4.4 ms	+0.74 %
10000_production-mode + exec	2.74 s ± 39 ms	2.75 s ± 41 ms	+0.50 %
arco-pro_development-mode + exec	1.84 s ± 93 ms	1.82 s ± 88 ms	-0.69 %
arco-pro_development-mode_hmr + exec	436 ms ± 6.2 ms	435 ms ± 5.9 ms	-0.23 %
arco-pro_production-mode + exec	3.14 s ± 85 ms	3.1 s ± 66 ms	-1.36 %
arco-pro_production-mode_generate-package-json-webpack-plugin + exec	3.13 s ± 85 ms	3.19 s ± 102 ms	+1.77 %
threejs_development-mode_10x + exec	1.7 s ± 16 ms	1.7 s ± 17 ms	-0.07 %
threejs_development-mode_10x_hmr + exec	802 ms ± 9 ms	803 ms ± 7.8 ms	+0.12 %
threejs_production-mode_10x + exec	5.04 s ± 24 ms	5.05 s ± 38 ms	+0.25 %
suite	result
modernjs	✅ success
_selftest	✅ success
rspress	✅ success
rslib	✅ success
rsbuild	✅ success
examples	✅ success
devserver	✅ success