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
2 changes: 1 addition & 1 deletion javascripts/discourse/components/topic-list-thumbnail.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import Component from "@glimmer/component";
import { service } from "@ember/service";
import coldAgeClass from "discourse/helpers/cold-age-class";
import concatClass from "discourse/helpers/concat-class";
import dIcon from "discourse/helpers/d-icon";
import formatDate from "discourse/helpers/format-date";
import dIcon from "discourse-common/helpers/d-icon";

export default class TopicListThumbnail extends Component {
@service topicThumbnails;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { readOnly } from "@ember/object/computed";
import { service } from "@ember/service";
import { observes } from "discourse/lib/decorators";
import { withSilencedDeprecations } from "discourse/lib/deprecated";
import { withPluginApi } from "discourse/lib/plugin-api";
import { withSilencedDeprecations } from "discourse-common/lib/deprecated";
import {
getResolverOption,
setResolverOption,
} from "discourse-common/resolver";
import { observes } from "discourse-common/utils/decorators";
import { getResolverOption, setResolverOption } from "discourse/resolver";
export default {
name: "topic-thumbnails-init",
initialize() {
Expand Down
2 changes: 1 addition & 1 deletion javascripts/discourse/raw-views/topic-list-thumbnail.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import EmberObject from "@ember/object";
import { and } from "@ember/object/computed";
import { service } from "@ember/service";
import discourseComputed from "discourse-common/utils/decorators";
import discourseComputed from "discourse/lib/decorators";

export default class TopicListThumbnail extends EmberObject {
@service("topic-thumbnails") topicThumbnailsService;
Expand Down
2 changes: 1 addition & 1 deletion javascripts/discourse/services/topic-thumbnails.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { tracked } from "@glimmer/tracking";
import { dependentKeyCompat } from "@ember/object/compat";
import Service, { service } from "@ember/service";
import discourseComputed from "discourse/lib/decorators";
import Site from "discourse/models/site";
import discourseComputed from "discourse-common/utils/decorators";

const minimalGridCategories = settings.minimal_grid_categories
.split("|")
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]"
}
Loading