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

fix(lockfiles): unstage yarn.lock instead of ignoring it #241

Merged
merged 1 commit into from
Aug 7, 2017

Conversation

luftywiranda13
Copy link
Owner

@luftywiranda13 luftywiranda13 commented Aug 7, 2017

PR Type

  • Bugfix
  • Feature
  • Code style update (whitespace, formatting, missing semicolons, etc.)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Documentation content changes
  • Other… Please describe:

Description

Based on facebook/create-react-app#2014 (comment). So in summary:

  • remove package-lock.json from .gitignore because we already set package-lock=false in .npmrc
  • but for yarn.lock I decided to always unstage it in pre-commit hook to prevent it to get merged in our repo.

How Has This Been Tested?

  1. Install deps with npm/yarn
  2. Try to commit
  3. No generated package-lock.json, pre-commit hook always unstage yarn.lock

Screenshots (if appropriate):

N/A

Does this PR introduce a breaking change?

  • Yes
  • No

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the contributing.md.

@luftywiranda13 luftywiranda13 changed the title chore(precommit): unstage yarn.lock instead of ignoring it fix(lockfiles): unstage yarn.lock instead of ignoring it Aug 7, 2017
@luftywiranda13 luftywiranda13 merged commit 5dce9fa into master Aug 7, 2017
@luftywiranda13 luftywiranda13 deleted the bug/lint-staged branch August 7, 2017 23:40
Hypnosphi referenced this pull request in JetBrains/create-react-kotlin-app Oct 8, 2017
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.

1 participant