Fix confirm popup before bookmark deletion

[github/shaarli/Shaarli.git] / Makefile

diff --git a/Makefile b/Makefile
index 03c6a0d6fab44ea10284ea45db15bda8cecf8445..7415887a42cb572a7f632374193e91d87e8895f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 BIN = vendor/bin
 
-all: static_analysis_summary check_permissions test
+all: check_permissions test
 
 ##
 # Docker test adapter
@@ -85,6 +85,10 @@ all_tests: test locale_test_de_DE locale_test_en_US locale_test_fr_FR
        @# --text doesn't work with phpunit 4.* (v5 requires PHP 5.6)
        @#$(BIN)/phpcov merge --text coverage/txt coverage
 
+### download 3rd-party PHP libraries, including dev dependencies
+composer_dependencies_dev: clean
+       composer install --prefer-dist
+
 ##
 # Custom release archive generation
 #
@@ -156,6 +160,7 @@ phpdoc: clean
 htmldoc:
        python3 -m venv venv/
        bash -c 'source venv/bin/activate; \
+       pip install wheel; \
        pip install mkdocs; \
        mkdocs build --clean'
        find doc/html/ -type f -exec chmod a-x '{}' \;
@@ -170,7 +175,8 @@ translate:
 eslint:
        @yarn run eslint -c .dev/.eslintrc.js assets/vintage/js/
        @yarn run eslint -c .dev/.eslintrc.js assets/default/js/
+       @yarn run eslint -c .dev/.eslintrc.js assets/common/js/
 
 ### Run CSSLint check against Shaarli's SCSS files
 sasslint:
-       @yarn run sass-lint -c .dev/.sasslintrc 'assets/default/scss/*.scss' -v -q
+       @yarn run stylelint --config .dev/.stylelintrc.js 'assets/default/scss/*.scss'