discourse
/
discourse-adplugin
mirror of https://github.com/discourse/discourse-adplugin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Bump dependencies and fix linting (#236)

This commit is contained in:
David Taylor 2025-02-06 16:42:21 +00:00 committed by GitHub
parent 6aab733bb9
commit 1f70537968
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 768 additions and 612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/assets/javascripts/discourse/components/house-ads-chooser.js
View File

@ -1,6 +1,6 @@
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import { classNames } from "@ember-decorators/component"; import { classNames } from "@ember-decorators/component";
import { makeArray } from "discourse-common/lib/helpers"; import { makeArray } from "discourse/lib/helpers";
import MultiSelectComponent from "select-kit/components/multi-select"; import MultiSelectComponent from "select-kit/components/multi-select";
@classNames("house-ads-chooser") @classNames("house-ads-chooser")

2
admin/assets/javascripts/discourse/components/house-ads-list-setting.js
View File

@ -1,7 +1,7 @@
import { action } from "@ember/object"; import { action } from "@ember/object";
import { mapBy } from "@ember/object/computed"; import { mapBy } from "@ember/object/computed";
import { classNames } from "@ember-decorators/component"; import { classNames } from "@ember-decorators/component";
import { makeArray } from "discourse-common/lib/helpers"; import { makeArray } from "discourse/lib/helpers";
import HouseAdsSetting from "discourse/plugins/discourse-adplugin/discourse/components/house-ads-setting"; import HouseAdsSetting from "discourse/plugins/discourse-adplugin/discourse/components/house-ads-setting";
@classNames("house-ads-setting house-ads-list-setting") @classNames("house-ads-setting house-ads-list-setting")

12
admin/assets/javascripts/discourse/components/house-ads-setting.js
View File

@ -3,8 +3,8 @@ import { action } from "@ember/object";
import { classNames } from "@ember-decorators/component"; import { classNames } from "@ember-decorators/component";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import { i18n, propertyNotEqual } from "discourse/lib/computed"; import { i18n as computedI18n, propertyNotEqual } from "discourse/lib/computed";
import I18n from "I18n"; import { i18n } from "discourse-i18n";
@classNames("house-ads-setting") @classNames("house-ads-setting")
export default class HouseAdsSetting extends Component { export default class HouseAdsSetting extends Component {
@ -12,8 +12,8 @@ export default class HouseAdsSetting extends Component {
saving = false; saving = false;
savingStatus = ""; savingStatus = "";
@i18n("name", "admin.adplugin.house_ads.%@.title") title; @computedI18n("name", "admin.adplugin.house_ads.%@.title") title;
@i18n("name", "admin.adplugin.house_ads.%@.description") help; @computedI18n("name", "admin.adplugin.house_ads.%@.description") help;
@propertyNotEqual("adValue", "value") changed; @propertyNotEqual("adValue", "value") changed;
init() { init() {
@ -26,7 +26,7 @@ export default class HouseAdsSetting extends Component {
if (!this.get("saving")) { if (!this.get("saving")) {
this.setProperties({ this.setProperties({
saving: true, saving: true,
savingStatus: I18n.t("saving"), savingStatus: i18n("saving"),
}); });
ajax(`/admin/plugins/pluginad/house_settings/${this.get("name")}.json`, { ajax(`/admin/plugins/pluginad/house_settings/${this.get("name")}.json`, {
@ -38,7 +38,7 @@ export default class HouseAdsSetting extends Component {
adSettings.set(this.get("name"), this.get("adValue")); adSettings.set(this.get("name"), this.get("adValue"));
this.setProperties({ this.setProperties({
value: this.get("adValue"), value: this.get("adValue"),
savingStatus: I18n.t("saved"), savingStatus: i18n("saved"),
}); });
}) })
.catch(popupAjaxError) .catch(popupAjaxError)

2
admin/assets/javascripts/discourse/components/modal/preview.gjs
View File

@ -1,6 +1,6 @@
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import DModal from "discourse/components/d-modal"; import DModal from "discourse/components/d-modal";
import i18n from "discourse-common/helpers/i18n"; import { i18n } from "discourse-i18n";
const Preview = <template> const Preview = <template>
<DModal <DModal

6
admin/assets/javascripts/discourse/controllers/admin-plugins-house-ads-show.js
View File

@ -7,7 +7,7 @@ import { observes } from "@ember-decorators/object";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import I18n from "I18n"; import { i18n } from "discourse-i18n";
import Preview from "../components/modal/preview"; import Preview from "../components/modal/preview";
export default class adminPluginsHouseAdsShow extends Controller { export default class adminPluginsHouseAdsShow extends Controller {
@ -43,7 +43,7 @@ export default class adminPluginsHouseAdsShow extends Controller {
async save() { async save() {
if (!this.saving) { if (!this.saving) {
this.saving = true; this.saving = true;
this.savingStatus = I18n.t("saving"); this.savingStatus = i18n("saving");
const data = {}; const data = {};
const newRecord = !this.buffered.id; const newRecord = !this.buffered.id;
if (!newRecord) { if (!newRecord) {
@ -66,7 +66,7 @@ export default class adminPluginsHouseAdsShow extends Controller {
data, data,
} }
); );
this.savingStatus = I18n.t("saved"); this.savingStatus = i18n("saved");
const houseAds = this.houseAdsController.model; const houseAds = this.houseAdsController.model;
if (newRecord) { if (newRecord) {
this.buffered.id = ajaxData.house_ad.id; this.buffered.id = ajaxData.house_ad.id;

4
admin/assets/javascripts/discourse/routes/admin-plugins-house-ads-show.js
View File

@ -1,12 +1,12 @@
import { TrackedObject } from "@ember-compat/tracked-built-ins"; import { TrackedObject } from "@ember-compat/tracked-built-ins";
import DiscourseRoute from "discourse/routes/discourse"; import DiscourseRoute from "discourse/routes/discourse";
import I18n from "I18n"; import { i18n } from "discourse-i18n";
export default class AdminPluginsHouseAdsShow extends DiscourseRoute { export default class AdminPluginsHouseAdsShow extends DiscourseRoute {
model(params) { model(params) {
if (params.ad_id === "new") { if (params.ad_id === "new") {
return new TrackedObject({ return new TrackedObject({
name: I18n.t("admin.adplugin.house_ads.new_name"), name: i18n("admin.adplugin.house_ads.new_name"),
html: "", html: "",
visible_to_logged_in_users: true, visible_to_logged_in_users: true,
visible_to_anons: true, visible_to_anons: true,

2
assets/javascripts/discourse/components/ad-component.js
View File

@ -1,7 +1,7 @@
import Component from "@ember/component"; import Component from "@ember/component";
import { alias, or } from "@ember/object/computed"; import { alias, or } from "@ember/object/computed";
import { service } from "@ember/service"; import { service } from "@ember/service";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse/lib/decorators";
import { import {
isNthPost, isNthPost,
isNthTopicListItem, isNthTopicListItem,

2
assets/javascripts/discourse/components/ad-slot.js
View File

@ -2,7 +2,7 @@ import EmberObject from "@ember/object";
import { service } from "@ember/service"; import { service } from "@ember/service";
import { isBlank } from "@ember/utils"; import { isBlank } from "@ember/utils";
import { tagName } from "@ember-decorators/component"; import { tagName } from "@ember-decorators/component";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse/lib/decorators";
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
import { import {
isNthPost, isNthPost,

4
assets/javascripts/discourse/components/adbutler-ad.js
View File

@ -1,8 +1,8 @@
import { scheduleOnce } from "@ember/runloop"; import { scheduleOnce } from "@ember/runloop";
import RSVP from "rsvp"; import RSVP from "rsvp";
import discourseComputed from "discourse/lib/decorators";
import { isTesting } from "discourse/lib/environment";
import loadScript from "discourse/lib/load-script"; import loadScript from "discourse/lib/load-script";
import { isTesting } from "discourse-common/config/environment";
import discourseComputed from "discourse-common/utils/decorators";
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
let _loaded = false, let _loaded = false,

2
assets/javascripts/discourse/components/amazon-product-links.js
View File

@ -1,7 +1,7 @@
import { and } from "@ember/object/computed"; import { and } from "@ember/object/computed";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import { classNames } from "@ember-decorators/component"; import { classNames } from "@ember-decorators/component";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse/lib/decorators";
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
@classNames("amazon-product-links") @classNames("amazon-product-links")

2
assets/javascripts/discourse/components/carbonads-ad.js
View File

@ -1,5 +1,5 @@
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse/lib/decorators";
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
export default class CarbonadsAd extends AdComponent { export default class CarbonadsAd extends AdComponent {

4
assets/javascripts/discourse/components/google-adsense.js
View File

@ -2,9 +2,9 @@ import { scheduleOnce } from "@ember/runloop";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import { classNameBindings } from "@ember-decorators/component"; import { classNameBindings } from "@ember-decorators/component";
import RSVP from "rsvp"; import RSVP from "rsvp";
import discourseComputed from "discourse/lib/decorators";
import { isTesting } from "discourse/lib/environment";
import loadScript from "discourse/lib/load-script"; import loadScript from "discourse/lib/load-script";
import { isTesting } from "discourse-common/config/environment";
import discourseComputed from "discourse-common/utils/decorators";
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
let _loaded = false, let _loaded = false,

4
assets/javascripts/discourse/components/google-dfp-ad.js
View File

@ -2,9 +2,9 @@ import { alias } from "@ember/object/computed";
import { htmlSafe } from "@ember/template"; import { htmlSafe } from "@ember/template";
import { classNameBindings, classNames } from "@ember-decorators/component"; import { classNameBindings, classNames } from "@ember-decorators/component";
import RSVP from "rsvp"; import RSVP from "rsvp";
import discourseComputed, { on } from "discourse/lib/decorators";
import { isTesting } from "discourse/lib/environment";
import loadScript from "discourse/lib/load-script"; import loadScript from "discourse/lib/load-script";
import { isTesting } from "discourse-common/config/environment";
import discourseComputed, { on } from "discourse-common/utils/decorators";
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
let _loaded = false, let _loaded = false,

2
assets/javascripts/discourse/components/house-ad.js
View File

@ -4,7 +4,7 @@ import {
classNameBindings, classNameBindings,
classNames, classNames,
} from "@ember-decorators/component"; } from "@ember-decorators/component";
import discourseComputed from "discourse-common/utils/decorators"; import discourseComputed from "discourse/lib/decorators";
import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component"; import AdComponent from "discourse/plugins/discourse-adplugin/discourse/components/ad-component";
const adIndex = { const adIndex = {

13
package.json
View File

@ -1,15 +1,16 @@
{ {
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"@discourse/lint-configs": "2.2.2", "@discourse/lint-configs": "2.4.0",
"ember-template-lint": "6.0.0", "ember-template-lint": "6.1.0",
"eslint": "9.15.0", "eslint": "9.19.0",
"prettier": "2.8.8" "prettier": "2.8.8"
}, },
"engines": { "engines": {
"node": ">= 18", "node": ">= 22",
"npm": "please-use-pnpm", "npm": "please-use-pnpm",
"yarn": "please-use-pnpm", "yarn": "please-use-pnpm",
"pnpm": ">= 9" "pnpm": "9.x"
} },
"packageManager": "pnpm@9.15.5"
} }

1317
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff