[wasm] Make WasmMainJSPath optional

eng/testing/tests.browser.targets

@@ -132,6 +132,8 @@
       <WasmAppDir>$(BundleDir)</WasmAppDir>
       <WasmMainAssemblyFileName Condition="'$(WasmMainAssemblyFileName)' == ''">WasmTestRunner.dll</WasmMainAssemblyFileName>
       <WasmMainJSPath Condition="'$(WasmMainJSPath)' == ''">$(MonoProjectRoot)\wasm\test-main.js</WasmMainJSPath>
+      <WasmMainJSFileName>$([System.IO.Path]::GetFileName('$(WasmMainJSPath)'))</WasmMainJSFileName> 
+      <WasmMainHtmlPath>$(PublishDir)index.html</WasmMainHtmlPath>
       <WasmInvariantGlobalization>$(InvariantGlobalization)</WasmInvariantGlobalization>
       <WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>
 
@@ -148,6 +150,9 @@
     </ItemGroup>
 
     <ItemGroup>
+      <WasmExtraFilesToDeploy Include="$(WasmMainJSPath)" />
+      <WasmExtraFilesToDeploy Include="$(WasmMainHtmlPath)" />
+
       <WasmAssembliesToBundle Include="$(PublishDir)\**\*.dll" Condition="'$(BuildAOTTestsOnHelix)' == 'true'" />
       <WasmFilesToIncludeInFileSystem Include="@(ContentWithTargetPath)" />
 
@@ -166,6 +171,8 @@
               TargetPath="%(WasmFilesToIncludeFromPublishDir.Identity)"
               Condition="'%(WasmFilesToIncludeFromPublishDir.Identity)' != ''" />
     </ItemGroup>
+
+    <WriteLinesToFile File="$(WasmMainHtmlPath)" Lines="&lt;html&gt;&lt;body&gt;&lt;script type='module' src='$(WasmMainJSFileName)'&gt;&lt;/script&gt;&lt;/body&gt;&lt;/html&gt;" Overwrite="True" Condition="!Exists('$(WasmMainHtmlPath)')"/>
   </Target>
 
   <Target Name="_PrepareForAOTOnHelix">

src/mono/sample/mbr/browser/WasmDelta.csproj

@@ -7,7 +7,6 @@
     <OutputPath>bin</OutputPath>
 
     <WasmAppDir>$(MSBuildProjectDirectory)\bin\$(Configuration)\AppBundle\</WasmAppDir>
-    <WasmMainJSPath>main.js</WasmMainJSPath>
     <EnableDefaultItems>false</EnableDefaultItems>
 
     <!-- Important - deltas don't support trimming! -->

src/mono/sample/wasi/Directory.Build.targets

@@ -18,4 +18,4 @@
   </Target>
 
   <Import Project="$(RepositoryEngineeringDir)testing\wasi-provisioning.targets" />
-</Project>
+</Project>

src/mono/sample/wasm/DefaultBrowserSample.targets

@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
     <WasmCopyAppZipToHelixTestDir Condition="'$(ArchiveTests)' == 'true'">true</WasmCopyAppZipToHelixTestDir>
-    <WasmMainJSPath>main.js</WasmMainJSPath>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>embedded</DebugType>
     <!-- note that enabling debugger disables interp optimizations -->

src/mono/sample/wasm/Directory.Build.targets

@@ -34,26 +34,30 @@
       bin/$(Configuration)/AppBundle/dotnet.wasm;
       bin/$(Configuration)/AppBundle/$(_WasmMainJSFileName);
       ">
-    <Error Condition="'$(WasmMainJSPath)' == ''" Text="%24(WasmMainJSPath) property needs to be set" />
     <PropertyGroup>
       <_ScriptExt Condition="'$(OS)' == 'Windows_NT'">.cmd</_ScriptExt>
       <_ScriptExt Condition="'$(OS)' != 'Windows_NT'">.sh</_ScriptExt>
       <_Dotnet>$(RepoRoot)dotnet$(_ScriptExt)</_Dotnet>
       <_AOTFlag Condition="'$(RunAOTCompilation)' != ''">/p:RunAOTCompilation=$(RunAOTCompilation)</_AOTFlag>
-      <_WasmMainJSFileName>$([System.IO.Path]::GetFileName('$(WasmMainJSPath)'))</_WasmMainJSFileName>
       <_SampleProject Condition="'$(_SampleProject)' == ''">$(MSBuildProjectFile)</_SampleProject>
       <_SampleAssembly Condition="'$(_SampleAssembly)' == ''">$(TargetFileName)</_SampleAssembly>
       <BuildAdditionalArgs Condition="'$(MonoDiagnosticsMock)' != ''">$(BuildAdditionalArgs) /p:MonoDiagnosticsMock=$(MonoDiagnosticsMock) </BuildAdditionalArgs>
     </PropertyGroup>
     <Exec Command="$(_Dotnet) publish -bl /p:Configuration=$(Configuration) /p:TargetArchitecture=wasm /p:TargetOS=browser $(_AOTFlag) $(_SampleProject) $(BuildAdditionalArgs)" />
   </Target>
-  <Target Name="RunSampleWithV8" DependsOnTargets="BuildSampleInTree">
+  <Target Name="_ComputeMainJSPath">
+    <Error Condition="'$(WasmMainJSPath)' == ''" Text="%24(WasmMainJSPath) property needs to be set" />
+    <PropertyGroup>
+      <_WasmMainJSFileName>$([System.IO.Path]::GetFileName('$(WasmMainJSPath)'))</_WasmMainJSFileName>
+    </PropertyGroup>
+  </Target>
+  <Target Name="RunSampleWithV8" DependsOnTargets="BuildSampleInTree;_ComputeMainJSPath">
     <Exec WorkingDirectory="bin/$(Configuration)/AppBundle" Command="v8 --expose_wasm $(_WasmMainJSFileName) -- $(DOTNET_MONO_LOG_LEVEL) --run $(_SampleAssembly) $(Args)" IgnoreExitCode="true" />
   </Target>
-  <Target Name="RunSampleWithNode" DependsOnTargets="BuildSampleInTree">
+  <Target Name="RunSampleWithNode" DependsOnTargets="BuildSampleInTree;_ComputeMainJSPath">
     <Exec WorkingDirectory="bin/$(Configuration)/AppBundle" Command="node --expose_wasm $(_WasmMainJSFileName) -- $(DOTNET_MONO_LOG_LEVEL) --run $(_SampleAssembly) $(Args)" IgnoreExitCode="true" />
   </Target>
-  <Target Name="DebugSampleWithNode" DependsOnTargets="BuildSampleInTree">
+  <Target Name="DebugSampleWithNode" DependsOnTargets="BuildSampleInTree;_ComputeMainJSPath">
     <Exec WorkingDirectory="bin/$(Configuration)/AppBundle" Command="node --expose_wasm $(_WasmMainJSFileName) -- $(DOTNET_MONO_LOG_LEVEL) --run $(_SampleAssembly) $(Args) --inspect=9222" IgnoreExitCode="true" />
   </Target>
   <Target Name="CheckServe">

src/mono/sample/wasm/browser-advanced/Wasm.Advanced.Sample.csproj

@@ -11,6 +11,7 @@
     <WasmProfilers>browser;</WasmProfilers>
   </PropertyGroup>
   <ItemGroup>
+    <WasmExtraFilesToDeploy Include="main.js" />
     <!-- add export GL object from Module -->
     <EmccExportedRuntimeMethod Include="GL" />
     <NativeFileReference Include="fibonacci.c" />

src/mono/sample/wasm/browser-bench/Wasm.Browser.Bench.Sample.csproj

@@ -3,7 +3,6 @@
     <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
     <!-- don't need to run this on helix -->
     <WasmCopyAppZipToHelixTestDir>false</WasmCopyAppZipToHelixTestDir>
-    <WasmMainJSPath>main.js</WasmMainJSPath>
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <EnableAggressiveTrimming Condition="'$(EnableAOTAndTrimming)' != ''">$(EnableAOTAndTrimming)</EnableAggressiveTrimming>
@@ -13,6 +12,7 @@
 
   <ItemGroup>
     <WasmExtraFilesToDeploy Include="index.html" />
+    <WasmExtraFilesToDeploy Include="main.js" />
     <WasmExtraFilesToDeploy Include="appstart-frame.html" />
     <WasmExtraFilesToDeploy Include="frame-main.js" />
     <WasmExtraFilesToDeploy Include="style.css" />

src/mono/sample/wasm/browser-nextjs/Wasm.Browser.NextJs.Sample.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <WasmCopyAppZipToHelixTestDir>false</WasmCopyAppZipToHelixTestDir>
-    <WasmMainJSPath>package.json</WasmMainJSPath>
     <WasmAppDir>public</WasmAppDir>
   </PropertyGroup>
 

src/mono/sample/wasm/browser-profile/Wasm.BrowserProfile.Sample.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <WasmCopyAppZipToHelixTestDir Condition="'$(ArchiveTests)' == 'true'">true</WasmCopyAppZipToHelixTestDir>
-    <WasmMainJSPath>main.js</WasmMainJSPath>
     <WasmProfilers>aot;</WasmProfilers>
     <WasmBuildNative>true</WasmBuildNative>
     <WasmNativeStrip>false</WasmNativeStrip>
   </PropertyGroup>
 
   <ItemGroup>
     <WasmExtraFilesToDeploy Include="index.html" />
+    <WasmExtraFilesToDeploy Include="main.js" />
   </ItemGroup>
 
   <Target Name="RunSample" DependsOnTargets="RunSampleWithBrowser" />

src/mono/sample/wasm/browser-threads/Wasm.Browser.Threads.Sample.csproj

@@ -4,6 +4,10 @@
     <WasmEnableThreads>true</WasmEnableThreads>
   </PropertyGroup>
 
+  <ItemGroup>
+    <WasmExtraFilesToDeploy Include="main.js" />
+  </ItemGroup>
+
   <!-- set the condition to false and you will get a CA1416 error about the call to Thread.Start from a browser-wasm project -->
   <ItemGroup Condition="true">
     <!-- TODO: some .props file that automates this.  Unfortunately just adding a ProjectReference to Microsoft.NET.WebAssembly.Threading.proj doesn't work - it ends up bundling the ref assemblies into the publish directory and breaking the app. -->

src/mono/sample/wasm/browser-webpack/Wasm.Browser.WebPack.Sample.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <WasmCopyAppZipToHelixTestDir>false</WasmCopyAppZipToHelixTestDir>
-    <WasmMainJSPath>main.js</WasmMainJSPath>
   </PropertyGroup>
 
   <ItemGroup>
     <WasmExtraFilesToDeploy Include="index.html" />
+    <WasmExtraFilesToDeploy Include="main.js" />
   </ItemGroup>
 
 

src/mono/sample/wasm/browser/Wasm.Browser.Sample.csproj

@@ -1,3 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\DefaultBrowserSample.targets" />
+  <ItemGroup>
+    <WasmExtraFilesToDeploy Include="main.js" />
+  </ItemGroup>
 </Project>

src/mono/sample/wasm/console-node-ts/Wasm.Console.Node.TS.Sample.csproj

@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <WasmCopyAppZipToHelixTestDir>false</WasmCopyAppZipToHelixTestDir>
-    <!-- Workaround before https://github.com/dotnet/runtime/issues/63465 is solved. -->
-    <WasmMainJSPath>tsconfig.json</WasmMainJSPath>
   </PropertyGroup>
 
   <!-- 

src/mono/sample/wasm/console-node/Wasm.Console.Node.Sample.csproj

@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <WasmExtraFilesToDeploy Include="main.mjs" />
     <WasmExtraFilesToDeploy Include="package.json" />
   </ItemGroup>
 

src/mono/sample/wasm/console-v8/Wasm.Console.V8.Sample.csproj

@@ -8,6 +8,9 @@
     <RunScriptCommand>$(ExecXHarnessCmd) wasm test --app=. --engine=V8 --engine-arg=--stack-trace-limit=1000 --engine-arg=--module --js-file=main.mjs --output-directory=$(XHarnessOutput) -- --run $(MSBuildProjectName).dll</RunScriptCommand>
   </PropertyGroup>
 
+  <ItemGroup>
+    <WasmExtraFilesToDeploy Include="main.mjs" />
+  </ItemGroup>
 
   <Target Name="RunSample" DependsOnTargets="RunSampleWithV8" />
 </Project>

src/mono/sample/wasm/simple-raytracer/RayTracer.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <WasmMainJSPath>main.js</WasmMainJSPath>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>preview</LangVersion>

src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs

@@ -343,6 +343,9 @@ protected static BuildArgs ExpandBuildArgs(BuildArgs buildArgs, string extraProp
                 extraProperties += "<WasmEnableWebcil>true</WasmEnableWebcil>\n";
             }
 
+            extraItems += "<WasmExtraFilesToDeploy Include='test-main.js' />";
+            extraItems += "<WasmExtraFilesToDeploy Include='index.html' />";
+
             string projectContents = projectTemplate
                                         .Replace("##EXTRA_PROPERTIES##", extraProperties)
                                         .Replace("##EXTRA_ITEMS##", extraItems)
@@ -378,6 +381,8 @@ protected static BuildArgs ExpandBuildArgs(BuildArgs buildArgs, string extraProp
                 File.Copy(Path.Combine(AppContext.BaseDirectory,
                                         options.TargetFramework == "net8.0" ? "test-main.js" : "data/test-main-7.0.js"),
                             Path.Combine(_projectDir, "test-main.js"));
+
+                File.WriteAllText(Path.Combine(_projectDir!, "index.html"), @"<html><body><script type=""module"" src=""test-main.js""></script></body></html>");
             }
             else if (_projectDir is null)
             {
@@ -431,7 +436,8 @@ protected static BuildArgs ExpandBuildArgs(BuildArgs buildArgs, string extraProp
                                          options.TargetFramework ?? DefaultTargetFramework,
                                          options.HasIcudt,
                                          options.DotnetWasmFromRuntimePack ?? !buildArgs.AOT,
-                                         UseWebcil);
+                                         UseWebcil,
+                                         options.IsBrowserProject);
                 }
 
                 if (options.UseCache)
@@ -499,7 +505,15 @@ public string CreateWasmTemplateProject(string id, string template = "wasmbrowse
                 extraProperties += "<RunAnalyzers>true</RunAnalyzers>";
             if (UseWebcil)
                 extraProperties += "<WasmEnableWebcil>true</WasmEnableWebcil>";
-            AddItemsPropertiesToProject(projectfile, extraProperties);
+
+            // TODO: Can be removed after updated templates propagate in.
+            string extraItems = string.Empty;
+            if (template == "wasmbrowser")
+                extraItems += "<WasmExtraFilesToDeploy Include=\"main.js\" />";
+            else
+                extraItems += "<WasmExtraFilesToDeploy Include=\"main.mjs\" />";
+
+            AddItemsPropertiesToProject(projectfile, extraProperties, extraItems);
 
             return projectfile;
         }
@@ -635,17 +649,22 @@ protected static void AssertBasicAppBundle(string bundleDir,
                                                    string targetFramework,
                                                    bool hasIcudt = true,
                                                    bool dotnetWasmFromRuntimePack = true,
-                                                   bool useWebcil = true)
+                                                   bool useWebcil = true,
+                                                   bool isBrowserProject = true)
         {
-            AssertFilesExist(bundleDir, new []
+            var filesToExist = new List<string>()
             {
-                "index.html",
                 mainJS,
                 "dotnet.timezones.blat",
                 "dotnet.wasm",
                 "mono-config.json",
                 "dotnet.js"
-            });
+            };
+
+            if (isBrowserProject)
+                filesToExist.Add("index.html");
+
+            AssertFilesExist(bundleDir, filesToExist);
 
             AssertFilesExist(bundleDir, new[] { "run-v8.sh" }, expectToExist: hasV8Script);
             AssertFilesExist(bundleDir, new[] { "icudt.dat" }, expectToExist: hasIcudt);
@@ -693,7 +712,7 @@ protected static void AssertDotNetJsSymbols(string bundleDir, bool fromRuntimePa
         protected static void AssertFilesDontExist(string dir, string[] filenames, string? label = null)
             => AssertFilesExist(dir, filenames, label, expectToExist: false);
 
-        protected static void AssertFilesExist(string dir, string[] filenames, string? label = null, bool expectToExist=true)
+        protected static void AssertFilesExist(string dir, IEnumerable<string> filenames, string? label = null, bool expectToExist=true)
         {
             string prefix = label != null ? $"{label}: " : string.Empty;
             if (!Directory.Exists(dir))
@@ -1120,6 +1139,7 @@ public record BuildProjectOptions
         string? Label                     = null,
         string? TargetFramework           = null,
         string? MainJS                    = null,
+        bool    IsBrowserProject          = true,
         IDictionary<string, string>? ExtraBuildEnvironmentVariables = null
     );
 

src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs

@@ -148,7 +148,8 @@ public void ConsoleBuildThenPublish(string config)
                         HasV8Script: false,
                         MainJS: "main.mjs",
                         Publish: false,
-                        TargetFramework: BuildTestBase.DefaultTargetFramework
+                        TargetFramework: BuildTestBase.DefaultTargetFramework,
+                        IsBrowserProject: false
                         ));
 
             AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: true, targetFramework: DefaultTargetFramework);
@@ -174,7 +175,8 @@ public void ConsoleBuildThenPublish(string config)
                             MainJS: "main.mjs",
                             Publish: true,
                             TargetFramework: BuildTestBase.DefaultTargetFramework,
-                            UseCache: false));
+                            UseCache: false,
+                            IsBrowserProject: false));
 
             AssertDotNetJsSymbols(Path.Combine(GetBinDir(config), "AppBundle"), fromRuntimePack: !expectRelinking, targetFramework: DefaultTargetFramework);
         }
@@ -216,7 +218,8 @@ private void ConsoleBuildAndRun(string config, bool relinking, string extraNewAr
                             HasV8Script: false,
                             MainJS: "main.mjs",
                             Publish: false,
-                            TargetFramework: expectedTFM
+                            TargetFramework: expectedTFM,
+                            IsBrowserProject: false
                             ));
 
             AssertDotNetJsSymbols(Path.Combine(GetBinDir(config, expectedTFM), "AppBundle"), fromRuntimePack: !relinking, targetFramework: expectedTFM);
@@ -388,7 +391,8 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking)
                             MainJS: "main.mjs",
                             Publish: true,
                             TargetFramework: BuildTestBase.DefaultTargetFramework,
-                            UseCache: false));
+                            UseCache: false,
+                            IsBrowserProject: false));
 
             if (!aot)
             {

src/mono/wasm/build/README.md

@@ -90,7 +90,6 @@ The various task inputs correspond to properties as:
 
   AppDir                            : $(WasmAppDir)
   MainAssembly                      : $(WasmMainAssemblyPath)
-  MainJS                            : $(WasmMainJSPath)
   InvariantGlobalization            : $(WasmInvariantGlobalization)
   SatelliteAssemblies               : @(WasmSatelliteAssemblies)
   FilesToIncludeInFileSystem        : @(WasmFilesToIncludeInFileSystem)

src/mono/wasm/build/WasmApp.targets

@@ -5,11 +5,10 @@
 
   <!--
       Required public items/properties:
-      - $(WasmMainJSPath)
-
       - $(EMSDK_PATH)      - points to the emscripten sdk location.
 
       Public properties (optional):
+      - $(WasmMainJSPath)    - Main JavaScript for execution on V8/node
       - $(WasmAppDir)        - AppBundle dir (Defaults to `$(OutputPath)\$(Configuration)\AppBundle`)
       - $(WasmMainAssemblyFileName)- Defaults to $(TargetFileName)
       - $(WasmBuildNative)   - Whenever to build the native executable. Defaults to false.
@@ -342,11 +341,10 @@
   </Target>
 
   <Target Name="_WasmGenerateAppBundle"
-          Inputs="@(_WasmAssembliesInternal);$(WasmMainJSPath);$(WasmIcuDataFileName);@(WasmNativeAsset)"
+          Inputs="@(_WasmAssembliesInternal);$(WasmIcuDataFileName);@(WasmNativeAsset)"
           Outputs="$(WasmAppDir)\.stamp"
           Condition="'$(WasmGenerateAppBundle)' == 'true'"
           DependsOnTargets="_WasmGenerateRuntimeConfig;_GetWasmGenerateAppBundleDependencies">
-    <Error Condition="'$(WasmMainJSPath)' == ''" Text="%24(WasmMainJSPath) property needs to be set" />
 
     <PropertyGroup>
       <_WasmAppIncludeThreadsWorker Condition="'$(WasmEnableThreads)' == 'true' or '$(WasmEnablePerfTracing)' == 'true'">true</_WasmAppIncludeThreadsWorker>
@@ -357,8 +355,6 @@
     <RemoveDir Directories="$(WasmAppDir)" />
     <WasmAppBuilder
       AppDir="$(WasmAppDir)"
-      MainJS="$(WasmMainJSPath)"
-      MainHTMLPath="$(WasmMainHTMLPath)"
       Assemblies="@(_WasmAssembliesInternal)"
       MainAssemblyName="$(WasmMainAssemblyFileName)"
       HostConfigs="@(HostConfig)"
@@ -389,6 +385,8 @@
   </Target>
 
   <Target Name="_GenerateRunV8Script">
+    <Error Condition="'$(WasmMainJSPath)' == ''" Text="%24(WasmMainJSPath) property needs to be set" />
+
     <PropertyGroup>
       <WasmRunV8ScriptPath Condition="'$(WasmRunV8ScriptPath)' == ''">$(WasmAppDir)run-v8.sh</WasmRunV8ScriptPath>
       <_WasmMainJSFileName>$([System.IO.Path]::GetFileName('$(WasmMainJSPath)'))</_WasmMainJSFileName>

src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj

@@ -57,7 +57,6 @@
     <PropertyGroup>
       <EnableDefaultWasmAssembliesToBundle>false</EnableDefaultWasmAssembliesToBundle>
       <WasmAppDir>$(AppDir)</WasmAppDir>
-      <WasmMainJSPath>debugger-main.js</WasmMainJSPath>
       <!-- -1 enabled debugging and disables debug logging. -->
       <WasmDebugLevel Condition="'$(WasmDebugLevel)'==''">-1</WasmDebugLevel>
       <WasmResolveAssembliesBeforeBuild>true</WasmResolveAssembliesBeforeBuild>
@@ -78,6 +77,7 @@
       <!-- Assemblies only dynamically loaded -->
       <WasmFilesToIncludeInFileSystem Include="$(OutDir)\%(_AssemblyForDynamicLoading.Identity).dll" />
 
+      <WasmExtraFilesToDeploy Include="debugger-main.js" />
       <WasmExtraFilesToDeploy Include="$(OutDir)\%(_AssemblyForDynamicLoading.Identity).*" />
       <WasmExtraFilesToDeploy Include="$(OutDir)\lazy-debugger-test-embedded.*" />
       <WasmExtraFilesToDeploy Include="@(ReferenceCopyLocalPaths)" />