Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { service } from "@ember/service";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";

export default {
setupComponent() {
Expand Down
4 changes: 2 additions & 2 deletions javascripts/discourse/components/category-list.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Component from "@glimmer/component";
import Category from "discourse/models/category";
import I18n from "I18n";
import { i18n } from "discourse-i18n";

export default class CategoryList extends Component {
constructor() {
super(...arguments);
this.blockTitle =
this.args?.params?.title || I18n.t(themePrefix("category_list.heading"));
this.args?.params?.title || i18n(themePrefix("category_list.heading"));

this.categoryList = this.args?.params?.id.split(",");
if (!this.categoryList) {
Expand Down
2 changes: 1 addition & 1 deletion javascripts/discourse/components/category-topics.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Component from "@glimmer/component";
import { tracked } from "@glimmer/tracking";
import { service } from "@ember/service";
import getURL from "discourse/lib/get-url";
import Category from "discourse/models/category";
import getURL from "discourse-common/lib/get-url";

export default class CategoryTopics extends Component {
@service store;
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.2.2",
"ember-template-lint": "6.0.0",
"eslint": "9.15.0",
"@discourse/lint-configs": "2.4.0",
"ember-template-lint": "6.1.0",
"eslint": "9.19.0",
"prettier": "2.8.8"
},
"engines": {
"node": ">= 18",
"node": ">= 22",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": ">= 9"
}
"pnpm": "9.x"
},
"packageManager": "[email protected]"
}
1,319 changes: 737 additions & 582 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/acceptance/category-topics-test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { visit } from "@ember/test-helpers";
import { test } from "qunit";
import { cloneJSON } from "discourse/lib/object";
import discoveryFixture from "discourse/tests/fixtures/discovery-fixtures";
import { acceptance, visible } from "discourse/tests/helpers/qunit-helpers";
import { cloneJSON } from "discourse-common/lib/object";

acceptance("Right Sidebar - Category Topics", function (needs) {
const blocksJSON = [
Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/right-sidebar-test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { visit } from "@ember/test-helpers";
import { test } from "qunit";
import { cloneJSON } from "discourse/lib/object";
import discoveryFixture from "discourse/tests/fixtures/discovery-fixtures";
import { acceptance, visible } from "discourse/tests/helpers/qunit-helpers";
import { cloneJSON } from "discourse-common/lib/object";

acceptance("Right Sidebar", function () {
test("Viewing latest", async function (assert) {
Expand Down