Skip to content

Commit

Permalink
Merge branch 'main' into modernize-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
bjankord committed Mar 10, 2024
2 parents 9aa4cb3 + b61c695 commit bff6b1b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -117,7 +117,7 @@ This is a list of the lints turned on in this configuration, and what they do.
* [`scss/at-extend-no-missing-placeholder`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-extend-no-missing-placeholder/README.md): Disallow at-extends (`@extend`) with missing placeholders.
* [`scss/at-function-pattern`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-function-pattern/README.md): SCSS functions must be written in lowercase and match the regex `^[a-z]+([a-z0-9-]+[a-z0-9]+)?$`.
* [`scss/load-no-partial-leading-underscore`](https://github.com/stylelint-scss/stylelint-scss/blob/master/src/rules/load-no-partial-leading-underscore/README.md): Disallow leading underscore in partial names in `@import`.
* [`scss/at-import-partial-extension-blacklist`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-import-partial-extension-blacklist/README.md): Specify list of disallowed file extensions for partial names in `@import` commands.
* [`scss/at-import-partial-extension-disallowed-list`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-import-partial-extension-disallowed-list/README.md): Specify list of disallowed file extensions for partial names in `@import` commands.
* `.scss`: Disallow the use of the `.scss` file extension in imports.
* [scss/`at-mixin-pattern`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-mixin-pattern/README.md): SCSS mixins must be written in lowercase and match the regex `^[a-z]+([a-z0-9-]+[a-z0-9]+)?$`.
* [`scss/at-rule-no-unknown`](https://github.com/stylelint-scss/stylelint-scss/blob/master/src/rules/at-rule-no-unknown/README.md): SCSS mixins must be written in lowercase and match the regex `^[a-z]+([a-z0-9-]+[a-z0-9]+)?$`.
Expand Down
12 changes: 6 additions & 6 deletions __tests__/import-path.test.mjs
Expand Up @@ -34,9 +34,9 @@ describe('flags warnings with incorrect scss import path', () => {
assert.deepEqual(
result.results[0].warnings.map((w) => w.text),
[
'Unexpected extension ".scss" in imported partial name (scss/at-import-partial-extension-blacklist)',
'Unexpected extension ".scss" in imported partial name (scss/at-import-partial-extension-blacklist)',
'Unexpected extension ".scss" in imported partial name (scss/at-import-partial-extension-blacklist)',
'Unexpected extension ".scss" in imported partial name (scss/at-import-partial-extension-disallowed-list)',
'Unexpected extension ".scss" in imported partial name (scss/at-import-partial-extension-disallowed-list)',
'Unexpected extension ".scss" in imported partial name (scss/at-import-partial-extension-disallowed-list)',
'Unexpected leading underscore in imported partial name (scss/load-no-partial-leading-underscore)',
'Unexpected leading underscore in imported partial name (scss/load-no-partial-leading-underscore)',
'Unexpected leading underscore in imported partial name (scss/load-no-partial-leading-underscore)',
Expand All @@ -48,9 +48,9 @@ describe('flags warnings with incorrect scss import path', () => {
assert.deepEqual(
result.results[0].warnings.map((w) => w.rule),
[
'scss/at-import-partial-extension-blacklist',
'scss/at-import-partial-extension-blacklist',
'scss/at-import-partial-extension-blacklist',
'scss/at-import-partial-extension-disallowed-list',
'scss/at-import-partial-extension-disallowed-list',
'scss/at-import-partial-extension-disallowed-list',
'scss/load-no-partial-leading-underscore',
'scss/load-no-partial-leading-underscore',
'scss/load-no-partial-leading-underscore',
Expand Down
2 changes: 1 addition & 1 deletion index.js
Expand Up @@ -42,7 +42,7 @@ module.exports = {
],
"scss/at-extend-no-missing-placeholder": true,
"scss/at-function-pattern": "^[a-z]+([a-z0-9-]+[a-z0-9]+)?$",
"scss/at-import-partial-extension-blacklist": ["scss"],
"scss/at-import-partial-extension-disallowed-list": ["scss"],
"scss/at-rule-no-unknown": true,
"scss/dollar-variable-colon-space-after": "always",
"scss/dollar-variable-colon-space-before": "never",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -31,7 +31,7 @@
],
"dependencies": {
"postcss-scss": "^4.0.9",
"stylelint-scss": "^6.0.0"
"stylelint-scss": "^6.2.1"
},
"peerDependencies": {
"postcss": "^8.4.21",
Expand Down
2 changes: 1 addition & 1 deletion page/de.md
Expand Up @@ -135,7 +135,7 @@ Hier findest du eine Liste mit den voreingestellten Regel und was sie bewirken.
* [`at-extend-no-missing-placeholder`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-extend-no-missing-placeholder/README.md): Verbiete at-extends (`@extend`) mit fehlendem Platzhalter.
* [`at-function-pattern`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-function-pattern/README.md): SCSS Funktionen müssen klein geschrieben werden und diesem Regex entsprechen `^[a-z]+([a-z0-9-]+[a-z0-9]+)?$`.
* [`at-import-no-partial-leading-underscore`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-import-no-partial-leading-underscore/README.md): Verbiete führende Unterstriche in partiellen Namen bei `@import`.
* [`at-import-partial-extension-blacklist`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-import-partial-extension-blacklist/README.md): Erstellt eine list von verbotenen Dateiendungen für partiellen name beim importieren.
* [`at-import-partial-extension-disallowed-list`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-import-partial-extension-disallowed-list/README.md): Erstellt eine list von verbotenen Dateiendungen für partiellen name beim importieren.
* `.scss`: Verbiete das Nutzen von `.scss` Dateiendungen beim importieren.
* [`at-mixin-pattern`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/at-mixin-pattern/README.md): SCSS Mixins müssen klein geschrieben werden und diesem Regex entsprechen `^[a-z]+([a-z0-9-]+[a-z0-9]+)?$`.
* [`dollar-variable-colon-space-after`](https://github.com/kristerkari/stylelint-scss/blob/master/src/rules/dollar-variable-colon-space-after/README.md): Benötigt ein Leerzeichen nach dem Doppelpunkt bei der $-variable Deklaration.
Expand Down

0 comments on commit bff6b1b

Please sign in to comment.