Skip to content

Commit e2995f9

Browse files
committed
chore: update stylelint
1 parent 67641b8 commit e2995f9

8 files changed

Lines changed: 48 additions & 8 deletions

File tree

.circleci/config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ workflows:
3939
- template:
4040
name: lint
4141
run-command: 'lint:affected'
42+
- template:
43+
name: lint-style
44+
run-command: 'lint:style'
4245

4346
test:
4447
jobs:

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
. "$(dirname "$0")/common.sh"
44

55
yarn lint:affected
6+
yarn lint:style

.stylelintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/dist
33
/coverage
44
/.yarn
5+
/packages/site/src/app/routes

.stylelintrc

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,28 @@
1010
"empty-line-between-groups": true
1111
}
1212
],
13-
"declaration-empty-line-before": null,
1413
"selector-type-no-unknown": [
1514
true,
1615
{
1716
"ignoreTypes": ["/^d-/"]
1817
}
1918
],
20-
"function-name-case": null,
21-
"at-rule-no-unknown": null,
22-
"scss/at-rule-no-unknown": true,
19+
"declaration-empty-line-before": null,
2320
"custom-property-pattern": null,
2421
"selector-class-pattern": null
2522
},
2623
"overrides": [
24+
{
25+
"files": ["*.scss", "**/*.scss"],
26+
"rules": {
27+
"at-rule-no-unknown": null,
28+
"scss/at-rule-no-unknown": true
29+
}
30+
},
31+
{
32+
"files": ["*.html", "**/*.html"],
33+
"customSyntax": "postcss-html"
34+
},
2735
{
2836
"files": ["*.md", "**/*.md"],
2937
"customSyntax": "postcss-markdown"

.vscode/recommended-settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"typescript.tsdk": "./node_modules/typescript/lib",
33
"eslint.format.enable": true,
4-
"stylelint.validate": ["css", "html", "scss", "markdown"],
4+
"stylelint.validate": ["css", "scss", "html", "markdown"],
55
"editor.defaultFormatter": "esbenp.prettier-vscode",
66
"editor.formatOnSave": true,
77
"editor.codeActionsOnSave": {

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
"scripts": {
1414
"site:serve": "nx serve site",
1515
"lint:affected": "nx affected:lint --parallel --max-parallel=4",
16+
"lint:affected:fix": "yarn lint:affected --fix",
17+
"lint:style": "stylelint **/*.{css,scss,html,md}",
18+
"lint:style:fix": "yarn lint:style --fix",
1619
"test:affected": "nx affected:test --parallel --max-parallel=2",
1720
"build:affected": "nx affected:build --parallel --max-parallel=2",
1821
"build:ui": "nx build ui",
@@ -82,6 +85,7 @@
8285
"husky": "^7.0.0",
8386
"jest": "^27.3.1",
8487
"marked": "^3.0.4",
88+
"postcss-html": "^1.2.0",
8589
"postcss-markdown": "^1.1.0",
8690
"prettier": "^2.4.1",
8791
"react-test-renderer": "17.0.2",

packages/site/src/app/styles/_app.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ body {
2323
.app-main {
2424
position: absolute;
2525
right: 0;
26-
2726
bottom: 0;
2827

2928
width: calc(100% - 260px);

yarn.lock

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4802,7 +4802,7 @@ domhandler@^2.3.0:
48024802
dependencies:
48034803
domelementtype "1"
48044804

4805-
domhandler@^4.0.0, domhandler@^4.2.0:
4805+
domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.2.2:
48064806
version "4.2.2"
48074807
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
48084808
integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
@@ -4817,7 +4817,7 @@ domutils@^1.5.1, domutils@^1.7.0:
48174817
dom-serializer "0"
48184818
domelementtype "1"
48194819

4820-
domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0:
4820+
domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0, domutils@^2.8.0:
48214821
version "2.8.0"
48224822
resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
48234823
integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
@@ -4948,6 +4948,11 @@ entities@^2.0.0:
49484948
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
49494949
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
49504950

4951+
entities@^3.0.1:
4952+
version "3.0.1"
4953+
resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
4954+
integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
4955+
49514956
enzyme-adapter-react-16@^1.15.6:
49524957
version "1.15.6"
49534958
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz#fd677a658d62661ac5afd7f7f541f141f8085901"
@@ -6440,6 +6445,16 @@ htmlparser2@^6.1.0:
64406445
domutils "^2.5.2"
64416446
entities "^2.0.0"
64426447

6448+
htmlparser2@^7.1.2:
6449+
version "7.2.0"
6450+
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5"
6451+
integrity sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==
6452+
dependencies:
6453+
domelementtype "^2.0.1"
6454+
domhandler "^4.2.2"
6455+
domutils "^2.8.0"
6456+
entities "^3.0.1"
6457+
64436458
http-deceiver@^1.2.7:
64446459
version "1.2.7"
64456460
resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -9378,6 +9393,15 @@ postcss-html@^0.36.0:
93789393
dependencies:
93799394
htmlparser2 "^3.10.0"
93809395

9396+
postcss-html@^1.2.0:
9397+
version "1.2.0"
9398+
resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-1.2.0.tgz#f496939dc9ca7b774326125b4c7038db13d04900"
9399+
integrity sha512-DEuVLHIf8wwqJtLAVGj0ol00PJFB9byPDZF+p56CAC5ktdlF9lFzLdhqbPxBza/jpBYwn17+fGeqvXxYh+h+CQ==
9400+
dependencies:
9401+
htmlparser2 "^7.1.2"
9402+
postcss "^8.3.11"
9403+
postcss-safe-parser "^6.0.0"
9404+
93819405
postcss-import@14.0.2:
93829406
version "14.0.2"
93839407
resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1"

0 commit comments

Comments
 (0)