From ca8bb044135007437bed741a0620dc13d345f039 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 8 Dec 2023 17:28:06 +0100 Subject: [PATCH 1/2] fix https://github.com/dotnet/runtime/issues/95491 --- src/mono/sample/wasm/browser-advanced/main.js | 1 + src/mono/wasm/runtime/loader/assets.ts | 2 -- src/mono/wasm/runtime/loader/config.ts | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mono/sample/wasm/browser-advanced/main.js b/src/mono/sample/wasm/browser-advanced/main.js index b5c414322fefd0..a09eaa9176f028 100644 --- a/src/mono/sample/wasm/browser-advanced/main.js +++ b/src/mono/sample/wasm/browser-advanced/main.js @@ -32,6 +32,7 @@ try { // It is preferred to use specific 'with***' methods instead in all other cases. .withConfig({ startupMemoryCache: true, + maxParallelDownloads: 1, resources: { modulesAfterConfigLoaded: { "advanced-sample.lib.module.js": "" diff --git a/src/mono/wasm/runtime/loader/assets.ts b/src/mono/wasm/runtime/loader/assets.ts index be7c0e4592938b..02e05b1f8a9622 100644 --- a/src/mono/wasm/runtime/loader/assets.ts +++ b/src/mono/wasm/runtime/loader/assets.ts @@ -146,8 +146,6 @@ export function resolve_single_asset_path(behavior: SingleAssetBehaviors): Asset export async function mono_download_assets(): Promise { mono_log_debug("mono_download_assets"); - loaderHelpers.maxParallelDownloads = loaderHelpers.config.maxParallelDownloads || loaderHelpers.maxParallelDownloads; - loaderHelpers.enableDownloadRetry = loaderHelpers.config.enableDownloadRetry || loaderHelpers.enableDownloadRetry; try { const promises_of_assets: Promise[] = []; diff --git a/src/mono/wasm/runtime/loader/config.ts b/src/mono/wasm/runtime/loader/config.ts index 097f6d1ca2cb15..d9bcccd4ed933c 100644 --- a/src/mono/wasm/runtime/loader/config.ts +++ b/src/mono/wasm/runtime/loader/config.ts @@ -212,6 +212,9 @@ export function normalizeConfig() { runtimeHelpers.enablePerfMeasure = !!config.browserProfilerOptions && globalThis.performance && typeof globalThis.performance.measure === "function"; + + loaderHelpers.maxParallelDownloads = config.maxParallelDownloads || loaderHelpers.maxParallelDownloads; + loaderHelpers.enableDownloadRetry = config.enableDownloadRetry !== undefined ? config.enableDownloadRetry : loaderHelpers.enableDownloadRetry; } let configLoaded = false; From ae0679df030d84357162b788a130191e9e4dd46d Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 15 Dec 2023 21:24:03 -0600 Subject: [PATCH 2/2] Remove change to sample --- src/mono/sample/wasm/browser-advanced/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mono/sample/wasm/browser-advanced/main.js b/src/mono/sample/wasm/browser-advanced/main.js index a09eaa9176f028..b5c414322fefd0 100644 --- a/src/mono/sample/wasm/browser-advanced/main.js +++ b/src/mono/sample/wasm/browser-advanced/main.js @@ -32,7 +32,6 @@ try { // It is preferred to use specific 'with***' methods instead in all other cases. .withConfig({ startupMemoryCache: true, - maxParallelDownloads: 1, resources: { modulesAfterConfigLoaded: { "advanced-sample.lib.module.js": ""