search

honeynet / ochi

https://ochi.mushmush.org
GNU General Public License v3.0
25 stars 15 forks source link

Added format before commit #37

Closed suyashvsingh closed 1 year ago

suyashvsingh commented 1 year ago

It references issue #27

I have fixed the merge conflict. Before commiting the code locally, the prettier will format the files.

glaslos commented 1 year ago

Hm, can you prevent the json file to be changed?

suyashvsingh commented 1 year ago

Done, I have removed json from the lint-staged key in the package.json "lint-staged": { "**/*.{js,jsx,ts,tsx,html,css,svelte,md}": [ "npx prettier --write" ] }

glaslos commented 1 year ago

You are still committing a massive change to the package-lock.json file

suyashvsingh commented 1 year ago

@glaslos I have successfully resolved that issue.

glaslos commented 1 year ago

This PRs conflicts need to be resolved.

suyashvsingh commented 1 year ago

I will create a new PR, then I think package-json issue will get solved.

suyashvsingh commented 1 year ago

I have found that the two devDepencies, husky and lint-staged have a lot of dependencies themselves, so the package-lock.json is having many additions.