diff --git a/settings/Makefile b/Makefile similarity index 70% rename from settings/Makefile rename to Makefile index 666e99f1e06..7e6b37af669 100644 --- a/settings/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: dev-setup build-js-production -dev-setup: clean clean-dev npm-init +dev-setup: clean-dev npm-init npm-init: npm install @@ -17,10 +17,6 @@ build-js-production: watch-js: npm run watch -clean: - rm -f js/vue-*.js - rm -f js/vue-*.js.map - clean-dev: rm -rf node_modules diff --git a/README.md b/README.md index 1ddfd2facb7..a18323756e0 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Otherwise, git checkouts can be handled the same as release archives, by using t ### Building front-end code 🏗 -We move more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the `settings` subfolder: +We move more and more towards using Vue.js in the frontend, starting with Settings. For building the code on changes, use these terminal commands in the root folder: ``` bash # install dependencies @@ -75,9 +75,6 @@ make watch-js # build for production with minification make build-js-production - -# clean output files -make clean ``` **When making changes, also commit the compiled files!**