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

Issue #905: Switch codebase to Monorepo #981

Merged
merged 43 commits into from
Nov 4, 2020
Merged

Issue #905: Switch codebase to Monorepo #981

merged 43 commits into from
Nov 4, 2020

Conversation

phaumer
Copy link
Member

@phaumer phaumer commented Aug 15, 2020

Proposed changes

Details and discussion in #905

Release Notes

  • Converted source code to monorepo using yarn and extracted extender's API to importable npm package.

Milestone:

Changelog:

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
  • npm run 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

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

@phaumer phaumer changed the title Switch codebase to Monorepo Issue #905: Switch codebase to Monorepo Aug 18, 2020
@zdmullen
Copy link
Contributor

zdmullen commented Aug 18, 2020

To be demoed Tuesday, August 25.

We will follow up with a discussion of the merge order. One idea is to merge this into a release (like 1.9.0) and immediately create a "fix" branch, for example 1.9.x, where we put the subsequent PRs.

JillieBeanSim and others added 5 commits August 19, 2020 16:27
Signed-off-by: Peter Haumer <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
@VitGottwald VitGottwald force-pushed the monorepo-switch branch 2 times, most recently from c76098f to 17c0233 Compare August 26, 2020 18:59
@VitGottwald
Copy link
Contributor

Due to several of commits that were left unsigned, I had to squash the this branch into a single commit and force push it. My apologies @phaumer, @JillieBeanSim, and others.

The commit before the squash was aa6615f as the PR history shows. The current commit is 17c0233. Anyone can verify that the contents of the files has not changed by running git diff aa6615f 17c0233.

@phaumer
Copy link
Member Author

phaumer commented Sep 1, 2020

@VitGottwald I don't think a force push into someone else's branch is a good practice. If you are signing with a gmail address what is the point anyway? You could have added something to the dco_signoffs folder.

@VitGottwald
Copy link
Contributor

Hi Peter, sorry for that. What is dco_signoffs folder?

@VitGottwald
Copy link
Contributor

After a discussion with Peter, I restored the branch (see the force push above). And I am going to add a record to the dco_signoffs folder.

@zFernand0 zFernand0 modified the milestone: 1.10 Release Oct 22, 2020
@jellypuno
Copy link
Contributor

jellypuno commented Oct 22, 2020

Here are some of the issues that I've found:

  • Profile used: z/OSMF Profile with SCS

This error message appeared during initialization:
image

Names for Allocate Like and Validation is not found:
image

image

image

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

zFernand0 commented Oct 22, 2020

9679017 should resolve missing messages/descriptions #981 (comment)

5af5bed is mostly to make GH happy as nothing really changed.
Huge thanks to @phaumer for resolving all merge conflicts ahead of time!

zFernand0 and others added 13 commits October 22, 2020 11:47
…-zowe into monorepo-switch

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

# Conflicts:
#	README.md
#	__mocks__/mockCreators/api.ts
#	__mocks__/mockCreators/jobs.ts
#	__mocks__/mockCreators/uss.ts
#	__tests__/__integration__/uss/ussNodeActions.integration.test.ts
#	__tests__/__unit__/abstract/TreeProvider.unit.test.ts
#	__tests__/__unit__/dataset/DatasetTree.unit.test.ts
#	__tests__/__unit__/uss/USSTree.unit.test.ts
#	__tests__/__unit__/uss/ZoweUSSNode.unit.test.ts
#	i18n/sample/package.i18n.json
#	i18n/sample/src/Profiles.i18n.json
#	i18n/sample/src/dataset/DatasetTree.i18n.json
#	i18n/sample/src/dataset/actions.i18n.json
#	i18n/sample/src/job/ZosJobsProvider.i18n.json
#	i18n/sample/src/uss/USSTree.i18n.json
#	package-lock.json
#	package.json
#	package.nls.json
#	packages/zowe-explorer-api/src/Profiles.ts
#	packages/zowe-explorer-api/src/ZoweExplorerZosmfApi.ts
#	packages/zowe-explorer/__mocks__/mockCreators/datasets.ts
#	packages/zowe-explorer/__tests__/__integration__/DatasetTree.integration.test.ts
#	packages/zowe-explorer/__tests__/__integration__/USSTree.integration.test.ts
#	packages/zowe-explorer/__tests__/__integration__/extension.integration.test.ts
#	packages/zowe-explorer/__tests__/__unit__/Profiles.unit.test.ts
#	packages/zowe-explorer/__tests__/__unit__/dataset/actions.unit.test.ts
#	packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts
#	packages/zowe-explorer/__tests__/__unit__/job/ZosJobsProvider.unit.test.ts
#	packages/zowe-explorer/__tests__/__unit__/job/ZoweJobNode.unit.test.ts
#	packages/zowe-explorer/__tests__/__unit__/job/actions.unit.test.ts
#	packages/zowe-explorer/__tests__/__unit__/shared/actions.unit.test.ts
#	packages/zowe-explorer/__tests__/__unit__/shared/utils.unit.test.ts
#	packages/zowe-explorer/__tests__/__unit__/uss/actions.unit.test.ts
#	packages/zowe-explorer/src/abstract/ZoweTreeProvider.ts
#	packages/zowe-explorer/src/command/MvsCommandHandler.ts
#	packages/zowe-explorer/src/dataset/ZoweDatasetNode.ts
#	packages/zowe-explorer/src/dataset/actions.ts
#	packages/zowe-explorer/src/extension.ts
#	packages/zowe-explorer/src/globals.ts
#	packages/zowe-explorer/src/job/ZosJobsProvider.ts
#	packages/zowe-explorer/src/job/ZoweJobNode.ts
#	packages/zowe-explorer/src/job/actions.ts
#	packages/zowe-explorer/src/shared/actions.ts
#	packages/zowe-explorer/src/uss/ZoweUSSNode.ts
#	packages/zowe-explorer/src/uss/actions.ts
#	src/dataset/DatasetTree.ts
#	src/dataset/dsNodeActions.ts
#	src/dataset/utils.ts
#	src/uss/USSTree.ts
Signed-off-by: Peter Haumer <[email protected]>
Remove it from workflow.
Trigger workflow only on changes to the zowe-explorer package

Signed-off-by: zFernand0 <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
Signed-off-by: zFernand0 <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
Signed-off-by: Peter Haumer <[email protected]>
…-zowe into monorepo-switch

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

# Conflicts:
#	package-lock.json
#	package.json
zFernand0
zFernand0 previously approved these changes Nov 4, 2020
Copy link
Member

@zFernand0 zFernand0 left a comment

Choose a reason for hiding this comment

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

LGTM!

@zFernand0
Copy link
Member

Unit tests are passing, but the workflow fails to save the results.
We can address this in a subsequent PR 😋

@zFernand0 zFernand0 marked this pull request as ready for review November 4, 2020 14:19
@zFernand0 zFernand0 merged commit ad0c762 into master Nov 4, 2020
@zFernand0 zFernand0 deleted the monorepo-switch branch November 4, 2020 18:54
zFernand0 pushed a commit that referenced this pull request Nov 19, 2020
* Created packages. Fixed building.

Signed-off-by: Peter Haumer <[email protected]>

* VSIX patch script. Fixed launches.

Signed-off-by: Peter Haumer <[email protected]>

* Added vscode-nls to webpack

Signed-off-by: Peter Haumer <[email protected]>

* Simplified webpack config

* Move eslint plugin devDependency

* Switch github actions to yarn

* Switch theia github action to yarn

* Use yarn for installs and script running

* Extracted explorer-api and refactored

Signed-off-by: Peter Haumer <[email protected]>

* Added prettier

Signed-off-by: Peter Haumer <[email protected]>

* Renamed pub folder to dist

Signed-off-by: Peter Haumer <[email protected]>

* add/update scripts for pre/posttest:integration

Signed-off-by: Billie Simmons <[email protected]>

* Added ftp package files

Signed-off-by: Peter Haumer <[email protected]>

* Enabling webpack for FTP

Signed-off-by: Peter Haumer <[email protected]>

* Fixed eslint for ftp

Signed-off-by: Peter Haumer <[email protected]>

* Added FTP launch

Signed-off-by: Peter Haumer <[email protected]>

* Add DCO signoff for past commits

* Pretty 120 zowe explorer

Signed-off-by: Peter Haumer <[email protected]>

* Pretty 120 api

Signed-off-by: Peter Haumer <[email protected]>

* Pretty 120 ftp

Signed-off-by: Peter Haumer <[email protected]>

* Prettier top level

Signed-off-by: Peter Haumer <[email protected]>

* Merging 1.10 master branch

Signed-off-by: Peter Haumer <[email protected]>

* Prettier 120/4

Signed-off-by: Peter Haumer <[email protected]>

* Removed test profile

Signed-off-by: Peter Haumer <[email protected]>

* Updated gitignore

Signed-off-by: Peter Haumer <[email protected]>

* Add missing messages

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

* yarn package fixes

Signed-off-by: Peter Haumer <[email protected]>

* Move testProfileData.ts file creation to a script in zowe-explorer.
Remove it from workflow.
Trigger workflow only on changes to the zowe-explorer package

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

* Quick fix for uploading test results

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

* yarn and vsce devDeps

Signed-off-by: Peter Haumer <[email protected]>

* Profiles split

Signed-off-by: Peter Haumer <[email protected]>

* add yarnrc file

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

* Fixed imports

Signed-off-by: Peter Haumer <[email protected]>

* String updates

Signed-off-by: Peter Haumer <[email protected]>

* Moved another UI method

Signed-off-by: Peter Haumer <[email protected]>

* Update filepaths for monorepo

Signed-off-by: Lauren Li <[email protected]>

Co-authored-by: Vit Gottwald <[email protected]>
Co-authored-by: Billie Simmons <[email protected]>
Co-authored-by: zFernand0 <[email protected]>
Co-authored-by: Lauren Li <[email protected]>

Signed-off-by: zFernand0 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants