From 9d1d499b459355ee57094c7893107366806d6121 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Thu, 19 Sep 2024 10:29:57 +0000 Subject: [PATCH 1/3] Fix custom icu fingerprinting. --- src/mono/browser/runtime/loader/icu.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mono/browser/runtime/loader/icu.ts b/src/mono/browser/runtime/loader/icu.ts index d5ad0dd3b8bbde..5202847e61cce6 100644 --- a/src/mono/browser/runtime/loader/icu.ts +++ b/src/mono/browser/runtime/loader/icu.ts @@ -66,8 +66,9 @@ export function getIcuResourceName (config: MonoConfig): string | null { let icuFile = null; if (config.globalizationMode === GlobalizationMode.Custom) { + // custom ICU file is saved in the resources with fingerprinting and does not require mapping if (icuFiles.length === 1) { - icuFile = icuFiles[0]; + return icuFile; } } else if (config.globalizationMode === GlobalizationMode.Hybrid) { icuFile = "icudt_hybrid.dat"; From 0cea0dafd01edd4d8ec1694c20b3e78ebf2c1255 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Thu, 19 Sep 2024 10:46:39 +0000 Subject: [PATCH 2/3] fix --- src/mono/browser/runtime/loader/icu.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/browser/runtime/loader/icu.ts b/src/mono/browser/runtime/loader/icu.ts index 5202847e61cce6..fe7c745cb0bbdd 100644 --- a/src/mono/browser/runtime/loader/icu.ts +++ b/src/mono/browser/runtime/loader/icu.ts @@ -68,7 +68,7 @@ export function getIcuResourceName (config: MonoConfig): string | null { if (config.globalizationMode === GlobalizationMode.Custom) { // custom ICU file is saved in the resources with fingerprinting and does not require mapping if (icuFiles.length === 1) { - return icuFile; + return icuFiles[0]; } } else if (config.globalizationMode === GlobalizationMode.Hybrid) { icuFile = "icudt_hybrid.dat"; From dfb0a0d6966f8387c0280b8e00bf7dcf92e74275 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:00:16 +0200 Subject: [PATCH 3/3] Update src/mono/browser/runtime/loader/icu.ts Co-authored-by: Pavel Savara --- src/mono/browser/runtime/loader/icu.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/browser/runtime/loader/icu.ts b/src/mono/browser/runtime/loader/icu.ts index fe7c745cb0bbdd..20b6a4578f0a3d 100644 --- a/src/mono/browser/runtime/loader/icu.ts +++ b/src/mono/browser/runtime/loader/icu.ts @@ -67,7 +67,7 @@ export function getIcuResourceName (config: MonoConfig): string | null { let icuFile = null; if (config.globalizationMode === GlobalizationMode.Custom) { // custom ICU file is saved in the resources with fingerprinting and does not require mapping - if (icuFiles.length === 1) { + if (icuFiles.length >= 1) { return icuFiles[0]; } } else if (config.globalizationMode === GlobalizationMode.Hybrid) {