diff options
| author | korelstar <korelstar@users.noreply.github.com> | 2019-05-25 09:15:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-25 09:15:05 +0300 |
| commit | 16de16937ef5f0260fd999b282ca23edd98a25be (patch) | |
| tree | dff0ca7b784e581aec213214be92599a8ab1978c /Makefile | |
| parent | 682dc480550100a8dbb484cebfb4ee857f6b1041 (diff) | |
code style and lint errors
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 64 |
1 files changed, 40 insertions, 24 deletions
@@ -9,32 +9,32 @@ appstore_dir=$(build_dir)/appstore package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates -appstore: clean +appstore: clean lint build-js-production mkdir -p $(sign_dir) rsync -a \ - --exclude=.git \ + --exclude=.babelrc.js \ --exclude=build \ - --exclude=.gitignore \ - --exclude=.travis.yml \ - --exclude=.scrutinizer.yml \ - --exclude=CONTRIBUTING.md \ --exclude=composer.json \ --exclude=composer.lock \ --exclude=composer.phar \ - --exclude=.tx \ + --exclude=CONTRIBUTING.md \ + --exclude=.editorconfig \ + --exclude=.eslintrc.js \ + --exclude=.git \ + --exclude=.github \ + --exclude=.gitignore \ --exclude=l10n/no-php \ --exclude=Makefile \ - --exclude=nbproject \ - --exclude=screenshots \ + --exclude=package*.json \ + --exclude=phpcs.xml \ --exclude=phpunit*xml \ + --exclude=.scrutinizer.yml \ + --exclude=src \ + --exclude=.stylelintrc.js \ --exclude=tests \ - --exclude=vendor/bin \ - --exclude=js/node_modules \ - --exclude=js/tests \ - --exclude=js/karma.conf.js \ - --exclude=js/gulpfile.js \ - --exclude=js/bower.json \ - --exclude=js/package.json \ + --exclude=.travis.yml \ + --exclude=.tx \ + --exclude=vendor \ $(project_dir) $(sign_dir) @echo "Signing…" php ../server/occ integrity:sign-app \ @@ -51,7 +51,12 @@ appstore: clean all: dev-setup lint build-js-production test # Dev env management -dev-setup: clean clean-dev npm-init +dev-setup: clean clean-dev init + +init: composer-init npm-init + +composer-init: + composer install npm-init: npm install @@ -84,17 +89,27 @@ test-coverage: npm run test:coverage # Linting -lint: - npm run lint +lint: lint-php lint-js lint-css -lint-fix: - npm run lint:fix +lint-php: + vendor/bin/phpcs --standard=phpcs.xml --runtime-set ignore_warnings_on_exit 1 appinfo/ lib/ -# Style linting -stylelint: +lint-js: + npm run lint + +lint-css: npm run stylelint -stylelint-fix: +# Fix lint +lint-fix: lint-php-fix lint-js-fix lint-css-fix + +lint-php-fix: + vendor/bin/phpcbf --standard=phpcs.xml appinfo/ lib/ + +lint-js-fix: + npm run lint:fix + +lint-css-fix: npm run stylelint:fix # Cleaning @@ -104,4 +119,5 @@ clean: clean-dev: rm -rf node_modules + rm -rf vendor |