Expose _framework/hybridwebview.js to the html #29794
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mattleibow
requested review from
PureWeen and
jfversluis
and removed request for
a team
|
Azure Pipelines successfully started running 3 pipeline(s). |
Now that the _framework/hybridwebview.js file is embedded, we can make it available for consumption by the app. It is not required to use this URL, but it is now available. This being embedded makes things easier to update and keep in sync with the implementation of the HybridWebView.
mattleibow
force-pushed
the
dev/hybridwebview-framework-js
branch
from
6efcfe6 to
ac09178
Compare
rmarinho
approved these changes
Jun 4, 2025
Member
Author
|
/backport to release/10.0.1xx-preview5 |
Contributor
|
Started backporting to release/10.0.1xx-preview5: https://github.com/dotnet/maui/actions/runs/15444004043 |
Member
Author
|
/backport to main |
Contributor
|
Started backporting to main: https://github.com/dotnet/maui/actions/runs/15500522890 |
Contributor
|
@mattleibow backporting to "main" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Expose _framework/hybridwebview.js
Using index info to reconstruct a base tree...
M src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
M src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
M src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/index.html
M src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs
M src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
M src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs
M src/Core/src/Platform/Android/MauiHybridWebViewClient.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Core/src/Platform/Android/MauiHybridWebViewClient.cs
Auto-merging src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs
CONFLICT (content): Merge conflict in src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs
Auto-merging src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
Auto-merging src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs
Auto-merging src/Controls/tests/DeviceTests/Resources/Raw/HybridTestRoot/index.html
Auto-merging src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
Auto-merging src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Expose _framework/hybridwebview.js
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note
Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!
Description of Change
Now that the _framework/hybridwebview.js file is embedded, we can make it available for consumption by the app. It is not required to use this URL, but it is now available.
This being embedded makes things easier to update and keep in sync with the implementation of the HybridWebView.
Issues Fixed
Fixes #29788