Skip to content

Commit 05c5546

Browse files
DEV: Update linting (#22)
1 parent 6848c15 commit 05c5546

File tree

9 files changed

+1358
-705
lines changed

9 files changed

+1358
-705
lines changed

.eslintrc

Lines changed: 0 additions & 8 deletions
This file was deleted.

.eslintrc.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/eslint-theme");

.prettierrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.prettierrc.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/prettier");

.template-lintrc.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/template-lint");

.template-lintrc.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

javascripts/discourse/initializers/initialize-for-header-icon-links.gjs

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1+
import { dasherize } from "@ember/string";
12
import { withPluginApi } from "discourse/lib/plugin-api";
23
import icon from "discourse-common/helpers/d-icon";
3-
import { dasherize } from "@ember/string";
44
import isValidUrl from "../lib/isValidUrl";
55

66
function buildIcon(iconNameOrImageUrl, title) {
77
if (isValidUrl(iconNameOrImageUrl)) {
88
return <template>
9-
<img src="{{iconNameOrImageUrl}}" aria-hidden="true"/>
9+
<img src={{iconNameOrImageUrl}} aria-hidden="true" />
1010
<span class="sr-only">{{title}}</span>
11-
</template>
11+
</template>;
1212
} else {
13-
return <template>{{icon iconNameOrImageUrl label=title}}</template>
13+
return <template>{{icon iconNameOrImageUrl label=title}}</template>;
1414
}
1515
}
1616

@@ -34,21 +34,27 @@ export default {
3434
link === links[links.length - 1] ? "last-custom-icon" : "";
3535

3636
const iconComponent = <template>
37-
<li class="custom-header-icon-link {{className}} {{viewClass}} {{isLastLink}}">
38-
<a class="icon btn-flat"
39-
href={{href}}
40-
title={{title}}
41-
target={{target}}
42-
rel={{rel}}
37+
<li
38+
class="custom-header-icon-link
39+
{{className}}
40+
{{viewClass}}
41+
{{isLastLink}}"
42+
>
43+
<a
44+
class="icon btn-flat"
45+
href={{href}}
46+
title={{title}}
47+
target={{target}}
48+
rel={{rel}}
4349
>
4450
{{iconTemplate}}
4551
</a>
4652
</li>
47-
</template>
53+
</template>;
4854

49-
const beforeIcon = ['chat', 'search', 'hamburger', 'user-menu']
55+
const beforeIcon = ["chat", "search", "hamburger", "user-menu"];
5056

51-
api.headerIcons.add(title, iconComponent, { before: beforeIcon })
57+
api.headerIcons.add(title, iconComponent, { before: beforeIcon });
5258
});
5359
} catch (error) {
5460
// eslint-disable-next-line no-console

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"name": "discourse-icon-header-links",
3-
"version": "1.0.0",
4-
"repository": "https://github.com/discourse/discourse-icon-header-links",
5-
"author": "Discourse",
6-
"license": "GPL-2.0-or-later",
2+
"private": true,
73
"devDependencies": {
8-
"eslint-config-discourse": "^3.2.0"
4+
"@discourse/lint-configs": "^1.3.7",
5+
"ember-template-lint": "^5.13.0",
6+
"eslint": "^8.56.0",
7+
"prettier": "^2.8.8"
98
}
109
}

yarn.lock

Lines changed: 1331 additions & 673 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)