[browser] Separate hybrid globalization JS code to es6 module #101543

ilonatommy · 2024-04-25T13:16:53Z

Contributes to #98483.

separate hybrid globalization JS code into a separate module
add the module if HybridGlobalization=true

dotnet.runtime.js without this PR: 202k
dotnet.runtime.js with this PR: 191k

maraf · 2024-04-25T15:38:07Z

When solved, is there a good way to read MsBuild's value and attach/remove module in the runtime? The ideal solution should avoid creating a new runtime flavor.

Sure. We will update GenerateWasmBootJson (and WasmAppBuilder for the time being) to either include the module or not, and update the loading in TS

src/mono/browser/runtime/hybrid-globalization/module-exports.ts

…module for ST runtime.

…o object"

ilonatommy · 2024-05-14T17:24:35Z

Blazor-connected failures in WBT require changes to https://github.com/ilonatommy/aspnetcore/blob/3e168fe85e2330621ed12d9c9524c80e0f743dc6/src/Components/dotnet-runtime-js/dotnet.d.ts#L176 (adding jsModuleGlobalization).

Wasm.Build.Tests.Blazor.IcuTests.HybridWithInvariant(config: "Debug", invariant: False) [FAIL]
      Could not find dotnet.globalization.js in bundle directory: C:\helix\work\workitem\e\wbt artifacts\blz_hybrid_Debug_4lfnum1h_dzk\bin\Debug\net9.0\wwwroot\_framework. Actual files on disk: dotnet.js, dotnet.js.map, dotnet.native.js, dotnet.native.wasm, dotnet.runtime.js, dotnet.runtime.js.map
      Stack Trace:
        /_/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs(176,0): at Wasm.Build.Tests.ProjectProviderBase.AssertDotNetFilesSet(IReadOnlySet`1 expected, IReadOnlyDictionary`2 superSet, IReadOnlyDictionary`2 actualReadOnly, Boolean expectFingerprintOnDotnetJs, String bundleDir)
        /_/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs(158,0): at Wasm.Build.Tests.ProjectProviderBase.FindAndAssertDotnetFiles(String binFrameworkDir, Boolean expectFingerprintOnDotnetJs, IReadOnlyDictionary`2 superSet, IReadOnlySet`1 expected)
        /_/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs(78,0): at Wasm.Build.Tests.ProjectProviderBase.FindAndAssertDotnetFiles(AssertBundleOptionsBase assertOptions)
        /_/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs(44,0): at Wasm.Build.Tests.ProjectProviderBase.AssertBasicBundle(AssertBundleOptionsBase assertOptions)
        /_/src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs(83,0): at Wasm.Build.Tests.WasmSdkBasedProjectProvider.AssertBundle(AssertWasmSdkBundleOptions assertOptions)
        /_/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmProjectProvider.cs(17,0): at Wasm.Build.Tests.BlazorWasmProjectProvider.AssertBundle(BlazorBuildOptions options)
        /_/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs(128,0): at Wasm.Build.Tests.BlazorWasmTestBase.AssertBundle(String buildOutput, BlazorBuildOptions blazorBuildOptions)
        /_/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs(67,0): at Wasm.Build.Tests.BlazorWasmTestBase.BlazorBuild(BlazorBuildOptions options, String[] extraArgs)
        /_/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuTests.cs(38,0): at Wasm.Build.Tests.Blazor.IcuTests.HybridWithInvariant(String config, Nullable`1 invariant)
        --- End of stack trace from previous location ---

Blocked by flow of dotnet/aspnetcore#55716 to runtime.

pavelsavara · 2024-05-14T18:16:20Z

Blazor-connected failures in WBT require changes to https://github.com/ilonatommy/aspnetcore/blob/3e168fe85e2330621ed12d9c9524c80e0f743dc6/src/Components/dotnet-runtime-js/dotnet.d.ts#L176 (adding jsModuleGlobalization).

I think that the blazor PR would not fix it because it's just type definition. The error is complaining about missing files. Likely flow of blazor with this change will fix it.

cc @maraf

maraf · 2024-05-14T19:45:01Z

Blazor-connected failures in WBT require changes to https://github.com/ilonatommy/aspnetcore/blob/3e168fe85e2330621ed12d9c9524c80e0f743dc6/src/Components/dotnet-runtime-js/dotnet.d.ts#L176 (adding jsModuleGlobalization).

Wasm.Build.Tests.Blazor.IcuTests.HybridWithInvariant(config: "Debug", invariant: False) [FAIL]
      Could not find dotnet.globalization.js in bundle directory: C:\helix\work\workitem\e\wbt artifacts\blz_hybrid_Debug_4lfnum1h_dzk\bin\Debug\net9.0\wwwroot\_framework. Actual files on disk: dotnet.js, dotnet.js.map, dotnet.native.js, dotnet.native.wasm, dotnet.runtime.js, dotnet.runtime.js.map
      Stack Trace:
        /_/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs(176,0): at Wasm.Build.Tests.ProjectProviderBase.AssertDotNetFilesSet(IReadOnlySet`1 expected, IReadOnlyDictionary`2 superSet, IReadOnlyDictionary`2 actualReadOnly, Boolean expectFingerprintOnDotnetJs, String bundleDir)
        /_/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs(158,0): at Wasm.Build.Tests.ProjectProviderBase.FindAndAssertDotnetFiles(String binFrameworkDir, Boolean expectFingerprintOnDotnetJs, IReadOnlyDictionary`2 superSet, IReadOnlySet`1 expected)
        /_/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs(78,0): at Wasm.Build.Tests.ProjectProviderBase.FindAndAssertDotnetFiles(AssertBundleOptionsBase assertOptions)
        /_/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs(44,0): at Wasm.Build.Tests.ProjectProviderBase.AssertBasicBundle(AssertBundleOptionsBase assertOptions)
        /_/src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs(83,0): at Wasm.Build.Tests.WasmSdkBasedProjectProvider.AssertBundle(AssertWasmSdkBundleOptions assertOptions)
        /_/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmProjectProvider.cs(17,0): at Wasm.Build.Tests.BlazorWasmProjectProvider.AssertBundle(BlazorBuildOptions options)
        /_/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs(128,0): at Wasm.Build.Tests.BlazorWasmTestBase.AssertBundle(String buildOutput, BlazorBuildOptions blazorBuildOptions)
        /_/src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs(67,0): at Wasm.Build.Tests.BlazorWasmTestBase.BlazorBuild(BlazorBuildOptions options, String[] extraArgs)
        /_/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuTests.cs(38,0): at Wasm.Build.Tests.Blazor.IcuTests.HybridWithInvariant(String config, Nullable`1 invariant)
        --- End of stack trace from previous location ---

Blocked by flow of dotnet/aspnetcore#55716 to runtime.

This is just build setup error, isn't it? The globalization.js file is not copied to the output folder. Either the SDK doesn't correctly work or the WBT check isn't cotrect. There shouldn't be anything needed on blazor side to make it work.

The dotnet.d.ts in aspnetcore repo is only important for their build of their typescript that interact with runtime API.

ilonatommy · 2024-05-15T09:21:46Z

This is just build setup error, isn't it? The globalization.js file is not copied to the output folder. Either the SDK doesn't correctly work or the WBT check isn't cotrect. There shouldn't be anything needed on blazor side to make it work.

The dotnet.d.ts in aspnetcore repo is only important for their build of their typescript that interact with runtime API.

WBT works correctly (non-Blazor IcuTests pass). You're right, it fails because WBT expects the globalization module to be in the bundle when HybridGlobalization == true. Not sure if we can rely on the changes to flow and the problem to "fix itself" as Pavel mentioned.
However, even if the file was copied, we have no entry in blazor.boot.json about jsModuleGlobalization (added by this PR) that is needed to initialize the module loading. Again, no idea how to check if this will get fixed automatically.

ilonatommy · 2024-05-15T15:21:59Z

/azp run runtime-wasm

azure-pipelines · 2024-05-15T15:22:21Z

Azure Pipelines successfully started running 1 pipeline(s).

src/mono/browser/runtime/es6/dotnet.es6.lib.js

src/mono/browser/runtime/hybrid-globalization/globalization-stubs.ts

src/mono/browser/runtime/hybrid-globalization/locales-common.ts

src/mono/browser/runtime/types/internal.ts

ilonatommy · 2024-05-16T11:57:58Z

/azp run runtime-wasm

azure-pipelines · 2024-05-16T11:58:10Z

Azure Pipelines successfully started running 1 pipeline(s).

ilonatommy · 2024-05-17T07:48:39Z

Firefox failures are #101617 (locally passes, it's only a CI problem), HybridGlobalization_AOT failures are: #102373 - fails on main as well.

…#101543) * dotnet.hybrid.js module creation when MT is off * Importing module * Remove globalization code from main module, create the globalization module for ST runtime. * Fix: `runtimeHelper` is not null if we cache it on module init. * Export functions used by hybrid globalization only when HG is on. * Do not try to call when methods are not initialized. * `mono_wasm_get_locale_info` is used also in non-HG mode, add it to the main module. * Check WBT for presence of globalization module if HG is switched on. * Fix MT globalization tests - NativeName is fixed there. * Globalization module is not expected to change on relink. * Fix blazor's assets.

dotnet.hybrid.js module creation when MT is off

0c17d0c

ilonatommy added arch-wasm WebAssembly architecture area-System.Globalization os-browser Browser variant of arch-wasm labels Apr 25, 2024

ilonatommy self-assigned this Apr 25, 2024

ilonatommy requested review from lewing and pavelsavara as code owners April 25, 2024 13:16

ilonatommy marked this pull request as draft April 25, 2024 13:20

Improvement but not fix.

2f8cbcc

ilonatommy commented Apr 25, 2024

View reviewed changes

src/mono/browser/runtime/hybrid-globalization/module-exports.ts Outdated Show resolved Hide resolved

More improvements, still failing.

e6dcc49

This was referenced Apr 25, 2024

clang crashing on osx #99150

Closed

[WASI][AOT] LLVM ERROR: out of memory #101533

Closed

ilonatommy added 5 commits April 26, 2024 12:38

Importing module

aafd997

Flip condition - load HG with ST only.

27ea4c4

Remove globalization code from main module, create the globalization …

192bef5

…module for ST runtime.

Missing change.

66c074d

Fix for blazor.boot.config ST/MT. Still errors in the runtime.

825c6ae

build-analysis bot mentioned this pull request Apr 26, 2024

[browser][debugger] Firefox EvaluateOnCallFrame2Tests #98086

Open

ilonatommy and others added 4 commits May 7, 2024 10:07

Fix: runtimeHelper is not null if we cache it on module init.

eb2c26d

Fix: segmentationRules throwing "Cannot convert undefined or null t…

8669727

…o object"

Change flag to HG.

07154e6

Merge branch 'main' into 98483-hg-modularization

40f292a

build-analysis bot mentioned this pull request May 7, 2024

slow macOS - "##[error]The job running on agent Azure Pipelines 9 ran longer than the maximum time of 60 minutes." dotnet/dnceng#1883

Open

3 tasks

ilonatommy added 5 commits May 13, 2024 07:48

Fix MT.

08df581

Merge branch 'main' into 98483-hg-modularization

faea49d

Cleanup.

f577ac3

Remove duplicates.

6bcad7d

Export functions used by hybrid globalization only when HG is on.

759803a

ilonatommy added 3 commits May 14, 2024 13:29

Fix.

64bb2ea

Fix hybrid change case.

586cc37

Globalization module is not expected to change on relink.

4051775

ilonatommy marked this pull request as ready for review May 14, 2024 14:51

ilonatommy requested review from maraf and akoeplinger as code owners May 14, 2024 14:51

ilonatommy mentioned this pull request May 14, 2024

[browser] Support separation hybrid globalization JS code to es6 module dotnet/aspnetcore#55716

Merged

build-analysis bot mentioned this pull request May 15, 2024

NativeAOT legs timing out in CI #102239

Closed

build-analysis bot mentioned this pull request May 15, 2024

WASM test failing with OOM #100111

Closed

ilonatommy added 2 commits May 15, 2024 12:54

Fix blazor's assets + remove duplicated asset entry.

265d39c

Merge remote-tracking branch 'origin/main' into 98483-hg-modularization

b1e7448

ilonatommy requested a review from pavelsavara May 15, 2024 15:22

This was referenced May 15, 2024

Cannot find 'arm64-v8a' device dotnet/dnceng#2284

Open

[browser][MT] mono_download_assets - RangeError: Start offset -1 is outside the bounds of the buffer #102196

Closed

ilonatommy mentioned this pull request May 16, 2024

[browser][MT][hybridglobalization] Run HybridGlobalization MT tests #102305

Closed

pavelsavara reviewed May 16, 2024

View reviewed changes

Feedback

96ab2f1

pavelsavara approved these changes May 16, 2024

View reviewed changes

ilonatommy merged commit 43b7b53 into dotnet:main May 17, 2024
163 of 173 checks passed

github-actions bot locked and limited conversation to collaborators Jun 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[browser] Separate hybrid globalization JS code to es6 module #101543

[browser] Separate hybrid globalization JS code to es6 module #101543

ilonatommy commented Apr 25, 2024 •

edited

Loading

maraf commented Apr 25, 2024 •

edited

Loading

ilonatommy commented May 14, 2024 •

edited

Loading

pavelsavara commented May 14, 2024

maraf commented May 14, 2024

ilonatommy commented May 15, 2024

ilonatommy commented May 15, 2024

azure-pipelines bot commented May 15, 2024

ilonatommy commented May 16, 2024

azure-pipelines bot commented May 16, 2024

ilonatommy commented May 17, 2024 •

edited

Loading

[browser] Separate hybrid globalization JS code to es6 module #101543

[browser] Separate hybrid globalization JS code to es6 module #101543

Conversation

ilonatommy commented Apr 25, 2024 • edited Loading

maraf commented Apr 25, 2024 • edited Loading

ilonatommy commented May 14, 2024 • edited Loading

pavelsavara commented May 14, 2024

maraf commented May 14, 2024

ilonatommy commented May 15, 2024

ilonatommy commented May 15, 2024

azure-pipelines bot commented May 15, 2024

ilonatommy commented May 16, 2024

azure-pipelines bot commented May 16, 2024

ilonatommy commented May 17, 2024 • edited Loading

ilonatommy commented Apr 25, 2024 •

edited

Loading

maraf commented Apr 25, 2024 •

edited

Loading

ilonatommy commented May 14, 2024 •

edited

Loading

ilonatommy commented May 17, 2024 •

edited

Loading