Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix prettier

This commit is contained in:
Joffrey JAFFEUX 2018-06-20 18:26:43 +02:00 committed by GitHub
parent c5c1b45d19
commit 8126b603e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.prettierignore
View File

@ -1,8 +1,2 @@
app/assets/stylesheets/vendor/ app/assets/stylesheets/vendor/
plugins/**/assets/stylesheets/vendor/ plugins/**/assets/stylesheets/vendor/
app/assets/javascripts/admin/routes/admin-backups-logs.js.es6
app/assets/javascripts/discourse/components/global-notice.js.es6
app/assets/javascripts/discourse/lib/ajax.js.es6
app/assets/javascripts/discourse/lib/link-mentions.js.es6
app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
app/assets/javascripts/select-kit/components/tag-chooser.js.es6

2
app/assets/javascripts/discourse/widgets/post-edits-indicator.js.es6
View File

@ -41,7 +41,7 @@ export default createWidget("post-edits-indicator", {
if (attrs.wiki) { if (attrs.wiki) {
icon = "pencil-square-o"; icon = "pencil-square-o";
className = `${className || ''} wiki`.trim(); className = `${className || ""} wiki`.trim();
if (attrs.version > 1) { if (attrs.version > 1) {
title = `${I18n.t("post.last_edited_on")} ${date}`; title = `${I18n.t("post.last_edited_on")} ${date}`;

6
lib/tasks/docker.rake
View File

@ -45,7 +45,7 @@ task 'docker:test' do
@good &&= run_or_fail("eslint --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}") @good &&= run_or_fail("eslint --ext .es6 plugins/#{ENV['SINGLE_PLUGIN']}")
puts "Listing prettier offenses in #{ENV['SINGLE_PLUGIN']}:" puts "Listing prettier offenses in #{ENV['SINGLE_PLUGIN']}:"
@good &&= run_or_fail("prettier --loglevel=debug --list-different 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.scss' 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.es6'") @good &&= run_or_fail("prettier --list-different 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.scss' 'plugins/#{ENV['SINGLE_PLUGIN']}/**/*.es6'")
else else
@good &&= run_or_fail("bundle exec rubocop --parallel") unless ENV["SKIP_CORE"] @good &&= run_or_fail("bundle exec rubocop --parallel") unless ENV["SKIP_CORE"]
@good &&= run_or_fail("eslint app/assets/javascripts test/javascripts") unless ENV["SKIP_CORE"] @good &&= run_or_fail("eslint app/assets/javascripts test/javascripts") unless ENV["SKIP_CORE"]
@ -53,12 +53,12 @@ task 'docker:test' do
unless ENV["SKIP_CORE"] unless ENV["SKIP_CORE"]
puts "Listing prettier offenses in core:" puts "Listing prettier offenses in core:"
@good &&= run_or_fail('prettier --loglevel=debug --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"') @good &&= run_or_fail('prettier --list-different "app/assets/stylesheets/**/*.scss" "app/assets/javascripts/**/*.es6" "test/javascripts/**/*.es6"')
end end
unless ENV["SKIP_PLUGINS"] unless ENV["SKIP_PLUGINS"]
puts "Listing prettier offenses in plugins:" puts "Listing prettier offenses in plugins:"
@good &&= run_or_fail('prettier --loglevel=debug --list-different "plugins/**/*.scss" "plugins/**/*.es6"') @good &&= run_or_fail('prettier --list-different "plugins/**/*.scss" "plugins/**/*.es6"')
end end
end end
end end