Skip to content

Commit 84e23fe

Browse files
committed
add stylelint to turbo, full-check and CI
1 parent 1cb4f14 commit 84e23fe

4 files changed

Lines changed: 23 additions & 6 deletions

File tree

.github/workflows/monkey-ci.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
should-build-be: ${{ steps.export-changes.outputs.should-build-be }}
3131
should-build-fe: ${{ steps.export-changes.outputs.should-build-fe }}
3232
should-build-pkg: ${{ steps.export-changes.outputs.should-build-pkg }}
33-
assets-json: ${{ steps.export-changes.outputs.assets-json }}
33+
assetsAndStyles: ${{ steps.export-changes.outputs.assetsAndStyles }}
3434

3535
steps:
3636
- name: Full checkout
@@ -43,8 +43,9 @@ jobs:
4343
id: filter
4444
with:
4545
filters: |
46-
json:
46+
assetsAndStyles:
4747
- 'frontend/static/**/*'
48+
- '**/*.{scss,css}'
4849
be-src:
4950
- 'backend/**/*.{ts,js,json,lua,css,html}'
5051
- 'backend/package.json'
@@ -72,13 +73,13 @@ jobs:
7273
echo "should-build-pkg=${{ steps.filter.outputs.pkg-src }}" >> $GITHUB_OUTPUT
7374
echo "should-build-be=${{ steps.filter.outputs.be-src }}" >> $GITHUB_OUTPUT
7475
echo "should-build-fe=${{ steps.filter.outputs.fe-src }}" >> $GITHUB_OUTPUT
75-
echo "assets-json=${{ steps.filter.outputs.json }}" >> $GITHUB_OUTPUT
76+
echo "assetsAndStyles=${{ steps.filter.outputs.assetsAndStyles }}" >> $GITHUB_OUTPUT
7677
7778
prime-cache:
7879
name: prime-cache
7980
runs-on: ubuntu-latest
8081
needs: [pre-ci]
81-
if: needs.pre-ci.outputs.should-build-be == 'true' || needs.pre-ci.outputs.should-build-fe == 'true' || needs.pre-ci.outputs.should-build-pkg == 'true' || needs.pre-ci.outputs.assets-json == 'true' || contains(github.event.pull_request.labels.*.name, 'force-full-ci')
82+
if: needs.pre-ci.outputs.should-build-be == 'true' || needs.pre-ci.outputs.should-build-fe == 'true' || needs.pre-ci.outputs.should-build-pkg == 'true' || needs.pre-ci.outputs.assetsAndStyles == 'true' || contains(github.event.pull_request.labels.*.name, 'force-full-ci')
8283
steps:
8384
- name: Checkout pnpm-lock
8485
uses: actions/checkout@v4
@@ -224,7 +225,7 @@ jobs:
224225
name: ci-assets
225226
needs: [pre-ci, prime-cache]
226227
runs-on: ubuntu-latest
227-
if: needs.pre-ci.outputs.assets-json == 'true' || contains(github.event.pull_request.labels.*.name, 'force-full-ci')
228+
if: needs.pre-ci.outputs.assetsAndStyles == 'true' || contains(github.event.pull_request.labels.*.name, 'force-full-ci')
228229
steps:
229230
- uses: actions/checkout@v4
230231
with:
@@ -236,6 +237,10 @@ jobs:
236237
id: filter
237238
with:
238239
filters: |
240+
styles:
241+
- '**/*.{scss,css}'
242+
json:
243+
- 'frontend/static/**/*.json'
239244
languages:
240245
- 'frontend/static/languages/**'
241246
quotes:
@@ -273,7 +278,12 @@ jobs:
273278
- name: Install dependencies
274279
run: pnpm install
275280

281+
- name: Lint styles
282+
if: steps.filter.outputs.styles == 'true'
283+
run: npm run lint-styles
284+
276285
- name: Lint JSON
286+
if: steps.filter.outputs.json == 'true'
277287
run: npm run lint-json-assets
278288

279289
- name: Validate language assets

frontend/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"scripts": {
77
"lint": "oxlint . --type-aware --type-check",
88
"lint-fast": "oxlint .",
9+
"lint-styles": "stylelint \"**/*.{scss,css}\"",
10+
"lint-styles-fix": "stylelint \"**/*.{scss,css}\" --fix",
911
"lint-json": "eslint static/**/*.json",
1012
"check-assets": "tsx ./scripts/check-assets.ts",
1113
"audit": "vite-bundle-visualizer",

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "module",
77
"scripts": {
88
"preinstall": "npx only-allow pnpm",
9-
"full-check": "turbo lint build test integration-test check-assets --force",
9+
"full-check": "turbo lint build test integration-test lint-styles lint-json check-assets --force",
1010
"prepare": "husky install",
1111
"pre-commit": "lint-staged",
1212
"ts-check": "turbo run ts-check",
@@ -49,6 +49,8 @@
4949
"hotfix-dry": "monkeytype-release --hotfix --dry",
5050
"format-check": "oxfmt . --check",
5151
"format-fix": "oxfmt .",
52+
"lint-styles": "stylelint \"**/*.{scss,css}\"",
53+
"lint-styles-fix": "stylelint \"**/*.{scss,css}\" --fix",
5254
"lint-json-assets": "turbo lint-json --filter @monkeytype/frontend",
5355
"check-assets": "turbo check-assets --filter @monkeytype/frontend",
5456
"check-assets-quotes": "turbo check-assets --filter @monkeytype/frontend -- quotes",

turbo.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
4242
"@monkeytype/frontend#check-assets": {
4343
"dependsOn": ["^parallel", "@monkeytype/schemas#build"]
4444
},
45+
"//#lint-styles": {
46+
"dependsOn": ["^parallel"]
47+
},
4548
"@monkeytype/frontend#lint-json": {
4649
"dependsOn": ["^parallel"]
4750
},

0 commit comments

Comments
 (0)