diff --git a/.gitignore b/.gitignore index b7b3607d7..61bb0314a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ js/node_modules/* js/vendor/ -build/ js/public/ +js/package-lock.json +build/ css/style.css tests/integration/vendor/ tests/integration/composer.lock +vendor/ +*.lock diff --git a/Makefile b/Makefile index 564ed8ef8..c45aec1bb 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ appstore: clean-build build --exclude="../$(app_name)/js/tests" \ --exclude="../$(app_name)/js/test" \ --exclude="../$(app_name)/js/*.log" \ + --exclude="../$(app_name)/js/package-lock.json" \ --exclude="../$(app_name)/js/package.json" \ --exclude="../$(app_name)/js/bower.json" \ --exclude="../$(app_name)/js/karma.*" \ @@ -60,7 +61,9 @@ appstore: clean-build build --exclude="../$(app_name)/karma.*" \ --exclude="../$(app_name)/protractor\.*" \ --exclude="../$(app_name)/.*" \ + --exclude="../$(app_name)/*.lock" \ --exclude="../$(app_name)/js/.*" \ + --exclude="../$(app_name)/vendor" \ --exclude-vcs \ ../$(app_name)