Skip to content

Commit

Permalink
Replace from scss-lint to sass-lint (mastodon#10958)
Browse files Browse the repository at this point in the history
  • Loading branch information
ykzts authored and Gargron committed Jun 4, 2019
1 parent 3f536f0 commit 3e56f95
Show file tree
Hide file tree
Showing 7 changed files with 442 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .codeclimate.yml
Expand Up @@ -31,7 +31,7 @@ plugins:
rubocop:
enabled: true
channel: rubocop-0-71
scss-lint:
sass-lint:
enabled: true
exclude_patterns:
- spec/
Expand Down
10 changes: 5 additions & 5 deletions .scss-lint.yml → .sass-lint.yml
@@ -1,10 +1,10 @@
# Linter Documentation:
# https://github.com/brigade/scss-lint/blob/v0.42.2/lib/scss_lint/linter/README.md
# https://github.com/sasstools/sass-lint/tree/v1.13.1/docs/options

scss_files: 'app/javascript/styles/**/*.scss'

exclude:
- app/javascript/styles/reset.scss
files:
include: app/javascript/styles/**/*.scss
ignore:
- app/javascript/styles/reset.scss

linters:
# Reports when you use improper spacing around ! (the "bang") in !default,
Expand Down
2 changes: 1 addition & 1 deletion .yarnclean
Expand Up @@ -43,4 +43,4 @@ Gruntfile.js

# for specific ignore
!.svgo.yml

!sass-lint/**/*.yml
1 change: 0 additions & 1 deletion Gemfile
Expand Up @@ -132,7 +132,6 @@ group :development do
gem 'rubocop-rails', '~> 2.0', require: false
gem 'brakeman', '~> 4.5', require: false
gem 'bundler-audit', '~> 0.6', require: false
gem 'scss_lint', '~> 0.58', require: false

gem 'capistrano', '~> 3.11'
gem 'capistrano-rails', '~> 1.4'
Expand Down
12 changes: 0 additions & 12 deletions Gemfile.lock
Expand Up @@ -470,9 +470,6 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rdf (3.0.9)
hamster (~> 3.0)
link_header (~> 0.0, >= 0.0.8)
Expand Down Expand Up @@ -547,14 +544,6 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.8.0)
nokogumbo (~> 2.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
scss_lint (0.58.0)
rake (>= 0.9, < 13)
sass (~> 3.5, >= 3.5.5)
sidekiq (5.2.7)
connection_pool (~> 2.2, >= 2.2.2)
rack (>= 1.5.0)
Expand Down Expand Up @@ -751,7 +740,6 @@ DEPENDENCIES
rubocop (~> 0.71)
rubocop-rails (~> 2.0)
sanitize (~> 5.0)
scss_lint (~> 0.58)
sidekiq (~> 5.2)
sidekiq-bulk (~> 0.2.0)
sidekiq-scheduler (~> 3.0)
Expand Down
2 changes: 2 additions & 0 deletions package.json
Expand Up @@ -12,6 +12,7 @@
"start": "node ./streaming/index.js",
"test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
"test:lint": "eslint --ext=js .",
"test:lint:sass": "sass-lint .",
"test:jest": "cross-env NODE_ENV=test jest --coverage"
},
"repository": {
Expand Down Expand Up @@ -177,6 +178,7 @@
"raf": "^3.4.1",
"react-intl-translations-manager": "^5.0.3",
"react-test-renderer": "^16.8.6",
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.5.1",
"yargs": "^12.0.5"
}
Expand Down

0 comments on commit 3e56f95

Please sign in to comment.