diff --git a/Makefile b/Makefile index 906a3c21c..0d46d3812 100644 --- a/Makefile +++ b/Makefile @@ -68,8 +68,6 @@ test: test-frontend test-backend i18n-check %-frontend: --image-build --containerized---%-frontend; .PHONY: --%-frontend -#--%-frontend: node_modules well-known; -#--%-frontend: --containerized---node_modules-frontend --containerized---well-known-frontend; --%-frontend: --containerized---frontend-dependencies-frontend; .PHONY: --compile-frontend @@ -90,52 +88,24 @@ test: test-frontend test-backend i18n-check @echo Karma frontend tests are currently broken after npm update and have therefor been temporarily disabled. # npx -- karma start --conf karma.conf.cjs $(WATCH) -## TODO: rewrite -#.PHONY: --test-frontend-watch -#--test-frontend-watch: WATCH=--single-run false -#--test-frontend-watch: --test-frontend; -# -#node_modules: package.json package-lock.json -# $(MAKE) -- --containerized---node_modules-frontend -#.PHONY: --node_modules -#--node_modules: package.json package-lock.json -# npm ci --cache .npm --prefer-offline -# -#package-lock.json: package.json -# $(MAKE) -- --image-run---package-lock.json -#.PHONY: --package-lock.json -#--package-lock.json: package.json -# npm install --cache .npm --prefer-offline -# -#assets: node_modules -# $(MAKE) -- --image-run---assets -#.PHONY: --assets/icons -#--assets: node_modules -# ./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/solid utils/rename-fa.json assets/icons/fradrive -# ./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/regular utils/rename-fa.json assets/icons/fradrive -# -#well-known: node_modules assets well-known/.well-known -# $(MAKE) -- --containerized---well-known-frontend -#.PHONY: --well-known -#--well-known: --node_modules assets well-known/.well-known -# npx webpack --progress -## mark well-known directory as clean after successful webpack run: -# touch well-known/.well-known - .PHONY: --frontend-dependencies --frontend-dependencies: node_modules package.json package-lock.json assets; node_modules: package.json package-lock.json npm ci --cache .npm --prefer-offline + package-lock.json: package.json npm install --cache .npm --prefer-offline + assets: node_modules ./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/solid utils/rename-fa.json assets/icons/fradrive ./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/regular utils/rename-fa.json assets/icons/fradrive +assets/.assets: +# no-op target + well-known: node_modules assets well-known/.well-known npx webpack --progress touch well-known/.well-known - well-known/.well-known: # no-op target