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

chore: add fast-website to the yarn and lerna workspaces #3081

Merged
merged 2 commits into from
May 8, 2020

Conversation

radium-v
Copy link
Collaborator

@radium-v radium-v commented May 7, 2020

Description

This PR adds the new fast-website and its devDependencies to the Yarn and Lerna workspaces.

Motivation & context

Since we're temporarily using ultra-new additions from within the repo, we want to make sure our node_modules are pointing to the local neighbor instead of downloading the package independently.

Issue type checklist

  • Chore: A change that does not impact distributed packages.
  • Bug fix: A change that fixes an issue, link to the issue above.
  • New feature: A change that adds functionality.

Is this a breaking change?

  • This change causes current functionality to break.

Process & policy checklist

  • I have added tests for my changes.
  • I have tested my changes.
  • I have updated the project documentation to reflect my changes.
  • I have read the CONTRIBUTING documentation and followed the standards for this project.

@radium-v
Copy link
Collaborator Author

radium-v commented May 7, 2020

I wasn't sure if commits from master should be rebased or done with a merge commit. I can force-push to redo it if a merge is desired over a rebase.

@EisenbergEffect
Copy link
Contributor

I think we're going to squash merge these in the end, so it may not matter as much. Anyone have opinions on this? /cc @nicholasrice @chrisdholt

@janechu
Copy link
Collaborator

janechu commented May 7, 2020

I've been maintaining my own feature branches and just rebasing master and force pushing them every once in a while to keep the history clean, then when the feature branch gets merged i temporarily enable a rebase with master to preserve commit history. This gets a little murkier when multiple contributors are on a branch so I'm not necessarily advocating for that here. However we shouldn't have these commits in the PR, it makes reviewing difficult. I do think that preserving commit history would be nice.

@chrisdholt
Copy link
Member

I agree with Jane's comments here. I think we'll run into trouble if with additional commits here. If we don't care too much about preserving history on the way back to master, we can leave it as is and squash, but I think it's valuable to have folks' commit history maintained.

@radium-v
Copy link
Collaborator Author

radium-v commented May 7, 2020

Thanks @janechu @EisenbergEffect and @chrisdholt for the input. I'll remove the commits from this PR and we can discuss update strategy elsewhere.

@radium-v radium-v force-pushed the users/jokreitl/lerna-yarn-workspace branch from eaf1df2 to 71abdfc Compare May 7, 2020 23:27
@chrisdholt chrisdholt force-pushed the feature/fast-frame branch from 4792832 to 9a8b3c5 Compare May 7, 2020 23:41
@radium-v radium-v force-pushed the users/jokreitl/lerna-yarn-workspace branch from 71abdfc to ff19b85 Compare May 7, 2020 23:51
@radium-v radium-v merged commit ff41106 into feature/fast-frame May 8, 2020
@radium-v radium-v deleted the users/jokreitl/lerna-yarn-workspace branch May 8, 2020 16:26
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.

5 participants