Upgrade front end dependencies

[github/shaarli/Shaarli.git] / Makefile

diff --git a/Makefile b/Makefile
index b758d1fd276e91fd523b3b1410c89341a6ed906a..2d604b542b80459b954212af053d57c655b11430 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,8 @@ locale_test_%:
                --testsuite language-$(firstword $(subst _, ,$*))
 
 all_tests: test locale_test_de_DE locale_test_en_US locale_test_fr_FR
-       @$(BIN)/phpcov merge --html coverage coverage
+       @# --The current version is not compatible with PHP 7.2
+       @#$(BIN)/phpcov merge --html coverage coverage
        @# --text doesn't work with phpunit 4.* (v5 requires PHP 5.6)
        @#$(BIN)/phpcov merge --text coverage/txt coverage
 
@@ -122,7 +123,8 @@ release_tar: composer_dependencies htmldoc translate build_frontend
 ### generate a release zip and include 3rd-party dependencies and translations
 release_zip: composer_dependencies htmldoc translate build_frontend
        git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
-       mkdir -p $(ARCHIVE_PREFIX)/{doc,vendor}
+       mkdir -p $(ARCHIVE_PREFIX)/doc
+       mkdir -p $(ARCHIVE_PREFIX)/vendor
        rsync -a doc/html/ $(ARCHIVE_PREFIX)doc/html/
        zip -r $(ARCHIVE_VERSION).zip $(ARCHIVE_PREFIX)doc/
        rsync -a vendor/ $(ARCHIVE_PREFIX)vendor/
@@ -146,15 +148,15 @@ authors:
        @git shortlog -sne > AUTHORS
        @rm .mailmap
 
-### generate Doxygen documentation
-doxygen: clean
-       @rm -rf doxygen
-       @doxygen Doxyfile
+### generate phpDocumentor documentation
+phpdoc: clean
+       @docker run --rm -v $(PWD):/data -u `id -u`:`id -g` phpdoc/phpdoc
 
 ### generate HTML documentation from Markdown pages with MkDocs
 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 '{}' \;
@@ -172,4 +174,4 @@ eslint:
 
 ### 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'