PackageToJS: Fix browser tests with non-.wasm product

kateinoigakukun · kateinoigakukun · commit 81fe6c803303 · 2025-03-17T07:55:26.000Z
diff --git a/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift b/Plugins/PackageToJS/Sources/PackageToJSPlugin.swift
@@ -119,7 +119,9 @@ struct PackageToJSPlugin: CommandPlugin {
         )
         let planner = PackagingPlanner(
             options: buildOptions.packageOptions, context: context, selfPackage: selfPackage,
-            outputDir: outputDir, wasmProductArtifact: productArtifact)
+            outputDir: outputDir, wasmProductArtifact: productArtifact,
+            wasmFilename: productArtifact.lastPathComponent
+        )
         let rootTask = try planner.planBuild(
             make: &make, buildOptions: buildOptions)
         cleanIfBuildGraphChanged(root: rootTask, make: make, context: context)
@@ -193,7 +195,14 @@ struct PackageToJSPlugin: CommandPlugin {
         )
         let planner = PackagingPlanner(
             options: testOptions.packageOptions, context: context, selfPackage: selfPackage,
-            outputDir: outputDir, wasmProductArtifact: productArtifact)
+            outputDir: outputDir, wasmProductArtifact: productArtifact,
+            // If the product artifact doesn't have a .wasm extension, add it
+            // to deliver it with the correct MIME type when serving the test
+            // files for browser tests.
+            wasmFilename: productArtifact.lastPathComponent.hasSuffix(".wasm")
+                ? productArtifact.lastPathComponent
+                : productArtifact.lastPathComponent + ".wasm"
+        )
         let (rootTask, binDir) = try planner.planTestBuild(
             make: &make)
         cleanIfBuildGraphChanged(root: rootTask, make: make, context: context)
@@ -486,7 +495,8 @@ extension PackagingPlanner {
         context: PluginContext,
         selfPackage: Package,
         outputDir: URL,
-        wasmProductArtifact: URL
+        wasmProductArtifact: URL,
+        wasmFilename: String
     ) {
         let outputBaseName = outputDir.lastPathComponent
         let (configuration, triple) = PackageToJS.deriveBuildConfiguration(wasmProductArtifact: wasmProductArtifact)
@@ -498,7 +508,7 @@ extension PackagingPlanner {
             selfPackageDir: BuildPath(absolute: selfPackage.directoryURL.path),
             outputDir: BuildPath(absolute: outputDir.path),
             wasmProductArtifact: BuildPath(absolute: wasmProductArtifact.path),
-            wasmFilename: wasmProductArtifact.lastPathComponent,
+            wasmFilename: wasmFilename,
             configuration: configuration,
             triple: triple,
             system: system
diff --git a/Plugins/PackageToJS/Templates/test.browser.html b/Plugins/PackageToJS/Templates/test.browser.html
@@ -4,14 +4,15 @@
 <body>
     <script type="module">
         import { testBrowserInPage } from "./test.js";
+        import { MODULE_PATH } from "./instantiate.js";
         import { defaultBrowserSetup /* #if USE_SHARED_MEMORY */, createDefaultWorkerFactory /* #endif */} from './platforms/browser.js';
 
         const logElement = document.createElement("pre");
         document.body.appendChild(logElement);
 
         const processInfo = await fetch("/process-info.json").then((response) => response.json());
         const options = await defaultBrowserSetup({
-            module: await fetch("./main.wasm"),
+            module: await fetch(new URL(MODULE_PATH, import.meta.url)),
             args: processInfo.args,
             onStdoutLine: (line) => {
                 console.log(line);
diff --git a/Plugins/PackageToJS/Tests/ExampleTests.swift b/Plugins/PackageToJS/Tests/ExampleTests.swift
@@ -182,7 +182,7 @@ extension Trait where Self == ConditionTrait {
                 let process = Process()
                 process.executableURL = llvmCov
                 let profdata = packageDir.appending(path: ".build/plugins/PackageToJS/outputs/PackageTests/default.profdata")
-                let wasm = packageDir.appending(path: ".build/plugins/PackageToJS/outputs/PackageTests/main.wasm")
+                let wasm = packageDir.appending(path: ".build/plugins/PackageToJS/outputs/PackageTests/TestingPackageTests.wasm")
                 process.arguments = ["report", "-instr-profile", profdata.path, wasm.path]
                 process.standardOutput = FileHandle.nullDevice
                 try process.run()
