From 0f28c7e32efbb80b03455de93b21314b38d9dfae Mon Sep 17 00:00:00 2001 From: Pavel Vomacka Date: Fri, 24 Nov 2017 11:58:58 +0100 Subject: [PATCH] Include npm related files into Makefile and .gitignore Extedned Makefile in install/ui - $ make clean-local removes npm related files in the install/ui directory Add node_modules and package-lock.json into .gitignore Fixes: https://pagure.io/freeipa/issue/7278 Reviewed-By: Christian Heimes --- .gitignore | 6 ++++++ install/ui/Makefile.am | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index 872d716eb..8d170e61a 100644 --- a/.gitignore +++ b/.gitignore @@ -96,6 +96,12 @@ freeipa2-dev-doc /init/tmpfilesd/ipa.conf !/install/ui/doc/Makefile.in +/install/ui/node_modules/ +/install/ui/package-lock.json +# package-lock file can be commited, but it makes sense for npm packages. +# It stores informations about changes in node_modules. For now it is not +# very useful +# More info: https://docs.npmjs.com/files/package-lock.json /install/ui/release /install/ui/css/ipa.css /install/ui/src/dojo diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index 773395832..8f9a9556f 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -32,3 +32,6 @@ EXTRA_DIST = \ install-data-hook: $(INSTALL) -d -m 755 $(DESTDIR)$(appdir)/js/plugins + +clean-local: + rm -rf package-lock.json node_modules