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

Merge shopify-cli-extensions into cli #237

Merged
merged 348 commits into from
Aug 8, 2022
Merged

Merge shopify-cli-extensions into cli #237

merged 348 commits into from
Aug 8, 2022

Conversation

dmhenry
Copy link
Contributor

@dmhenry dmhenry commented Aug 3, 2022

This is a dry run merging the shopify-cli-extensions repo into cli. All of shopify-cli-extensions lives in an eponymous top-level directory. We may decide on another structure, but the merge does seem to have worked. It is based on the steps detailed here. History does appear to be intact.

WHY are these changes introduced?

As cli and shopify-cli-extensions are tightly coupled and CLI 2.0 is deprecated, the decision was made to merge these two repos for ease of release.

WHAT is this pull request doing?

This branch was created by:

  • Cloning a new copy of cli
  • Adding a remote for shopify-cli-extensions
  • Creating a rewrite branch based on shopify-cli-extensions/main
  • Rebasing the rewrite branch on cli/main
  • Pushing the rewrite branch upstream (to draft this PR)

@dmhenry
Copy link
Contributor Author

dmhenry commented Aug 3, 2022

The CLA failures are due to @t6d & @rmshopify needing to sign the Contributor License Agreement.

@isaacroldan
Copy link
Contributor

This looks good.
I think for the moment is OK to have it all in a root folder, but we'd want to reorganize everything under packages, maybe packages/extensions/ or a new extension-packages 🤔
probably extract the node-packages from the current folder and treat the go code as a new package.

@dmhenry
Copy link
Contributor Author

dmhenry commented Aug 4, 2022

@isaacroldan That makes sense. I don't mind going through the process again trying with that directory structure. With respect to the Contributor License Agreement, is that something we can disable for this effort? The two individuals tagged no longer work for Shopify, but I'm not sure if this is something we're allowed to sidestep, or quite how to do it.

@isaacroldan isaacroldan marked this pull request as ready for review August 4, 2022 13:58
@isaacroldan isaacroldan marked this pull request as draft August 4, 2022 13:58
@isaacroldan
Copy link
Contributor

About the directory structure, that's something I need to discuss with the team. Won't happen this week but since it's going to implicate quite some changes, maybe it can be done after merge.

About the CLA, I think we can force-merge, but i'll ask about it (there aren't are many options anyway)

@dmhenry dmhenry force-pushed the rewrite branch 3 times, most recently from c4ceb90 to d6bd2c4 Compare August 8, 2022 14:35
vividviolet and others added 15 commits August 8, 2022 11:32
…e compiled successfully

- allows subscribers to be notified when assets by updating the asset urls when sending
the update message
- subscribers can use the updated urls instead of maintaining their own logic to increase a reload param
- added vanilla-extract
- configured using vite instead of webpack
- test setup
- updated typings
…e) and standalone

- tests not working but is running
- still missing liting
- app not working but is running
- fixed unit tests
- Move metafields config to the top level
- Allow merging shopifile.yml config
- Remove unused code for skipping empty directories
- Fix bug in create where it was unnecessarily merging template data for irrelevant template folders
Previously we had a MergeTemplates task that merge data for the global template (package.json.tpl and shopifile.yml.tpl) as well as merge data for a specific extension template. The global files are at the root so this task was also merging data for irrelevant templates.  The fix is to break this into 2 different tasks, 1 to merge global templates and another to merge templates specific to the extension
Add simple logic to retain comments in yaml files

- currently comments are simply appended to the end of the YAML file.
This needs to be improved so that the comments are preserved in original place
* Custom error message generation on rebuild
* Remove file system watching in favor of consuming the build processes
  log messages
* Support for grouping multiple lines of log output into a single
  message
Expose surface so consumers can select relevant extensions

Ensure app data keys are in lower camel case to match websocket response
@dmhenry dmhenry marked this pull request as ready for review August 8, 2022 15:43
@dmhenry dmhenry changed the title DRAFT: Merge shopify-cli-extensions into cli Merge shopify-cli-extensions into cli Aug 8, 2022
@dmhenry dmhenry closed this Aug 8, 2022
@dmhenry dmhenry reopened this Aug 8, 2022
Copy link
Member

@vividviolet vividviolet left a comment

Choose a reason for hiding this comment

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

This looks good to me - excellent work!

@dmhenry dmhenry merged commit 073ce92 into main Aug 8, 2022
@shopify-shipit shopify-shipit bot temporarily deployed to production August 9, 2022 11:15 Inactive
@amcaplan amcaplan deleted the rewrite branch August 9, 2022 19:41
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.