Skip to content

Commit 7a4f808

Browse files
authored
DEV: [gjs-codemod] Convert all templates to gjs (#45)
1 parent b4bd7a5 commit 7a4f808

File tree

8 files changed

+477
-476
lines changed

8 files changed

+477
-476
lines changed

.discourse-compatibility

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
< 3.5.0.beta5-dev: b4bd7a5e2111a27cfa9e9f519a95fbb11dd73f76
12
< 3.5.0.beta3-dev: 0eb683ad9ef868867fb303b9a0935ca1b3ea1036
23
< 3.5.0.beta1-dev: 4c93420363f8c8fa1fb7207cbda4f9a1a9aebb00
34
< 3.4.0.beta4-dev: 01ec1bac8c2b74b59194f9b34d74d222b50e1f7e

Gemfile.lock

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,44 @@ GEM
1414
securerandom (>= 0.3)
1515
tzinfo (~> 2.0, >= 2.0.5)
1616
uri (>= 0.13.1)
17-
ast (2.4.2)
17+
ast (2.4.3)
1818
base64 (0.2.0)
1919
benchmark (0.4.0)
20-
bigdecimal (3.1.9)
20+
bigdecimal (3.2.0)
2121
concurrent-ruby (1.3.5)
22-
connection_pool (2.5.0)
23-
drb (2.2.1)
22+
connection_pool (2.5.3)
23+
drb (2.2.3)
2424
i18n (1.14.7)
2525
concurrent-ruby (~> 1.0)
26-
json (2.10.2)
27-
language_server-protocol (3.17.0.4)
26+
json (2.12.2)
27+
language_server-protocol (3.17.0.5)
2828
lint_roller (1.1.0)
29-
logger (1.6.6)
29+
logger (1.7.0)
3030
minitest (5.25.5)
31-
parallel (1.26.3)
32-
parser (3.3.7.1)
31+
parallel (1.27.0)
32+
parser (3.3.8.0)
3333
ast (~> 2.4.1)
3434
racc
3535
prettier_print (1.2.1)
36+
prism (1.4.0)
3637
racc (1.8.1)
37-
rack (3.1.12)
38+
rack (3.1.15)
3839
rainbow (3.1.1)
3940
regexp_parser (2.10.0)
40-
rubocop (1.74.0)
41+
rubocop (1.75.8)
4142
json (~> 2.3)
4243
language_server-protocol (~> 3.17.0.2)
4344
lint_roller (~> 1.1.0)
4445
parallel (~> 1.10)
4546
parser (>= 3.3.0.2)
4647
rainbow (>= 2.2.2, < 4.0)
4748
regexp_parser (>= 2.9.3, < 3.0)
48-
rubocop-ast (>= 1.38.0, < 2.0)
49+
rubocop-ast (>= 1.44.0, < 2.0)
4950
ruby-progressbar (~> 1.7)
5051
unicode-display_width (>= 2.4.0, < 4.0)
51-
rubocop-ast (1.38.1)
52-
parser (>= 3.3.1.0)
52+
rubocop-ast (1.44.1)
53+
parser (>= 3.3.7.2)
54+
prism (~> 1.4)
5355
rubocop-capybara (2.22.1)
5456
lint_roller (~> 1.1)
5557
rubocop (~> 1.72, >= 1.72.1)
@@ -65,13 +67,13 @@ GEM
6567
rubocop-factory_bot (2.27.1)
6668
lint_roller (~> 1.1)
6769
rubocop (~> 1.72, >= 1.72.1)
68-
rubocop-rails (2.30.3)
70+
rubocop-rails (2.32.0)
6971
activesupport (>= 4.2.0)
7072
lint_roller (~> 1.1)
7173
rack (>= 1.1)
72-
rubocop (>= 1.72.1, < 2.0)
73-
rubocop-ast (>= 1.38.0, < 2.0)
74-
rubocop-rspec (3.5.0)
74+
rubocop (>= 1.75.0, < 2.0)
75+
rubocop-ast (>= 1.44.0, < 2.0)
76+
rubocop-rspec (3.6.0)
7577
lint_roller (~> 1.1)
7678
rubocop (~> 1.72, >= 1.72.1)
7779
rubocop-rspec_rails (2.31.0)
@@ -98,4 +100,4 @@ DEPENDENCIES
98100
syntax_tree
99101

100102
BUNDLED WITH
101-
2.6.6
103+
2.6.9

common/common.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
margin-bottom: 10px;
1515
}
1616

17-
@media screen and (min-width: 650px) {
17+
@media screen and (width >= 650px) {
1818
.navigation-topics,
1919
.categories-list,
2020
.tags-page,
@@ -50,7 +50,7 @@
5050
display: block;
5151
}
5252

53-
@media screen and (max-width: 920px) {
53+
@media screen and (width <= 920px) {
5454
display: none;
5555
}
5656
}
@@ -74,7 +74,7 @@
7474
"sidebar topic-list nav";
7575
}
7676

77-
@media screen and (max-width: 920px) {
77+
@media screen and (width <= 920px) {
7878
@if $sidebar-alignment == "left" {
7979
grid-template-columns: 20% calc(80% - 1em);
8080
grid-template-areas:
@@ -337,7 +337,7 @@ body {
337337
}
338338

339339
.btn-default {
340-
background: rgba(255, 255, 255, 0.7);
340+
background: rgb(255, 255, 255, 0.7);
341341
border: 1px solid $border-color;
342342

343343
.discourse-no-touch & {
@@ -359,7 +359,7 @@ body {
359359
.topic-footer-main-buttons
360360
.topic-admin-menu-button-container {
361361
.btn {
362-
background: rgba(255, 255, 255, 0.7);
362+
background: rgb(255, 255, 255, 0.7);
363363

364364
.discourse-no-touch & {
365365
&:hover {
@@ -370,7 +370,7 @@ body {
370370
}
371371

372372
.widget-button.btn.popup-menu-button.toggle-admin-menu.keyboard-target-admin-menu.no-text.btn-icon {
373-
background: rgba(255, 255, 255, 0.7);
373+
background: rgb(255, 255, 255, 0.7);
374374

375375
.discourse-no-touch & {
376376
&:hover {
@@ -432,9 +432,9 @@ body {
432432
.nav-pills > li > a:hover,
433433
.nav-pills > li.active > a,
434434
.nav-pills > li > a.active {
435-
background: rgba(255, 255, 255, 0.7);
435+
background: rgb(255, 255, 255, 0.7);
436436
border-radius: 2px;
437-
border: 1px solid rgba(0, 0, 0, 0.12);
437+
border: 1px solid rgb(0, 0, 0, 0.12);
438438
color: #333;
439439
}
440440

@@ -467,7 +467,7 @@ body {
467467

468468
.d-header-icons .icon:hover,
469469
.d-header-icons .icon:focus {
470-
background: rgba(255, 255, 255, 0.7);
470+
background: rgb(255, 255, 255, 0.7);
471471
}
472472

473473
.user-menu .quick-access-panel li:hover,
@@ -496,7 +496,7 @@ body {
496496
position: sticky;
497497
max-width: 310px;
498498

499-
@media screen and (max-width: 920px) {
499+
@media screen and (width <= 920px) {
500500
display: none;
501501
}
502502

desktop/desktop.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@include fb-background;
3535
}
3636

37-
@media screen and (max-width: 775px) {
37+
@media screen and (width <= 775px) {
3838
width: calc(100% - 60px);
3939
}
4040
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@discourse/lint-configs": "2.11.1",
5-
"ember-template-lint": "7.0.1",
6-
"eslint": "9.22.0",
4+
"@discourse/lint-configs": "2.21.0",
5+
"ember-template-lint": "7.7.0",
6+
"eslint": "9.27.0",
77
"prettier": "3.5.3",
8-
"stylelint": "16.16.0"
8+
"stylelint": "16.19.1"
99
},
1010
"engines": {
1111
"node": ">= 22",

0 commit comments

Comments
 (0)