zap-extensions
zap-extensions copied to clipboard
zaproxy
webuipoc: UI implementation to reactWeb
Ready for review: did code cleanup, conflicts resolve and rebase.
Conflict resolved - Ready for review
It has conflicts. Though that doesn't prevent review, but it'll need to be addressed before merge.
It has conflicts. Though that doesn't prevent review, but it'll need to be addressed before merge.
Resolved them just now
The build is failing.
I am unable to understand the reason it's failing. npm i is working fine locally. Do you see any specific issue?
Its stating that npm ci run failed, but why is it even executing at first place? It's not defined in package.json file.
Probably a bad merge commit. You'd be better off rebasing and addressing conflicts.
The ci is to do a clean install: https://docs.npmjs.com/cli/v10/commands/npm-ci worth running that locally to make sure all is correct.
I get the same error when trying to build this as per the CI build: 'npm ci' can only install packages when your package.json and package-lock.json or npm-shrinkwrap.json are in sync. Please update your lock file with npm install before continuing.
We cant review this PR unless it builds ☹️
Seems to have a ton of unrelated commits again.
I'm struggling with rebase, can you tell me exact way or cmds to get this done
To provide commands to fix it I'll have to clone it later and try.
As for rebasing, the normal process is:
git fetch upstream
git rebase upstream/main
git push --force
It will take forever to resolve conflicts and rebase; what's the best practice here, should I rebase after every few commits?
If I know no one else has changed the code I'm working on then I just do a mixed reset, not sure if thats good practice or not..
There are so many conflicts :( I am trying to resolve in rebase for past 30 mins or so, any other solution I can try to fix this?
The build is failing due to changes in other add-ons ☹️
any idea how to get this done , I've tried npm i and npm ci
IMO the tree should look like more the Sites tree (or the example web UI, i.e. show path segments rather than the full URI). I guess it can be improved later.