-
Notifications
You must be signed in to change notification settings - Fork 282
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(package-json): invalid webpack commit sha #506 #507
Merged
petermetz
merged 1 commit into
hyperledger-cacti:main
from
petermetz:fix/package-json/invalid-webpack-commit-sha-506
Jan 25, 2021
Merged
fix(package-json): invalid webpack commit sha #506 #507
petermetz
merged 1 commit into
hyperledger-cacti:main
from
petermetz:fix/package-json/invalid-webpack-commit-sha-506
Jan 25, 2021
Conversation
This file contains 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
This commit is necessary because of a rebase that happened on the fork where the webpack feature we need was implemented. The rebase changed the commit sha and therefore made that version of the code disappear too. To avoid this issue happening again in the future a dedicated branch was created on the fork which will not be touched by future rebases that are necessary for the pull request to be kept up to date with the main branch of webpack itself. The so called backup branch mentioned above is called cactus-webpack-ignore-require-calls-feature which you can see being specified in the package.json. Fixes hyperledger-cacti#506 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
petermetz
added
bug
Something isn't working
dependencies
Pull requests that update a dependency file
labels
Jan 21, 2021
petermetz
added a commit
to petermetz/cacti
that referenced
this pull request
Jan 21, 2021
…dger-cacti#449 The previous commit attempting to do the same thing somehow did not achieve the expected outcome meaning that there were still leftovers of other versions of axios. For reference: CVE-2020-28168 Fixes hyperledger-cacti#449 Depends on hyperledger-cacti#506 hyperledger-cacti#507 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
jonathan-m-hamilton
approved these changes
Jan 21, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
takeutak
approved these changes
Jan 25, 2021
petermetz
added a commit
to petermetz/cacti
that referenced
this pull request
Jan 26, 2021
…dger-cacti#449 The previous commit attempting to do the same thing somehow did not achieve the expected outcome meaning that there were still leftovers of other versions of axios. For reference: CVE-2020-28168 Fixes hyperledger-cacti#449 Depends on hyperledger-cacti#506 hyperledger-cacti#507 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
petermetz
added a commit
that referenced
this pull request
Jan 26, 2021
The previous commit attempting to do the same thing somehow did not achieve the expected outcome meaning that there were still leftovers of other versions of axios. For reference: CVE-2020-28168 Fixes #449 Depends on #506 #507 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
ghost
pushed a commit
to kikoncuo/cactus
that referenced
this pull request
Jan 29, 2021
…dger-cacti#449 The previous commit attempting to do the same thing somehow did not achieve the expected outcome meaning that there were still leftovers of other versions of axios. For reference: CVE-2020-28168 Fixes hyperledger-cacti#449 Depends on hyperledger-cacti#506 hyperledger-cacti#507 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
ghost
pushed a commit
to kikoncuo/cactus
that referenced
this pull request
Feb 4, 2021
…dger-cacti#449 The previous commit attempting to do the same thing somehow did not achieve the expected outcome meaning that there were still leftovers of other versions of axios. For reference: CVE-2020-28168 Fixes hyperledger-cacti#449 Depends on hyperledger-cacti#506 hyperledger-cacti#507 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com> Signed-off-by: Jordi Giron <jordi.giron.amezcua@accenture.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
This commit is necessary because of a rebase that
happened on the fork where the webpack feature we
need was implemented. The rebase changed the commit
sha and therefore made that version of the code
disappear too. To avoid this issue happening again
in the future a dedicated branch was created on the
fork which will not be touched by future rebases
that are necessary for the pull request to be kept
up to date with the main branch of webpack itself.
The so called backup branch mentioned above is called
cactus-webpack-ignore-require-calls-feature which
you can see being specified in the package.json.
Fixes #506
Signed-off-by: Peter Somogyvari peter.somogyvari@accenture.com