Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Replace Husky and lint-staged with pre-commit #1862

Merged
merged 9 commits into from
Oct 11, 2022
Merged

Replace Husky and lint-staged with pre-commit #1862

merged 9 commits into from
Oct 11, 2022

Conversation

dhruvkb
Copy link
Member

@dhruvkb dhruvkb commented Sep 25, 2022

Fixes

Fixes #1641 by @sarayourfriend

Description

This PR replaces Husky and lint-staged with the tried-and-tested pre-commit that we're already using in all other repos.

This PR

  • adds some new pc:* scripts to the package.json file to download, install and run pre-commit
  • converts additional commands from the husky scripts to local repo hooks (i18n, types, test:unit)
  • implements linting changes suggested by pre-commit

Screenshots

See how the test:unit hook is skipped during the pre-commit staged but run during pre-push stage.

Screenshot 2022-09-25 at 2 13 13 PM

Testing Instructions

  1. Checkout the PR.
  2. Undo Husky config git config --unset core.hooksPath
  3. Make some code changes.
  4. Make some valid changes, some invalid ones.
  5. Try committing, see that hooks fail.
  6. Fix the invalid changes.
  7. Commit and see that hooks pass.
  8. Push to see that the test:unit hook runs.

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@github-actions
Copy link

github-actions bot commented Sep 25, 2022

Storybook and Tailwind configuration previews: Ready

Storybook: https://wordpress.github.io/openverse-frontend/_preview/1862
Tailwind: https://wordpress.github.io/openverse-frontend/_preview/1862/tailwind

Please note that GitHub pages takes a little time to deploy newly pushed code, if the links above don't work or you see old versions, wait 5 minutes and try again.

You can check the GitHub pages deployment action list to see the current status of the deployments.

@openverse-bot openverse-bot added 🟩 priority: low Low priority and doesn't need to be rushed 🤖 aspect: dx Concerns developers' experience with the codebase 🧰 goal: internal improvement Improvement that benefits maintainers, not users labels Sep 25, 2022
@github-actions
Copy link

github-actions bot commented Sep 25, 2022

Size Change: -1.97 kB (0%)

Total Size: 814 kB

Filename Size Change
./.nuxt/dist/client/230.js 0 B -272 B (removed) 🏆
./.nuxt/dist/client/230.modern.js 0 B -277 B (removed) 🏆
./.nuxt/dist/client/231.js 0 B -1.85 kB (removed) 🏆
./.nuxt/dist/client/app.js 131 kB -923 B (-1%)
./.nuxt/dist/client/app.modern.js 123 kB -907 B (-1%)
./.nuxt/dist/client/pages/image/_id.js 5.26 kB -50 B (-1%)
./.nuxt/dist/client/runtime.js 2.66 kB -42 B (-2%)
./.nuxt/dist/client/runtime.modern.js 2.66 kB -42 B (-2%)
./.nuxt/dist/client/222.js 272 B +272 B (new file) 🆕
./.nuxt/dist/client/222.modern.js 276 B +276 B (new file) 🆕
./.nuxt/dist/client/223.js 1.85 kB +1.85 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./.nuxt/dist/client/commons/app.js 88.2 kB 0 B
./.nuxt/dist/client/commons/app.modern.js 77 kB 0 B
./.nuxt/dist/client/components/loading-icon.js 745 B 0 B
./.nuxt/dist/client/components/loading-icon.modern.js 750 B 0 B
./.nuxt/dist/client/components/table-sort-icon.js 509 B 0 B
./.nuxt/dist/client/components/table-sort-icon.modern.js 513 B 0 B
./.nuxt/dist/client/components/v-all-results-grid.js 2.75 kB 0 B
./.nuxt/dist/client/components/v-all-results-grid.modern.js 2.72 kB 0 B
./.nuxt/dist/client/components/v-all-results-grid/pages/search/audio/pages/search/index.js 3.02 kB 0 B
./.nuxt/dist/client/components/v-all-results-grid/pages/search/audio/pages/search/index.modern.js 2.91 kB 0 B
./.nuxt/dist/client/components/v-audio-cell.js 357 B 0 B
./.nuxt/dist/client/components/v-audio-cell.modern.js 361 B 0 B
./.nuxt/dist/client/components/v-audio-details.js 1.82 kB 0 B
./.nuxt/dist/client/components/v-audio-details.modern.js 1.79 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.js 1.01 kB 0 B
./.nuxt/dist/client/components/v-audio-track-skeleton.modern.js 1.02 kB 0 B
./.nuxt/dist/client/components/v-audio-track.js 5.11 kB 0 B
./.nuxt/dist/client/components/v-audio-track.modern.js 5.06 kB 0 B
./.nuxt/dist/client/components/v-back-to-search-results-link.js 570 B 0 B
./.nuxt/dist/client/components/v-back-to-search-results-link.modern.js 573 B 0 B
./.nuxt/dist/client/components/v-bone.js 685 B 0 B
./.nuxt/dist/client/components/v-bone.modern.js 690 B 0 B
./.nuxt/dist/client/components/v-box-layout.js 1.2 kB 0 B
./.nuxt/dist/client/components/v-box-layout.modern.js 1.2 kB 0 B
./.nuxt/dist/client/components/v-content-link.js 1.11 kB 0 B
./.nuxt/dist/client/components/v-content-link.modern.js 1.09 kB 0 B
./.nuxt/dist/client/components/v-content-page.js 467 B 0 B
./.nuxt/dist/client/components/v-content-page.modern.js 471 B 0 B
./.nuxt/dist/client/components/v-content-report-button.js 779 B 0 B
./.nuxt/dist/client/components/v-content-report-button.modern.js 784 B 0 B
./.nuxt/dist/client/components/v-content-report-form.js 3.75 kB 0 B
./.nuxt/dist/client/components/v-content-report-form.modern.js 3.56 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.js 4.43 kB 0 B
./.nuxt/dist/client/components/v-content-report-popover.modern.js 4.24 kB 0 B
./.nuxt/dist/client/components/v-copy-button.js 3.98 kB 0 B
./.nuxt/dist/client/components/v-copy-button.modern.js 3.98 kB 0 B
./.nuxt/dist/client/components/v-copy-license.js 999 B 0 B
./.nuxt/dist/client/components/v-copy-license.modern.js 1 kB 0 B
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/09090664.js 9.47 kB 0 B
./.nuxt/dist/client/components/v-copy-license/components/v-error-image/components/v-media-reuse/components/v-search-grid/09090664.modern.js 9.45 kB 0 B
./.nuxt/dist/client/components/v-dmca-notice.js 748 B 0 B
./.nuxt/dist/client/components/v-dmca-notice.modern.js 752 B 0 B
./.nuxt/dist/client/components/v-error-image.js 1.69 kB 0 B
./.nuxt/dist/client/components/v-error-image.modern.js 1.68 kB 0 B
./.nuxt/dist/client/components/v-error-section.js 372 B 0 B
./.nuxt/dist/client/components/v-error-section.modern.js 376 B 0 B
./.nuxt/dist/client/components/v-external-search-form.js 3.11 kB 0 B
./.nuxt/dist/client/components/v-external-search-form.modern.js 3.08 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.js 2.57 kB 0 B
./.nuxt/dist/client/components/v-external-source-list.modern.js 2.54 kB 0 B
./.nuxt/dist/client/components/v-full-layout.js 1.48 kB 0 B
./.nuxt/dist/client/components/v-full-layout.modern.js 1.48 kB 0 B
./.nuxt/dist/client/components/v-grid-skeleton.js 1.6 kB 0 B
./.nuxt/dist/client/components/v-grid-skeleton.modern.js 1.61 kB 0 B
./.nuxt/dist/client/components/v-image-cell-square.js 1.02 kB 0 B
./.nuxt/dist/client/components/v-image-cell-square.modern.js 1.02 kB 0 B
./.nuxt/dist/client/components/v-image-cell.js 1.43 kB 0 B
./.nuxt/dist/client/components/v-image-cell.modern.js 1.42 kB 0 B
./.nuxt/dist/client/components/v-image-details.js 1.44 kB 0 B
./.nuxt/dist/client/components/v-image-details.modern.js 1.44 kB 0 B
./.nuxt/dist/client/components/v-image-grid.js 2.53 kB 0 B
./.nuxt/dist/client/components/v-image-grid.modern.js 2.42 kB 0 B
./.nuxt/dist/client/components/v-license-tab-panel.js 522 B 0 B
./.nuxt/dist/client/components/v-license-tab-panel.modern.js 526 B 0 B
./.nuxt/dist/client/components/v-load-more.js 788 B 0 B
./.nuxt/dist/client/components/v-load-more.modern.js 683 B 0 B
./.nuxt/dist/client/components/v-media-license.js 799 B 0 B
./.nuxt/dist/client/components/v-media-license.modern.js 805 B 0 B
./.nuxt/dist/client/components/v-media-reuse.js 1.63 kB 0 B
./.nuxt/dist/client/components/v-media-reuse.modern.js 1.62 kB 0 B
./.nuxt/dist/client/components/v-media-tag.js 430 B 0 B
./.nuxt/dist/client/components/v-media-tag.modern.js 434 B 0 B
./.nuxt/dist/client/components/v-no-results.js 2.77 kB 0 B
./.nuxt/dist/client/components/v-no-results.modern.js 2.74 kB 0 B
./.nuxt/dist/client/components/v-radio.js 1.51 kB 0 B
./.nuxt/dist/client/components/v-radio.modern.js 1.47 kB 0 B
./.nuxt/dist/client/components/v-related-audio.js 1.23 kB 0 B
./.nuxt/dist/client/components/v-related-audio.modern.js 1.23 kB 0 B
./.nuxt/dist/client/components/v-related-images.js 3.09 kB 0 B
./.nuxt/dist/client/components/v-related-images.modern.js 2.97 kB 0 B
./.nuxt/dist/client/components/v-report-desc-form.js 966 B 0 B
./.nuxt/dist/client/components/v-report-desc-form.modern.js 965 B 0 B
./.nuxt/dist/client/components/v-row-layout.js 1.7 kB 0 B
./.nuxt/dist/client/components/v-row-layout.modern.js 1.7 kB 0 B
./.nuxt/dist/client/components/v-scroll-button.js 813 B 0 B
./.nuxt/dist/client/components/v-scroll-button.modern.js 819 B 0 B
./.nuxt/dist/client/components/v-search-grid.js 5.46 kB 0 B
./.nuxt/dist/client/components/v-search-grid.modern.js 5.41 kB 0 B
./.nuxt/dist/client/components/v-search-results-title.js 657 B 0 B
./.nuxt/dist/client/components/v-search-results-title.modern.js 652 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.js 793 B 0 B
./.nuxt/dist/client/components/v-search-type-radio.modern.js 769 B 0 B
./.nuxt/dist/client/components/v-server-timeout.js 298 B -1 B (0%)
./.nuxt/dist/client/components/v-server-timeout.modern.js 302 B -1 B (0%)
./.nuxt/dist/client/components/v-sketch-fab-viewer.js 996 B 0 B
./.nuxt/dist/client/components/v-sketch-fab-viewer.modern.js 895 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.js 890 B 0 B
./.nuxt/dist/client/components/v-skip-to-content-container.modern.js 893 B 0 B
./.nuxt/dist/client/components/v-snackbar.js 1.18 kB 0 B
./.nuxt/dist/client/components/v-snackbar.modern.js 1.19 kB 0 B
./.nuxt/dist/client/components/v-sources-table.js 15.3 kB 0 B
./.nuxt/dist/client/components/v-sources-table.modern.js 15.3 kB 0 B
./.nuxt/dist/client/components/v-warning-suppressor.js 298 B 0 B
./.nuxt/dist/client/components/v-warning-suppressor.modern.js 303 B 0 B
./.nuxt/dist/client/pages/about.js 1.06 kB -1 B (0%)
./.nuxt/dist/client/pages/about.modern.js 1.07 kB +1 B (0%)
./.nuxt/dist/client/pages/audio/_id.js 4.93 kB -2 B (0%)
./.nuxt/dist/client/pages/audio/_id.modern.js 4.76 kB +2 B (0%)
./.nuxt/dist/client/pages/external-sources.js 1.45 kB +1 B (0%)
./.nuxt/dist/client/pages/external-sources.modern.js 1.45 kB 0 B
./.nuxt/dist/client/pages/feedback.js 1.24 kB -1 B (0%)
./.nuxt/dist/client/pages/feedback.modern.js 1.24 kB 0 B
./.nuxt/dist/client/pages/image/_id.modern.js 7.24 kB +1 B (0%)
./.nuxt/dist/client/pages/index.js 5.05 kB 0 B
./.nuxt/dist/client/pages/index.modern.js 4.91 kB -1 B (0%)
./.nuxt/dist/client/pages/preferences.js 1.21 kB 0 B
./.nuxt/dist/client/pages/preferences.modern.js 1.21 kB 0 B
./.nuxt/dist/client/pages/search-help.js 1.54 kB 0 B
./.nuxt/dist/client/pages/search-help.modern.js 1.55 kB +1 B (0%)
./.nuxt/dist/client/pages/search.js 2.75 kB 0 B
./.nuxt/dist/client/pages/search.modern.js 2.59 kB 0 B
./.nuxt/dist/client/pages/search/audio.js 1.19 kB +1 B (0%)
./.nuxt/dist/client/pages/search/audio.modern.js 1.19 kB -1 B (0%)
./.nuxt/dist/client/pages/search/image.js 2.79 kB -1 B (0%)
./.nuxt/dist/client/pages/search/image.modern.js 2.67 kB +1 B (0%)
./.nuxt/dist/client/pages/search/index.js 2.97 kB +1 B (0%)
./.nuxt/dist/client/pages/search/index.modern.js 2.93 kB 0 B
./.nuxt/dist/client/pages/search/model-3d.js 243 B +1 B (0%)
./.nuxt/dist/client/pages/search/model-3d.modern.js 247 B +1 B (0%)
./.nuxt/dist/client/pages/search/search-page.types.js 266 B 0 B
./.nuxt/dist/client/pages/search/search-page.types.modern.js 271 B +1 B (0%)
./.nuxt/dist/client/pages/search/video.js 239 B 0 B
./.nuxt/dist/client/pages/search/video.modern.js 244 B 0 B
./.nuxt/dist/client/pages/sources.js 1.44 kB -3 B (0%)
./.nuxt/dist/client/pages/sources.modern.js 1.45 kB 0 B
./.nuxt/dist/client/vendors/app.js 57.2 kB 0 B
./.nuxt/dist/client/vendors/app.modern.js 56.3 kB 0 B

compressed-size-action

@dhruvkb
Copy link
Member Author

dhruvkb commented Sep 26, 2022

Weirdly Prettier is suggesting a number of strange changes to the codebase that are purely stylistic and weren't being suggested before. If someone can checkout the branch locally to see why Prettier is suggesting extra changes, that'd be very helpful.

Copy link
Contributor

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

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

I am loving this PR. I made a small suggestion for the ignore paths. So excited to re-review this once it's undrafted 🥳

@@ -0,0 +1,114 @@
exclude: Pipfile\.lock|migrations|\.idea|node_modules
Copy link
Contributor

Choose a reason for hiding this comment

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

There might be more files than this to ignore as well, but I think we need at least these 🤔

Suggested change
exclude: Pipfile\.lock|migrations|\.idea|node_modules
exclude: pnpm-lock\.yaml|\.idea|node_modules|nuxt-template-overrides|\.storybook

Copy link
Member Author

Choose a reason for hiding this comment

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

@sarayourfriend I added an exception for nuxt-template-overrides in ESLint. Even without excluding the others, all checks are passing. So I think it's better to leave them in.

.pre-commit-config.yaml Outdated Show resolved Hide resolved
package.json Show resolved Hide resolved
@obulat
Copy link
Contributor

obulat commented Sep 29, 2022

I got some missing package errors in the IDE and when linting:

Error: Failed to load plugin '@typescript-eslint' declared in '.eslintrc.js': Cannot find module '@typescript-eslint/eslint-plugin'
Require stack:
- /openverse/openverse-frontend/__placeholder__.js
Referenced from: /openverse/openverse-frontend/.eslintrc.js

@dhruvkb
Copy link
Member Author

dhruvkb commented Sep 29, 2022

@obulat IDE linting will generally not work with this PR because tooling like Prettier and ESLint will not be installed as Node modules. This might be a huge drawback for this approach.

@sarayourfriend
Copy link
Contributor

We can leave the dependencies in as development dependencies anyway. It'll mean updating them in two places but we already have to update dependencies in this repository by hand anyway due to the pnpm limitations.

@zackkrida
Copy link
Member

@dhruvkb what's blocking here?

@dhruvkb
Copy link
Member Author

dhruvkb commented Oct 6, 2022

I am facing some problems in getting Node tooling to work reliably inside the pre-commit environment. pre-commit keeps suggesting purely stylistic changes that ESLint and Prettier did not suggest when running them as npm packages. My goal was to implement the tooling change with zero changes in the codebase, so some tweaking of settings may be needed.

I haven't had time to debug what's behind that yet. No blockers, just been busy with some other work.

@dhruvkb
Copy link
Member Author

dhruvkb commented Oct 7, 2022

@zackkrida this seems to be working now!

@sarayourfriend I've left the Node dependencies unchanged so that IDE integration works. As a next step, we should uninstall Husky and lint-staged Node packages, but I'm thinking to do that in a separate because package.json changes would make reviewing difficult.

@dhruvkb dhruvkb marked this pull request as ready for review October 7, 2022 13:46
@dhruvkb dhruvkb requested a review from a team as a code owner October 7, 2022 13:46
@sarayourfriend
Copy link
Contributor

Sounds good to me to do the package.json changes in a fast-follow PR. Nice job getting this working 🚀

Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

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

It works great, nice to have consistency across all the repos!

I've left a lot of questions, but none are blocking.

Co-authored-by: Olga Bulat <obulat@gmail.com>
@zackkrida
Copy link
Member

@dhruvkb observing some local error output:

front on  pre_commit +/- [$] via  v16.15.0
❯ pnpm dev

> openverse-frontend@2.2.1 predev /Users/zackkrida/Code/openverse/front
> pnpm install && pnpm i18n:no-get

Lockfile is up-to-date, resolution step is skipped
Already up-to-date

> openverse-frontend@2.2.1 prepare /Users/zackkrida/Code/openverse/front
> pnpm pc:download && pnpm pc:install


> openverse-frontend@2.2.1 pc:download /Users/zackkrida/Code/openverse/front
> curl https://api.github.com/repos/pre-commit/pre-commit/releases/latest | grep -o 'https://.*\.pyz' -m 1 | xargs | xargs curl -fsJo pre-commit.pyz -L

  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100  6175  100  6175    0     0  27703      0 --:--:-- --:--:-- --:--:-- 28456

> openverse-frontend@2.2.1 pc:install /Users/zackkrida/Code/openverse/front
> python3 pre-commit.pyz install -t pre-push -t pre-commit

[ERROR] Cowardly refusing to install hooks with `core.hooksPath` set.
hint: `git config --unset-all core.hooksPath`
 ELIFECYCLE  Command failed with exit code 1.
 ELIFECYCLE  Command failed with exit code 1.
 ELIFECYCLE  Command failed with exit code 1.

@dhruvkb
Copy link
Member Author

dhruvkb commented Oct 10, 2022

Gotta run git config --unset-all core.hooksPath. Sorry I should have specified this in the instructions.

@zackkrida
Copy link
Member

@dhruvkb will do. Should we document that somewhere for contributors then?

@dhruvkb
Copy link
Member Author

dhruvkb commented Oct 10, 2022

Yeah, I'll update the contributor docs. Should I do that in a separate PR?

Copy link
Member

@zackkrida zackkrida left a comment

Choose a reason for hiding this comment

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

LGTM. The git config --unset-all core.hooksPath is not necessary by default, if I understand correctly, so it might be fine to just send a slack notice to existing frontend contributors and not actually add information directly to the repo documentation.

@dhruvkb dhruvkb merged commit 4c473a6 into main Oct 11, 2022
@dhruvkb dhruvkb deleted the pre_commit branch October 11, 2022 06:21
github-actions bot pushed a commit that referenced this pull request Oct 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🤖 aspect: dx Concerns developers' experience with the codebase 🧰 goal: internal improvement Improvement that benefits maintainers, not users 🟩 priority: low Low priority and doesn't need to be rushed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Switch to or add pre-commit to allow for syncing lint configuration across repositories.
5 participants