Merged
Conversation
ghost
added
the
javiercn
force-pushed
the
javiercn/blazor-update-npm-dependencies
branch
from
cf5c289 to
a215d17
Compare
It is not worth having this test since it creates issues as it tries to hit Azure AD when run.
Co-authored-by: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
…pack.config.js Co-authored-by: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
…pack.config.js Co-authored-by: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
javiercn
force-pushed
the
javiercn/blazor-update-npm-dependencies
branch
from
c9d4def to
93a3b43
Compare
Member
Author
|
🆙📅 |
TanayParikh
approved these changes
Sep 7, 2021
Contributor
TanayParikh
left a comment
TanayParikh
left a comment
There was a problem hiding this comment.
LGTM, just some minor items
Contributor
|
Just tried out this branch locally, and it's seems to have fixed a lot of the random issues I was seeing with the |
Member
Author
|
/backport to release/6.0-rc1 |
Contributor
|
Started backporting to release/6.0-rc1: https://github.com/dotnet/aspnetcore/actions/runs/1212823832 |
Contributor
|
@javiercn backporting to release/6.0-rc1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update packages
Applying: Update codebase for new typescript errors
Applying: Update dependencies
Applying: update WebAssembly.Authentication npm packages
Applying: Update webassembly
Applying: Integrate with the build
Applying: Update build process for MSAL
Applying: Update msal-browser version
Applying: Partially fix errors
Applying: Update and fix test project
Applying: Update npm dependencies
Applying: Remove unnecessary dependency
Applying: Update JS files
warning: Cannot merge binary files: src/Components/Web.JS/dist/Release/blazor.webview.js (HEAD vs. Update JS files)
warning: Cannot merge binary files: src/Components/Web.JS/dist/Release/blazor.server.js (HEAD vs. Update JS files)
Using index info to reconstruct a base tree...
M src/Components/Web.JS/dist/Release/blazor.server.js
M src/Components/Web.JS/dist/Release/blazor.webview.js
Falling back to patching base and 3-way merge...
Auto-merging src/Components/Web.JS/dist/Release/blazor.webview.js
CONFLICT (content): Merge conflict in src/Components/Web.JS/dist/Release/blazor.webview.js
Auto-merging src/Components/Web.JS/dist/Release/blazor.server.js
CONFLICT (content): Merge conflict in src/Components/Web.JS/dist/Release/blazor.server.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0013 Update JS files
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Member
Author
|
/backport to release/6.0 |
Contributor
|
Started backporting to release/6.0: https://github.com/dotnet/aspnetcore/actions/runs/1212836726 |
Contributor
|
@javiercn backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Update packages
Applying: Update codebase for new typescript errors
Applying: Update dependencies
Applying: update WebAssembly.Authentication npm packages
Applying: Update webassembly
Applying: Integrate with the build
Applying: Update build process for MSAL
Applying: Update msal-browser version
Applying: Partially fix errors
Applying: Update and fix test project
Applying: Update npm dependencies
Applying: Remove unnecessary dependency
Applying: Update JS files
warning: Cannot merge binary files: src/Components/Web.JS/dist/Release/blazor.webview.js (HEAD vs. Update JS files)
warning: Cannot merge binary files: src/Components/Web.JS/dist/Release/blazor.server.js (HEAD vs. Update JS files)
Using index info to reconstruct a base tree...
M src/Components/Web.JS/dist/Release/blazor.server.js
M src/Components/Web.JS/dist/Release/blazor.webview.js
Falling back to patching base and 3-way merge...
Auto-merging src/Components/Web.JS/dist/Release/blazor.webview.js
CONFLICT (content): Merge conflict in src/Components/Web.JS/dist/Release/blazor.webview.js
Auto-merging src/Components/Web.JS/dist/Release/blazor.server.js
CONFLICT (content): Merge conflict in src/Components/Web.JS/dist/Release/blazor.server.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0013 Update JS files
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
javiercn
added a commit
that referenced
this pull request
Sep 8, 2021
* Updates npm dependencies to their latest versions. * Standardizes build process for our JS dependencies on webpack 5 with babel, etc. * Updates dependencies for the auth packages to their latest versions. * Fixes test assets so that they can be run locally.
wtgodbe
pushed a commit
that referenced
this pull request
Sep 8, 2021
* Updates npm dependencies to their latest versions. * Standardizes build process for our JS dependencies on webpack 5 with babel, etc. * Updates dependencies for the auth packages to their latest versions. * Fixes test assets so that they can be run locally.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Updates our NPM dependencies and upgrades the auth projects to use webpack5 inline with the rest of the Blazor projects