Skip to content

update proteinpaint-client to 2.170.22#1685

Closed
siosonel wants to merge 5 commits into
developfrom
sjpp-client-2.170.22
Closed

update proteinpaint-client to 2.170.22#1685
siosonel wants to merge 5 commits into
developfrom
sjpp-client-2.170.22

Conversation

@siosonel
Copy link
Copy Markdown
Collaborator

@siosonel siosonel commented Mar 4, 2026

Description

Fixes

Also, use node 20.11.0 in proteinpaint/dev.sh script.

Checklist

  • Added proper unit tests
  • Left proper TODO messages for any remaining tasks
  • Scanned for web accessibility with aXe, and mitigated or documented
    flagged issues

Screenshots/Screen Recordings (if Appropriate)

@siosonel
Copy link
Copy Markdown
Collaborator Author

siosonel commented Mar 4, 2026

@craigrbarnes @philtom-ctds I can't seem to get rid of the "peer": true changes to package-lock.json. Please let me know if that is an issue and/or if you'd like me to open a new PR with cleaner commit history. I've tried different approaches, including downloading a package-lock.json copy from the develop branch and re-running npm run dev to regenerate the package-lock while using node 20.11.0 and npm 10.2.4 .

EDIT: There was a clean package-lock diff for PR # 1673. I forked the sjpp-client-2.170.13 branch not from develop branch, but from sjpp-client-2.170.12 branch. Maybe I should do something similar in this PR?

@philtom-ctds
Copy link
Copy Markdown
Contributor

@craigrbarnes @philtom-ctds I can't seem to get rid of the "peer": true changes to package-lock.json. Please let me know if that is an issue and/or if you'd like me to open a new PR with cleaner commit history. I've tried different approaches, including downloading a package-lock.json copy from the develop branch and re-running npm run dev to regenerate the package-lock while using node 20.11.0 and npm 10.2.4 .

EDIT: There was a clean package-lock diff for PR # 1673. I forked the sjpp-client-2.170.13 branch not from develop branch, but from sjpp-client-2.170.12 branch. Maybe I should do something similar in this PR?

(i clicked the wrong button and accidentally close this pr. i reopened it.)

the peer property itself is not erroneous. the issue was with npm 11 changing how it resolved and identified peer dependencies. there were multiple bugs in npm 11 that caused dependency resolution issue. for example
npm/cli#8645
and
npm/cli#8535 (comment)

i checked out this branch and ran npm i with npm v10. there were no changes to the lock file. the peer changes in this pr should be bringing the lock file back in sync with npm v10. (i believe the last pr used npm v11.)

Copy link
Copy Markdown
Contributor

@craigrbarnes craigrbarnes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the additions to dev.sh or provide justification for it's use.

# ./packages/portal-proto/src/features/proteinpaint/dev.sh
# assumes that the proteinpaint folder is a sibling dir of gff

source ~/.bash_profile
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be added? Anyone who runs this will have their nvm environment changed

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can change to not use source and only use the nvm binary. This proterinpaint/dev.sh script is only for developers who have a local proteinpaint repo, it's not connected to the gff npm run dev. It's both a convenience script and better way to not forget PP dev setup requirements within GFF.

export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion

Comment thread package.json
"homepage": "https://github.com/NCI-GDC/gdc-frontend-framework#readme",
"dependencies": {
"@reactour/tour": "^2.9.0",
"@sjcrh/proteinpaint-client": "^2.170.22",
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is correct. We don't need to add this in root level package.json. It's already inside portal-proto's package.json where it is being used.

cc. @craigrbarnes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I agree

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix

@siosonel
Copy link
Copy Markdown
Collaborator Author

siosonel commented Mar 4, 2026

@craigrbarnes @philtom-ctds I'll close this PR to generate a cleaner update. We'll also revert the fix for the race condition and implement a simpler fix.

@siosonel siosonel closed this Mar 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants