Skip to content

Commit 3efcd37

Browse files
DEV: Bump dependencies and fix linting (#333)
1 parent 9a00198 commit 3efcd37

File tree

7 files changed

+751
-595
lines changed

7 files changed

+751
-595
lines changed

assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import Component from "@glimmer/component";
22
import { action } from "@ember/object";
33
import { service } from "@ember/service";
44
import DButton from "discourse/components/d-button";
5+
import icon from "discourse/helpers/d-icon";
56
import { ajax } from "discourse/lib/ajax";
67
import { popupAjaxError } from "discourse/lib/ajax-error";
7-
import icon from "discourse-common/helpers/d-icon";
88
import { i18n } from "discourse-i18n";
99

1010
export function unacceptAnswer(post, appEvents) {

assets/javascripts/discourse/connectors/topic-navigation/no-answer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { later } from "@ember/runloop";
2-
import { isTesting } from "discourse-common/config/environment";
2+
import { isTesting } from "discourse/lib/environment";
33

44
const ONE_WEEK = 7 * 24 * 60 * 60 * 1000; // milliseconds
55
const MAX_DURATION_WITH_NO_ANSWER = ONE_WEEK;

assets/javascripts/discourse/initializers/add-topic-list-class.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import TopicListItem from "discourse/components/topic-list-item";
2+
import discourseComputed from "discourse/lib/decorators";
3+
import { withSilencedDeprecations } from "discourse/lib/deprecated";
24
import { withPluginApi } from "discourse/lib/plugin-api";
3-
import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
4-
import discourseComputed from "discourse-common/utils/decorators";
55

66
export default {
77
name: "add-topic-list-class",

assets/javascripts/discourse/initializers/extend-for-solved-button.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { computed } from "@ember/object";
22
import discourseComputed from "discourse/lib/decorators";
3+
import { withSilencedDeprecations } from "discourse/lib/deprecated";
4+
import { iconHTML, iconNode } from "discourse/lib/icon-library";
35
import { withPluginApi } from "discourse/lib/plugin-api";
46
import { formatUsername } from "discourse/lib/utilities";
57
import Topic from "discourse/models/topic";
68
import User from "discourse/models/user";
79
import PostCooked from "discourse/widgets/post-cooked";
8-
import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
9-
import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
1010
import { i18n } from "discourse-i18n";
1111
import SolvedAcceptAnswerButton, {
1212
acceptAnswer,

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@discourse/lint-configs": "2.2.2",
5-
"ember-template-lint": "6.0.0",
6-
"eslint": "9.15.0",
4+
"@discourse/lint-configs": "2.4.0",
5+
"ember-template-lint": "6.1.0",
6+
"eslint": "9.19.0",
77
"prettier": "2.8.8"
88
},
99
"engines": {
10-
"node": ">= 18",
10+
"node": ">= 22",
1111
"npm": "please-use-pnpm",
1212
"yarn": "please-use-pnpm",
13-
"pnpm": ">= 9"
14-
}
13+
"pnpm": "9.x"
14+
},
15+
"packageManager": "pnpm@9.15.5"
1516
}

pnpm-lock.yaml

Lines changed: 737 additions & 582 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/javascripts/acceptance/discourse-solved-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { click, fillIn, visit } from "@ember/test-helpers";
22
import { test } from "qunit";
3+
import { cloneJSON } from "discourse/lib/object";
34
import pretender, {
45
fixturesByUrl,
56
response,
67
} from "discourse/tests/helpers/create-pretender";
78
import { acceptance } from "discourse/tests/helpers/qunit-helpers";
8-
import { cloneJSON } from "discourse-common/lib/object";
99
import { postStreamWithAcceptedAnswerExcerpt } from "../helpers/discourse-solved-helpers";
1010

1111
acceptance("Discourse Solved Plugin", function (needs) {

0 commit comments

Comments
 (0)