Use boot config as default and explicitly swtich back with withMonoCo…

…nfig
dotnet · Apr 30, 2023 · 0521238 · 0521238
1 parent 28ea09f
commit 0521238
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 9 deletions.
diff --git a/src/mono/sample/wasm/browser-advanced/main.js b/src/mono/sample/wasm/browser-advanced/main.js
@@ -12,6 +12,7 @@ let testError = true;
 
 try {
     const { runtimeBuildInfo, setModuleImports, getAssemblyExports, runMain, getConfig, Module } = await dotnet
+        .withMonoConfig()
         .withElementOnExit()
         // 'withModuleConfig' is internal lower level API 
         // here we show how emscripten could be further configured

diff --git a/src/mono/sample/wasm/browser-bench/frame-main.js b/src/mono/sample/wasm/browser-bench/frame-main.js
@@ -31,6 +31,7 @@ try {
     }
 
     const runtime = await dotnet
+        .withMonoConfig()
         .withModuleConfig({
             printErr: () => undefined,
             print: () => undefined,

diff --git a/src/mono/sample/wasm/browser-bench/main.js b/src/mono/sample/wasm/browser-bench/main.js
@@ -180,6 +180,7 @@ try {
     globalThis.mainApp.PageShow = globalThis.mainApp.pageShow.bind(globalThis.mainApp);
 
     const runtime = await dotnet
+        .withMonoConfig()
         .withRuntimeOptions(["--jiterpreter-stats-enabled"])
         .withElementOnExit()
         .withExitCodeLogging()

diff --git a/src/mono/sample/wasm/browser-eventpipe/main.js b/src/mono/sample/wasm/browser-eventpipe/main.js
@@ -51,6 +51,7 @@ async function runTest({ StartAsyncWork, StopWork, GetIterationsDone }) {
 
 async function main() {
     const { INTERNAL, MONO, Module, getAssemblyExports, getConfig } = await dotnet
+        .withMonoConfig()
         .withElementOnExit()
         .withExitCodeLogging()
         .withDiagnosticTracing(false)

diff --git a/src/mono/sample/wasm/browser-nextjs/components/deepThought.js b/src/mono/sample/wasm/browser-nextjs/components/deepThought.js
@@ -8,8 +8,9 @@ let dotnetRuntimePromise = undefined;
 
 async function createRuntime() {
     try {
-        return dotnet.
-            withModuleConfig({
+        return dotnet
+            .withMonoConfig()
+            .withModuleConfig({
                 locateFile: (path, prefix) => {
                     return '/' + path;
                 }

diff --git a/src/mono/sample/wasm/browser-profile/main.js b/src/mono/sample/wasm/browser-profile/main.js
@@ -20,6 +20,7 @@ function saveProfile(aotProfileData) {
 }
 try {
     const { INTERNAL, getAssemblyExports: getAssemblyExports } = await dotnet
+        .withMonoConfig()
         .withElementOnExit()
         .withExitCodeLogging()
         .withConfig({

diff --git a/src/mono/sample/wasm/browser-threads-minimal/main.js b/src/mono/sample/wasm/browser-threads-minimal/main.js
@@ -8,6 +8,7 @@ const assemblyName = "Wasm.Browser.Threads.Minimal.Sample.dll";
 
 try {
     const { setModuleImports, getAssemblyExports, runMain } = await dotnet
+        .withMonoConfig()    
         .withEnvironmentVariable("MONO_LOG_LEVEL", "debug")
         .withElementOnExit()
         .withExitCodeLogging()

diff --git a/src/mono/sample/wasm/browser-threads/main.js b/src/mono/sample/wasm/browser-threads/main.js
@@ -53,6 +53,7 @@ function onInputValueChanged(exports, inputElement) {
 try {
     const inputElement = document.getElementById("inputN");
     const { setModuleImports, getAssemblyExports, runMain } = await dotnet
+        .withMonoConfig()    
         .withEnvironmentVariable("MONO_LOG_LEVEL", "debug")
         .withElementOnExit()
         .withExitCodeLogging()

diff --git a/src/mono/sample/wasm/browser-webpack/app.js b/src/mono/sample/wasm/browser-webpack/app.js
@@ -6,7 +6,7 @@ import _ from 'underscore'
 
 async function dotnetMeaning() {
     try {
-        const { getAssemblyExports } = await dotnet.create();
+        const { getAssemblyExports } = await dotnet.withMonoConfig().create();
 
         const exports = await getAssemblyExports("Wasm.Browser.WebPack.Sample");
         const meaningFunction = exports.Sample.Test.Main;

diff --git a/src/mono/sample/wasm/browser/main.js b/src/mono/sample/wasm/browser/main.js
@@ -9,6 +9,7 @@ function displayMeaning(meaning) {
 
 try {
     const { setModuleImports } = await dotnet
+        .withMonoConfig()
         .withElementOnExit()
         .create();
 

diff --git a/src/mono/sample/wasm/console-node-ts/main.ts b/src/mono/sample/wasm/console-node-ts/main.ts
@@ -2,4 +2,4 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 import { dotnet } from '@microsoft/dotnet-runtime'
-await dotnet.run();
+await dotnet.withMonoConfig().run();
diff --git a/src/mono/sample/wasm/console-node/main.mjs b/src/mono/sample/wasm/console-node/main.mjs
@@ -4,6 +4,7 @@
 import { dotnet } from './dotnet.js'
 
 dotnet
+    .withMonoConfig()
     .withDiagnosticTracing(false)
     .withApplicationArguments("dotnet", "is", "great!")
     .run()
diff --git a/src/mono/sample/wasm/console-v8/main.mjs b/src/mono/sample/wasm/console-v8/main.mjs
@@ -4,6 +4,7 @@
 import { dotnet } from './dotnet.js'
 
 dotnet
+    .withMonoConfig()
     .withDiagnosticTracing(false)
     .withApplicationArguments(...arguments)
     .run()
diff --git a/src/mono/sample/wasm/node-webpack/app.js b/src/mono/sample/wasm/node-webpack/app.js
@@ -3,7 +3,7 @@ import { color } from 'console-log-colors'
 
 async function dotnetMeaning() {
     try {
-        const { getAssemblyExports } = await dotnet.create();
+        const { getAssemblyExports } = await dotnet.withMonoConfig().create();
         const exports = await getAssemblyExports("Wasm.Node.WebPack.Sample");
         const meaningFunction = exports.Sample.Test.Main;
         return meaningFunction();

diff --git a/src/mono/sample/wasm/simple-raytracer/main.js b/src/mono/sample/wasm/simple-raytracer/main.js
@@ -13,7 +13,7 @@ function renderCanvas(rgbaView) {
     canvas.style = "";
 }
 
-const { setModuleImports, getAssemblyExports, getConfig } = await dotnet.create();
+const { setModuleImports, getAssemblyExports, getConfig } = await dotnet.withMonoConfig().create();
 setModuleImports("main.js", { renderCanvas });
 const config = getConfig();
 const exports = await getAssemblyExports(config.mainAssemblyName);

diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-main.js b/src/mono/wasm/debugger/tests/debugger-test/debugger-main.js
@@ -7,6 +7,7 @@ import { dotnet, exit } from './dotnet.js'
 
 try {
     const runtime = await dotnet
+        .withMonoConfig()
         .withEnvironmentVariable("DOTNET_MODIFIABLE_ASSEMBLIES", "debug")
         // For custom logging patch the functions below
         //.withDiagnosticTracing(true)

diff --git a/src/mono/wasm/runtime/run-outer.ts b/src/mono/wasm/runtime/run-outer.ts
@@ -30,6 +30,7 @@ export class HostBuilder implements DotnetHostBuilder {
     private instance?: RuntimeAPI;
     private applicationArguments?: string[];
     private virtualWorkingDirectory?: string;
+    private useMonoConfig = false;
 
     // internal
     withModuleConfig(moduleConfig: DotnetModuleConfig): DotnetHostBuilder {
@@ -290,9 +291,18 @@ export class HostBuilder implements DotnetHostBuilder {
         return this.withConfigSrc("blazor.boot.json");
     }
 
+    withMonoConfig(): DotnetHostBuilder {
+        this.useMonoConfig = true;
+        return this;
+    }
+
     async create(): Promise<RuntimeAPI> {
         try {
             if (!this.instance) {
+                if (!this.useMonoConfig) {
+                    this.withStartupOptions({});
+                }
+
                 if (ENVIRONMENT_IS_WEB && (module.config! as MonoConfigInternal).forwardConsoleLogsToWS && typeof globalThis.WebSocket != "undefined") {
                     setup_proxy_console("main", globalThis.console, globalThis.location.origin);
                 }

diff --git a/src/mono/wasm/templates/templates/browser/wwwroot/main.js b/src/mono/wasm/templates/templates/browser/wwwroot/main.js
@@ -4,7 +4,6 @@
 import { dotnet } from './_framework/dotnet.js'
 
 const { setModuleImports, getAssemblyExports, getConfig } = await dotnet
-    .withStartupOptions({})
     .withDiagnosticTracing(false)
     .withApplicationArgumentsFromQuery()
     .create();

diff --git a/src/mono/wasm/templates/templates/console/main.mjs b/src/mono/wasm/templates/templates/console/main.mjs
@@ -4,6 +4,7 @@
 import { dotnet } from './dotnet.js'
 
 const { setModuleImports, getAssemblyExports, getConfig } = await dotnet
+    .withMonoConfg() // This will go away in later previews/RC
     .withDiagnosticTracing(false)
     .create();
 

diff --git a/src/mono/wasm/test-main.js b/src/mono/wasm/test-main.js
@@ -253,6 +253,7 @@ globalThis.App = App; // Necessary as System.Runtime.InteropServices.JavaScript.
 
 function configureRuntime(dotnet, runArgs) {
     dotnet
+        .withMonoOptions()
         .withVirtualWorkingDirectory(runArgs.workingDirectory)
         .withEnvironmentVariables(runArgs.environmentVariables)
         .withDiagnosticTracing(runArgs.diagnosticTracing)

diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/main.js b/src/tests/FunctionalTests/WebAssembly/Browser/HotReload/main.js
@@ -11,6 +11,7 @@ function wasm_exit(exit_code) {
 
 try {
     const { getAssemblyExports } = await dotnet
+        .withMonoConfig()
         .withElementOnExit()
         .withEnvironmentVariable("DOTNET_MODIFIABLE_ASSEMBLIES", "debug")
         .create();

diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/main.js b/src/tests/FunctionalTests/WebAssembly/Browser/RuntimeConfig/main.js
@@ -10,7 +10,7 @@ function wasm_exit(exit_code) {
 }
 
 try {
-    const { getAssemblyExports, INTERNAL } = await dotnet.withRuntimeOptions(["--jiterpreter-stats-enabled"]).create();
+    const { getAssemblyExports, INTERNAL } = await dotnet.withMonoConfig().withRuntimeOptions(["--jiterpreter-stats-enabled"]).create();
     const exports = await getAssemblyExports("WebAssembly.Browser.RuntimeConfig.Test.dll");
     const testMeaning = exports.Sample.Test.TestMeaning;
     const ret = testMeaning();

diff --git a/src/tests/FunctionalTests/WebAssembly/Browser/StartupHook/main.js b/src/tests/FunctionalTests/WebAssembly/Browser/StartupHook/main.js
@@ -10,7 +10,7 @@ function wasm_exit(exit_code) {
 }
 
 try {
-    const { getAssemblyExports } = await dotnet.create();
+    const { getAssemblyExports } = await dotnet.withMonoConfig().create();
     const exports = await getAssemblyExports("WebAssembly.Browser.StartupHook.Test.dll");
     const testMeaning = exports.Sample.Test.TestMeaning;
     const ret = testMeaning();