Skip to content

DEV: Update linting and add types #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidtaylorhq merged 1 commit into from
Jan 29, 2026
Merged

DEV: Update linting and add types #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
.discourse-site
.eslintcache
54 changes: 28 additions & 26 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,82 +1,84 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (8.0.3)
activesupport (8.1.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
json
logger (>= 1.4.2)
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
ast (2.4.3)
base64 (0.3.0)
benchmark (0.4.1)
bigdecimal (3.3.0)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
bigdecimal (4.0.1)
concurrent-ruby (1.3.6)
connection_pool (3.0.2)
drb (2.2.3)
i18n (1.14.7)
i18n (1.14.8)
concurrent-ruby (~> 1.0)
json (2.15.1)
json (2.18.0)
language_server-protocol (3.17.0.5)
lint_roller (1.1.0)
logger (1.7.0)
minitest (5.26.0)
minitest (6.0.1)
prism (~> 1.5)
parallel (1.27.0)
parser (3.3.9.0)
parser (3.3.10.1)
ast (~> 2.4.1)
racc
prettier_print (1.2.1)
prism (1.5.1)
prism (1.9.0)
racc (1.8.1)
rack (3.2.3)
rack (3.2.4)
rainbow (3.1.1)
regexp_parser (2.11.3)
rubocop (1.81.1)
rubocop (1.84.0)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.47.1, < 2.0)
rubocop-ast (>= 1.49.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.47.1)
rubocop-ast (1.49.0)
parser (>= 3.3.7.2)
prism (~> 1.4)
prism (~> 1.7)
rubocop-capybara (2.22.1)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-discourse (3.13.3)
rubocop-discourse (3.14.0)
activesupport (>= 6.1)
lint_roller (>= 1.1.0)
rubocop (>= 1.73.2)
rubocop-capybara (>= 2.22.0)
rubocop-discourse-base (>= 1.0.0)
rubocop-factory_bot (>= 2.27.0)
rubocop-rails (>= 2.30.3)
rubocop-rspec (>= 3.0.1)
rubocop-rspec_rails (>= 2.31.0)
rubocop-factory_bot (2.27.1)
rubocop-discourse-base (1.0.0)
rubocop (>= 1.80.0)
rubocop-factory_bot (2.28.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rails (2.33.4)
rubocop-rails (2.34.3)
activesupport (>= 4.2.0)
lint_roller (~> 1.1)
rack (>= 1.1)
rubocop (>= 1.75.0, < 2.0)
rubocop-ast (>= 1.44.0, < 2.0)
rubocop-rspec (3.7.0)
rubocop-rspec (3.9.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec_rails (2.31.0)
rubocop (~> 1.81)
rubocop-rspec_rails (2.32.0)
lint_roller (~> 1.1)
rubocop (~> 1.72, >= 1.72.1)
rubocop-rspec (~> 3.5)
Expand All @@ -88,8 +90,8 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.1.0)
uri (1.0.4)
unicode-emoji (4.2.0)
uri (1.1.1)

PLATFORMS
arm64-darwin-23
Expand All @@ -100,4 +102,4 @@ DEPENDENCIES
syntax_tree

BUNDLED WITH
2.7.2
4.0.4
12 changes: 6 additions & 6 deletions common/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
.topic-list-body {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
grid-column-gap: 5px;
grid-row-gap: 5px;
column-gap: 5px;
row-gap: 5px;
border: 0;
}

Expand Down Expand Up @@ -205,8 +205,8 @@
.topic-list-body {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(30%, 1fr));
grid-column-gap: 1.5em;
grid-row-gap: 1.5em;
column-gap: 1.5em;
row-gap: 1.5em;
border: 0;
}

Expand Down Expand Up @@ -341,8 +341,8 @@
.topic-list-body {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(48%, 1fr));
grid-column-gap: 1.5em;
grid-row-gap: 1.5em;
column-gap: 1.5em;
row-gap: 1.5em;
border: 0;
}

Expand Down
4 changes: 1 addition & 3 deletions javascripts/discourse/connectors/before-topic-list-body/topic-list-masonry-styles.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ export default class TopicListMasonryStyles extends Component {
<template>
{{#if this.topicThumbnails.displayMasonry}}
{{! template-lint-disable no-forbidden-elements }}
<style
{{this.attachResizeObserver}}
>
<style {{this.attachResizeObserver}}>
{{this.masonryStyle}}
</style>
{{/if}}
Expand Down
4 changes: 2 additions & 2 deletions mobile/mobile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@

.topic-thumbnails-minimal {
.topic-list-body {
grid-column-gap: 10px;
grid-row-gap: 5px;
column-gap: 10px;
row-gap: 5px;

.topic-list-item {
height: 150px;
Expand Down
30 changes: 23 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.32.0",
"ember-template-lint": "7.9.1",
"eslint": "9.37.0",
"prettier": "3.6.2",
"stylelint": "16.25.0"
"@discourse/lint-configs": "2.37.2",
"@glint/ember-tsc": "1.0.9",
"concurrently": "^9.2.1",
"discourse": "npm:@discourse/types@2026.1.0-2709d36",
"ember-template-lint": "7.9.3",
"eslint": "9.39.2",
"prettier": "3.8.0",
"stylelint": "17.0.0"
},
"scripts": {
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
"lint:css": "pnpm stylelint {javascripts,desktop,mobile,common,scss}/**/*.scss --allow-empty-input",
"lint:css:fix": "pnpm stylelint {javascripts,desktop,mobile,common,scss}/**/*.scss --fix --allow-empty-input",
"lint:js": "eslint {javascripts,test} --cache --no-error-on-unmatched-pattern",
"lint:js:fix": "eslint {javascripts,test} --fix --no-error-on-unmatched-pattern",
"lint:hbs": "ember-template-lint javascripts/**/*.gjs --no-error-on-unmatched-pattern",
"lint:hbs:fix": "ember-template-lint javascripts/**/*.gjs --fix --no-error-on-unmatched-pattern",
"lint:prettier": "pnpm prettier {javascripts,desktop,mobile,common,scss}/**/*.scss {javascripts,test}/**/*.{js,gjs} --check --no-error-on-unmatched-pattern",
"lint:prettier:fix": "pnpm prettier {javascripts,desktop,mobile,common,scss}/**/*.scss {javascripts,test}/**/*.{js,gjs} -w --no-error-on-unmatched-pattern",
"lint:types": "ember-tsc -b"
},
"engines": {
"node": ">= 22",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": "9.x"
"pnpm": "^10"
},
"packageManager": "pnpm@9.15.5"
"packageManager": "pnpm@10.28.0"
}
Loading