Skip to content
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

Port/2533+2692 #2713

Merged
merged 10 commits into from
Feb 14, 2024
Merged

Port/2533+2692 #2713

merged 10 commits into from
Feb 14, 2024

Conversation

zFernand0
Copy link
Member

@zFernand0 zFernand0 commented Feb 12, 2024

Proposed changes

Migrate the following PRs:

Release Notes

Milestone: vNext

Changelog: N/A

Types of changes

What types of changes does your code introduce to Zowe Explorer?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Updates to Documentation or Tests (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This checklist will be used as reference for both the contributor and the reviewer

  • I have read the CONTRIBUTOR GUIDANCE wiki
  • PR title follows Conventional Commits Guidelines
  • PR Description is included
  • gif or screenshot is included if visual changes are made
  • yarn workspace vscode-extension-for-zowe vscode:prepublish has been executed
  • All checks have passed (DCO, Jenkins and Code Coverage)
  • I have added unit test and it is passing
  • I have added integration test and it is passing
  • There is coverage for the code that I have added
  • I have tested it manually and there are no regressions found
  • I have added necessary documentation (if appropriate)
  • Any PR dependencies have been merged and published (if appropriate)

Further comments

I few things I noticed...

  • I'm unable to run the pnpm --filter vscode-extension-for-zowe vscode:prepublish script.
    • Failed with bad export type for 'tree_sitter_tsx_external_scanner_create': undefined (likely due to not locking down the version of @vscode/l10n-dev
  • Should we lock down the above dependency
> npx @vscode/l10n-dev export --o ./l10n ./src

Need to install the following packages:
@vscode/[email protected]
Ok to proceed? (y) 

UPDATE:

  • The above issue happened because I was on NodeJS v20
  • The npx @vscode/l10n-dev ... was changed to the PNPM equivalent: pnpm dlx @vscode/l10n-dev ... 😋
  • There were lots of new changes because of the following:
    Before After
    toBeCalled toHaveBeenCalled
    toBeCalledTimes toHaveBeenCalledTimes

@zFernand0
Copy link
Member Author

zFernand0 commented Feb 12, 2024

Waiting on the following PR to fix the Audit check:

Signed-off-by: zFernand0 <[email protected]>
Copy link

codecov bot commented Feb 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (95b63c1) 93.23% compared to head (2d8fdf5) 93.24%.

❗ Current head 2d8fdf5 differs from pull request most recent head fb61f05. Consider uploading reports for the commit fb61f05 to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##             next    #2713   +/-   ##
=======================================
  Coverage   93.23%   93.24%           
=======================================
  Files         109      109           
  Lines       10295    10297    +2     
  Branches     2211     2223   +12     
=======================================
+ Hits         9599     9601    +2     
  Misses        695      695           
  Partials        1        1           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zFernand0
Copy link
Member Author

Will update this PR once the vNext version of the @zowe/cli is updated to address the Audit check 😋

@JillieBeanSim
Copy link
Contributor

@zFernand0 I was able to run pnpm --filter vscode-extension-for-zowe vscode:prepublish on this branch and do see some changes in the bundle file
Screenshot 2024-02-13 at 10 52 52 AM

JillieBeanSim
JillieBeanSim previously approved these changes Feb 14, 2024
Copy link
Contributor

@JillieBeanSim JillieBeanSim left a comment

Choose a reason for hiding this comment

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

LGTM! thanks @zFernand0

@JillieBeanSim
Copy link
Contributor

Should we update the lerna in this PR to kick off release of audit fixes?

Signed-off-by: zFernand0 <[email protected]>
@zFernand0
Copy link
Member Author

Should we update the lerna in this PR to kick off release of audit fixes?

Done! Although I'm a bit confused as to why we should update it even for the next branch 😋

Copy link

sonarcloud bot commented Feb 14, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
7.6% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

@JillieBeanSim
Copy link
Contributor

Should we update the lerna in this PR to kick off release of audit fixes?

Done! Although I'm a bit confused as to why we should update it even for the next branch 😋

Thanks. IDK, know there was mention that next would publish with all merged PRs but last was on the 7th and I know we have been merging since 7th.
https://github.com/zowe/vscode-extension-for-zowe/releases/tag/v3.0.0-next.202402071248

Copy link
Member

@traeok traeok left a comment

Choose a reason for hiding this comment

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

LGTM, thanks @zFernand0

@zFernand0 zFernand0 merged commit 000998e into next Feb 14, 2024
11 of 12 checks passed
@zFernand0 zFernand0 deleted the port/2533+2692 branch February 14, 2024 22:04
Copy link

Release succeeded for the next branch. 🎉

The following packages have been published:

Powered by Octorelease 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

3 participants