diff --git a/Makefile b/Makefile index 514216e..f53ff63 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,32 @@ ARTIFACT_FILES=$$(paste --delimiters ' ' --serial artifacts.include) ARTIFACT_NAME="DirectoryLister-$$(git describe --tags --exact-match HEAD 2> /dev/null || git rev-parse --short HEAD)" -RUN := docker-compose run --rm app dev development: # Build application for development - @$(RUN) composer install --no-interaction - @$(RUN) npm install && npm run dev + @composer install --no-interaction + @npm install && npm run dev prod production: # Build application for production - @$(RUN) composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader - @$(RUN) npm install --no-save && npm run production && npm prune --production + @composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader + @npm install --no-save && npm run production && npm prune --production update upgrade: # Update application dependencies - @$(RUN) composer update && npm update && npm install && npm audit fix + @composer update && npm update && npm install && npm audit fix php-cs-fixer: # Check PHP coding standards with PHP Coding Standards Fixer - @$(RUN) app/vendor/bin/php-cs-fixer fix --diff --dry-run + @app/vendor/bin/php-cs-fixer fix --diff --dry-run eslint: # Check JavaScript coding standards with ESLint - @$(RUN) npm run cs + @npm run cs cs coding-standards: php-cs-fixer eslint # Check coding standards static-analysis: # Run static analysis checks - @$(RUN) app/vendor/bin/psalm + @app/vendor/bin/phpstan analyze: coding-standards static-analysis # Run coding standards and static analysis checks test: # Run tests - @$(RUN) app/vendor/bin/phpunit + @app/vendor/bin/phpunit suite: analyze test # Run coding standards and static analysis checks and tests @@ -35,20 +34,20 @@ coverage: # Generate an HTML coverage report @docker-compose run --rm -e XDEBUG_MODE=coverage app app/vendor/bin/phpunit --coverage-html .coverage tunnel: # Expose the application via secure tunnel - @ngrok http -host-header=rewrite http://directory-lister.local:80 + @composer exec expose share directory-lister.local clear-assets: # Clear the compiled assets - @$(RUN) rm app/assets/* -rfv + @rm app/assets/* -rfv clear-cache: # Clear the application cache - @$(RUN) rm app/cache/* -rfv + @rm app/cache/* -rfv tar: # Generate tarball - @$(RUN) tar --exclude-vcs --exclude=app/cache/* --exclude=app/resources \ + @tar --exclude-vcs --exclude=app/cache/* --exclude=app/resources \ --create --gzip --file artifacts/$(ARTIFACT_NAME).tar.gz $(ARTIFACT_FILES) zip: # Generate zip file - @$(RUN) zip --quiet --exclude "*.git*" "app/cache/**" "app/resources/*" \ + @zip --quiet --exclude "*.git*" "app/cache/**" "app/resources/*" \ --recurse-paths artifacts/$(ARTIFACT_NAME).zip $(ARTIFACT_FILES) artifacts: clear-assets production tar zip # Generate release artifacts