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

Update package-lock.json #5525

Merged
merged 1 commit into from
Mar 9, 2018
Merged

Update package-lock.json #5525

merged 1 commit into from
Mar 9, 2018

Conversation

ntwb
Copy link
Member

@ntwb ntwb commented Mar 9, 2018

Description

Updates package-lock.json with the current sets of dependencies due to:

  1. This is a follow up to build tools: remove the eslint --fix Git precommit hook #5323 where manually resolving a merge conflict in package-lock.json was not practical.

  2. This PR also updates package-lock.json to use tabbed indentation just as package.json does and was originally implemented in Use tabs for indentation in build tools JSON files per WP Coding Standards #4419, this was accidentally reverted in Parser: Client-side wpautop #4005 as it was merged after Use tabs for indentation in build tools JSON files per WP Coding Standards #4419 was merged.

How Has This Been Tested?

Created a new package-lock.json file by deleting the old version and running npm install

Screenshots (jpeg or gifs if applicable):

Types of changes

n/a

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code has proper inline documentation.

@ntwb ntwb added the [Type] Build Tooling Issues or PRs related to build tooling label Mar 9, 2018
@gziolo
Copy link
Member

gziolo commented Mar 9, 2018

It looks like this changes only whitespace characters:

https://github.com/WordPress/gutenberg/pull/5525/files?w=1

screen shot 2018-03-09 at 08 07 24

Copy link
Member

@gziolo gziolo left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@ntwb ntwb merged commit 6268c93 into master Mar 9, 2018
@ntwb ntwb deleted the update/package-lock-take-two branch March 9, 2018 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Build Tooling Issues or PRs related to build tooling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants