Skip to content

Commit 1f70537

Browse files
davidtaylorhqdavidtaylorhq
authored
DEV: Bump dependencies and fix linting (#236)
1 parent 6aab733 commit 1f70537

16 files changed

+769
-613
lines changed

‎admin/assets/javascripts/discourse/components/house-ads-chooser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { computed } from "@ember/object";
22
import { classNames } from "@ember-decorators/component";
3-
import { makeArray } from "discourse-common/lib/helpers";
3+
import { makeArray } from "discourse/lib/helpers";
44
import MultiSelectComponent from "select-kit/components/multi-select";
55

66
@classNames("house-ads-chooser")

‎admin/assets/javascripts/discourse/components/house-ads-list-setting.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { action } from "@ember/object";
22
import { mapBy } from "@ember/object/computed";
33
import { classNames } from "@ember-decorators/component";
4-
import { makeArray } from "discourse-common/lib/helpers";
4+
import { makeArray } from "discourse/lib/helpers";
55
import HouseAdsSetting from "discourse/plugins/discourse-adplugin/discourse/components/house-ads-setting";
66

77
@classNames("house-ads-setting house-ads-list-setting")

‎admin/assets/javascripts/discourse/components/house-ads-setting.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ import { action } from "@ember/object";
33
import { classNames } from "@ember-decorators/component";
44
import { ajax } from "discourse/lib/ajax";
55
import { popupAjaxError } from "discourse/lib/ajax-error";
6-
import { i18n, propertyNotEqual } from "discourse/lib/computed";
7-
import I18n from "I18n";
6+
import { i18n as computedI18n, propertyNotEqual } from "discourse/lib/computed";
7+
import { i18n } from "discourse-i18n";
88

99
@classNames("house-ads-setting")
1010
export default class HouseAdsSetting extends Component {
1111
adValue = "";
1212
saving = false;
1313
savingStatus = "";
1414

15-
@i18n("name", "admin.adplugin.house_ads.%@.title") title;
16-
@i18n("name", "admin.adplugin.house_ads.%@.description") help;
15+
@computedI18n("name", "admin.adplugin.house_ads.%@.title") title;
16+
@computedI18n("name", "admin.adplugin.house_ads.%@.description") help;
1717
@propertyNotEqual("adValue", "value") changed;
1818

1919
init() {
@@ -26,7 +26,7 @@ export default class HouseAdsSetting extends Component {
2626
if (!this.get("saving")) {
2727
this.setProperties({
2828
saving: true,
29-
savingStatus: I18n.t("saving"),
29+
savingStatus: i18n("saving"),
3030
});
3131

3232
ajax(`/admin/plugins/pluginad/house_settings/${this.get("name")}.json`, {
@@ -38,7 +38,7 @@ export default class HouseAdsSetting extends Component {
3838
adSettings.set(this.get("name"), this.get("adValue"));
3939
this.setProperties({
4040
value: this.get("adValue"),
41-
savingStatus: I18n.t("saved"),
41+
savingStatus: i18n("saved"),
4242
});
4343
})
4444
.catch(popupAjaxError)

‎admin/assets/javascripts/discourse/components/modal/preview.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { htmlSafe } from "@ember/template";
22
import DModal from "discourse/components/d-modal";
3-
import i18n from "discourse-common/helpers/i18n";
3+
import { i18n } from "discourse-i18n";
44

55
const Preview = <template>
66
<DModal

‎admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { observes } from "@ember-decorators/object";
77
import { ajax } from "discourse/lib/ajax";
88
import { popupAjaxError } from "discourse/lib/ajax-error";
99
import Category from "discourse/models/category";
10-
import I18n from "I18n";
10+
import { i18n } from "discourse-i18n";
1111
import Preview from "../components/modal/preview";
1212

1313
export default class adminPluginsHouseAdsShow extends Controller {
@@ -43,7 +43,7 @@ export default class adminPluginsHouseAdsShow extends Controller {
4343
async save() {
4444
if (!this.saving) {
4545
this.saving = true;
46-
this.savingStatus = I18n.t("saving");
46+
this.savingStatus = i18n("saving");
4747
const data = {};
4848
const newRecord = !this.buffered.id;
4949
if (!newRecord) {
@@ -66,7 +66,7 @@ export default class adminPluginsHouseAdsShow extends Controller {
6666
data,
6767
}
6868
);
69-
this.savingStatus = I18n.t("saved");
69+
this.savingStatus = i18n("saved");
7070
const houseAds = this.houseAdsController.model;
7171
if (newRecord) {
7272
this.buffered.id = ajaxData.house_ad.id;

‎admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { TrackedObject } from "@ember-compat/tracked-built-ins";
22
import DiscourseRoute from "discourse/routes/discourse";
3-
import I18n from "I18n";
3+
import { i18n } from "discourse-i18n";
44

55
export default class AdminPluginsHouseAdsShow extends DiscourseRoute {
66
model(params) {
77
if (params.ad_id === "new") {
88
return new TrackedObject({
9-
name: I18n.t("admin.adplugin.house_ads.new_name"),
9+
name: i18n("admin.adplugin.house_ads.new_name"),
1010
html: "",
1111
visible_to_logged_in_users: true,
1212
visible_to_anons: true,

‎assets/javascripts/discourse/components/ad-component.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Component from "@ember/component";
22
import { alias, or } from "@ember/object/computed";
33
import { service } from "@ember/service";
4-
import discourseComputed from "discourse-common/utils/decorators";
4+
import discourseComputed from "discourse/lib/decorators";
55
import {
66
isNthPost,
77
isNthTopicListItem,

‎assets/javascripts/discourse/components/ad-slot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import EmberObject from "@ember/object";
22
import { service } from "@ember/service";
33
import { isBlank } from "@ember/utils";
44
import { tagName } from "@ember-decorators/component";
5-
import discourseComputed from "discourse-common/utils/decorators";
5+
import discourseComputed from "discourse/lib/decorators";
66
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
77
import {
88
isNthPost,

‎assets/javascripts/discourse/components/adbutler-ad.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { scheduleOnce } from "@ember/runloop";
22
import RSVP from "rsvp";
3+
import discourseComputed from "discourse/lib/decorators";
4+
import { isTesting } from "discourse/lib/environment";
35
import loadScript from "discourse/lib/load-script";
4-
import { isTesting } from "discourse-common/config/environment";
5-
import discourseComputed from "discourse-common/utils/decorators";
66
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
77

88
let _loaded = false,

‎assets/javascripts/discourse/components/amazon-product-links.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { and } from "@ember/object/computed";
22
import { htmlSafe } from "@ember/template";
33
import { classNames } from "@ember-decorators/component";
4-
import discourseComputed from "discourse-common/utils/decorators";
4+
import discourseComputed from "discourse/lib/decorators";
55
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
66

77
@classNames("amazon-product-links")

‎assets/javascripts/discourse/components/carbonads-ad.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { htmlSafe } from "@ember/template";
2-
import discourseComputed from "discourse-common/utils/decorators";
2+
import discourseComputed from "discourse/lib/decorators";
33
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
44

55
export default class CarbonadsAd extends AdComponent {

‎assets/javascripts/discourse/components/google-adsense.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { scheduleOnce } from "@ember/runloop";
22
import { htmlSafe } from "@ember/template";
33
import { classNameBindings } from "@ember-decorators/component";
44
import RSVP from "rsvp";
5+
import discourseComputed from "discourse/lib/decorators";
6+
import { isTesting } from "discourse/lib/environment";
57
import loadScript from "discourse/lib/load-script";
6-
import { isTesting } from "discourse-common/config/environment";
7-
import discourseComputed from "discourse-common/utils/decorators";
88
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
99

1010
let _loaded = false,

‎assets/javascripts/discourse/components/google-dfp-ad.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { alias } from "@ember/object/computed";
22
import { htmlSafe } from "@ember/template";
33
import { classNameBindings, classNames } from "@ember-decorators/component";
44
import RSVP from "rsvp";
5+
import discourseComputed, { on } from "discourse/lib/decorators";
6+
import { isTesting } from "discourse/lib/environment";
57
import loadScript from "discourse/lib/load-script";
6-
import { isTesting } from "discourse-common/config/environment";
7-
import discourseComputed, { on } from "discourse-common/utils/decorators";
88
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
99

1010
let _loaded = false,

‎assets/javascripts/discourse/components/house-ad.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
classNameBindings,
55
classNames,
66
} from "@ember-decorators/component";
7-
import discourseComputed from "discourse-common/utils/decorators";
7+
import discourseComputed from "discourse/lib/decorators";
88
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
99

1010
const adIndex = {

‎package.json

+7-6
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": "[email protected]"
1516
}

0 commit comments

Comments
 (0)