Having problem in Github and remote Git repo with production and development code

Question

I am having my local Git repo which I am pushing and pulling to Github with my team as a central repository.

I am also having a remote staging area which has the whole bare repository and post-receive hook which pushes my changes to the web.I am using git push staging master for this which puts site to the staging area.

I don't want my dist/ stuff in the Github repo as this is causing many conflicts and doesn't need to be there, but I do want it in my remote website repo for production. How can I resolve this issue?

I've already tried setting up separate .gitignore files for each remote, but this doesn't make sense as it almost defeats the point of Git. Can anyone help me with this.

Answer 1

I think you could start with this.

The thing you want is to always ignore the dist directory and make the server (staging or prod) trigger a npm install after it has checked out the latest version.

If you are using yarn or npm v5, commit the yarn.lock or package-lock.json file that it generates.

Then, make it trigger your gulp build with npm's post-install hook.

You can also go with using husky, a npm module which automatically installs itself in the .git directory, letting you define and version git hooks based on commands in the scripts attribute of the package.json.

"scripts": {
  "postcheckout": "npm install", // <-- Git hook from Husky
  "postinstall": "gulp build"    // <-- default npm hook
}
I hope it will resolve your query.