Skip to content

Commit d33cf29

Browse files
CvXCvX
authored
DEV: Update linting (#189)
1 parent a3883d2 commit d33cf29

File tree

62 files changed

+2425
-1922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2425
-1922
lines changed

‎.eslintrc

-6
This file was deleted.

‎.eslintrc.cjs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/eslint");

‎.prettierrc

-1
This file was deleted.

‎.prettierrc.cjs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/prettier");

‎.template-lintrc.cjs

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("@discourse/lint-configs/template-lint");

‎.template-lintrc.js

-4
This file was deleted.

‎Gemfile.lock

+31-21
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,45 @@ GEM
88
remote: https://rubygems.org/
99
specs:
1010
ast (2.4.2)
11-
json (2.6.2)
12-
parallel (1.22.1)
13-
parser (3.1.2.1)
11+
json (2.7.1)
12+
language_server-protocol (3.17.0.3)
13+
parallel (1.24.0)
14+
parser (3.3.0.4)
1415
ast (~> 2.4.1)
15-
prettier_print (1.2.0)
16+
racc
17+
prettier_print (1.2.1)
18+
racc (1.7.3)
1619
rainbow (3.1.1)
17-
regexp_parser (2.6.0)
18-
rexml (3.2.5)
19-
rubocop (1.36.0)
20+
regexp_parser (2.9.0)
21+
rexml (3.2.6)
22+
rubocop (1.60.0)
2023
json (~> 2.3)
24+
language_server-protocol (>= 3.17.0)
2125
parallel (~> 1.10)
22-
parser (>= 3.1.2.1)
26+
parser (>= 3.3.0.2)
2327
rainbow (>= 2.2.2, < 4.0)
2428
regexp_parser (>= 1.8, < 3.0)
2529
rexml (>= 3.2.5, < 4.0)
26-
rubocop-ast (>= 1.20.1, < 2.0)
30+
rubocop-ast (>= 1.30.0, < 2.0)
2731
ruby-progressbar (~> 1.7)
28-
unicode-display_width (>= 1.4.0, < 3.0)
29-
rubocop-ast (1.21.0)
30-
parser (>= 3.1.1.0)
31-
rubocop-discourse (3.0)
32-
rubocop (>= 1.1.0)
33-
rubocop-rspec (>= 2.0.0)
34-
rubocop-rspec (2.13.2)
35-
rubocop (~> 1.33)
36-
ruby-progressbar (1.11.0)
37-
syntax_tree (5.1.0)
32+
unicode-display_width (>= 2.4.0, < 3.0)
33+
rubocop-ast (1.30.0)
34+
parser (>= 3.2.1.0)
35+
rubocop-capybara (2.20.0)
36+
rubocop (~> 1.41)
37+
rubocop-discourse (3.6.0)
38+
rubocop (>= 1.59.0)
39+
rubocop-rspec (>= 2.25.0)
40+
rubocop-factory_bot (2.25.1)
41+
rubocop (~> 1.41)
42+
rubocop-rspec (2.26.1)
43+
rubocop (~> 1.40)
44+
rubocop-capybara (~> 2.17)
45+
rubocop-factory_bot (~> 2.22)
46+
ruby-progressbar (1.13.0)
47+
syntax_tree (6.2.0)
3848
prettier_print (>= 1.2.0)
39-
unicode-display_width (2.3.0)
49+
unicode-display_width (2.5.0)
4050

4151
PLATFORMS
4252
ruby
@@ -47,4 +57,4 @@ DEPENDENCIES
4757
translations-manager!
4858

4959
BUNDLED WITH
50-
2.3.4
60+
2.5.4

‎assets/javascripts/discourse/components/campaign-banner.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import Component from "@ember/component";
12
import { action } from "@ember/object";
2-
import { ajax } from "discourse/lib/ajax";
33
import { equal } from "@ember/object/computed";
4-
import { setting } from "discourse/lib/computed";
5-
import Component from "@ember/component";
6-
import discourseComputed, { observes } from "discourse-common/utils/decorators";
74
import { later } from "@ember/runloop";
85
import { inject as service } from "@ember/service";
6+
import { ajax } from "discourse/lib/ajax";
7+
import { setting } from "discourse/lib/computed";
8+
import discourseComputed, { observes } from "discourse-common/utils/decorators";
99

1010
const SIDEBAR_BODY_CLASS = "subscription-campaign-sidebar";
1111

@@ -96,6 +96,7 @@ export default Component.extend({
9696
},
9797

9898
willDestroyElement() {
99+
this._super(...arguments);
99100
document.body.classList.remove(SIDEBAR_BODY_CLASS);
100101
},
101102

‎assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import DButton from "discourse/components/d-button";
2-
import DModal from "discourse/components/d-modal";
31
import Component from "@glimmer/component";
2+
import { tracked } from "@glimmer/tracking";
3+
import { Input } from "@ember/component";
44
import { fn, hash } from "@ember/helper";
5+
import DButton from "discourse/components/d-button";
6+
import DModal from "discourse/components/d-modal";
57
import i18n from "discourse-common/helpers/i18n";
6-
import { Input } from "@ember/component";
7-
import { tracked } from "@glimmer/tracking";
88

99
export default class AdminCancelSubscription extends Component {
1010
@tracked refund;

‎assets/javascripts/discourse/components/product-list.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import discourseComputed from "discourse-common/utils/decorators";
2-
import { isEmpty } from "@ember/utils";
31
import Component from "@ember/component";
2+
import { isEmpty } from "@ember/utils";
3+
import discourseComputed from "discourse-common/utils/decorators";
44

55
export default Component.extend({
66
classNames: ["product-list"],

‎assets/javascripts/discourse/components/subscribe-ca-province-select.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import ComboBoxComponent from "select-kit/components/combo-box";
21
import { computed } from "@ember/object";
32
import I18n from "I18n";
3+
import ComboBoxComponent from "select-kit/components/combo-box";
44

55
export default ComboBoxComponent.extend({
66
pluginApiIdentifiers: ["subscribe-ca-province-select"],

‎assets/javascripts/discourse/components/subscribe-card.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,8 @@ export default Component.extend({
2424
},
2525
});
2626
},
27-
didDestroyElement() {},
27+
28+
didDestroyElement() {
29+
this._super(...arguments);
30+
},
2831
});

‎assets/javascripts/discourse/components/subscribe-country-select.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import ComboBoxComponent from "select-kit/components/combo-box";
21
import { computed } from "@ember/object";
32
import I18n from "I18n";
3+
import ComboBoxComponent from "select-kit/components/combo-box";
44

55
export default ComboBoxComponent.extend({
66
pluginApiIdentifiers: ["subscribe-country-select"],

‎assets/javascripts/discourse/components/subscribe-us-state-select.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import ComboBoxComponent from "select-kit/components/combo-box";
21
import { computed } from "@ember/object";
32
import I18n from "I18n";
3+
import ComboBoxComponent from "select-kit/components/combo-box";
44

55
export default ComboBoxComponent.extend({
66
pluginApiIdentifiers: ["subscribe-us-state-select"],

‎assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions-coupons.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Controller from "@ember/controller";
2-
import AdminCoupon from "discourse/plugins/discourse-subscriptions/discourse/models/admin-coupon";
32
import { popupAjaxError } from "discourse/lib/ajax-error";
3+
import AdminCoupon from "discourse/plugins/discourse-subscriptions/discourse/models/admin-coupon";
44

55
export default Controller.extend({
66
creating: null,

‎assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions-plans-show.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Controller from "@ember/controller";
2-
import { popupAjaxError } from "discourse/lib/ajax-error";
32
import { inject as service } from "@ember/service";
3+
import { popupAjaxError } from "discourse/lib/ajax-error";
44

55
export default Controller.extend({
66
router: service(),

‎assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions-products-show-plans-show.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import discourseComputed from "discourse-common/utils/decorators";
2-
import DiscourseURL from "discourse/lib/url";
31
import Controller from "@ember/controller";
42
import { alias } from "@ember/object/computed";
53
import { popupAjaxError } from "discourse/lib/ajax-error";
4+
import DiscourseURL from "discourse/lib/url";
5+
import discourseComputed from "discourse-common/utils/decorators";
66

77
const RECURRING = "recurring";
88
const ONE_TIME = "one_time";

‎assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions-products-show.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { popupAjaxError } from "discourse/lib/ajax-error";
21
import Controller from "@ember/controller";
32
import { inject as service } from "@ember/service";
3+
import { popupAjaxError } from "discourse/lib/ajax-error";
44

55
export default Controller.extend({
66
router: service(),

‎assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions-subscriptions.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import AdminCancelSubscription from "../components/modal/admin-cancel-subscription";
2-
import AdminSubscription from "../models/admin-subscription";
31
import Controller from "@ember/controller";
42
import { action } from "@ember/object";
53
import { inject as service } from "@ember/service";
64
import I18n from "discourse-i18n";
5+
import AdminCancelSubscription from "../components/modal/admin-cancel-subscription";
6+
import AdminSubscription from "../models/admin-subscription";
77

88
export default Controller.extend({
99
modal: service(),

‎assets/javascripts/discourse/controllers/admin-plugins-discourse-subscriptions.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import Controller from "@ember/controller";
12
import { action } from "@ember/object";
3+
import { inject as service } from "@ember/service";
4+
import { htmlSafe } from "@ember/template";
25
import { ajax } from "discourse/lib/ajax";
36
import { popupAjaxError } from "discourse/lib/ajax-error";
4-
import Controller from "@ember/controller";
57
import discourseComputed from "discourse-common/utils/decorators";
68
import I18n from "I18n";
7-
import { inject as service } from "@ember/service";
8-
import { htmlSafe } from "@ember/template";
99

1010
export default Controller.extend({
1111
loading: false,

‎assets/javascripts/discourse/controllers/subscribe-index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Controller from "@ember/controller";
2-
import discourseComputed from "discourse-common/utils/decorators";
32
import User from "discourse/models/user";
3+
import discourseComputed from "discourse-common/utils/decorators";
44

55
export default Controller.extend({
66
@discourseComputed()

‎assets/javascripts/discourse/controllers/subscribe-show.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
/* global Stripe */
12
import Controller from "@ember/controller";
2-
import Subscription from "discourse/plugins/discourse-subscriptions/discourse/models/subscription";
3-
import Transaction from "discourse/plugins/discourse-subscriptions/discourse/models/transaction";
4-
import I18n from "I18n";
53
import { not } from "@ember/object/computed";
6-
import discourseComputed from "discourse-common/utils/decorators";
74
import { inject as service } from "@ember/service";
5+
import discourseComputed from "discourse-common/utils/decorators";
6+
import I18n from "I18n";
7+
import Subscription from "discourse/plugins/discourse-subscriptions/discourse/models/subscription";
8+
import Transaction from "discourse/plugins/discourse-subscriptions/discourse/models/transaction";
89

910
export default Controller.extend({
1011
dialog: service(),

‎assets/javascripts/discourse/controllers/user-billing-subscriptions-card.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1+
/* global Stripe */
12
import Controller from "@ember/controller";
23
import { action } from "@ember/object";
4+
import { inject as service } from "@ember/service";
35
import { ajax } from "discourse/lib/ajax";
46
import { popupAjaxError } from "discourse/lib/ajax-error";
57
import I18n from "I18n";
6-
import { inject as service } from "@ember/service";
78

89
export default Controller.extend({
910
dialog: service(),
11+
1012
loading: false,
1113
saved: false,
14+
1215
init() {
1316
this._super(...arguments);
1417
this.set(

‎assets/javascripts/discourse/helpers/format-unix-date.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
21
import { htmlSafe } from "@ember/template";
2+
import { autoUpdatingRelativeAge } from "discourse/lib/formatter";
33

44
export default function formatUnixDate(timestamp) {
55
if (timestamp) {

‎assets/javascripts/discourse/initializers/setup-subscriptions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default {
55
name: "setup-subscriptions",
66
initialize(container) {
77
withPluginApi("0.8.11", (api) => {
8-
const siteSettings = container.lookup("site-settings:main");
8+
const siteSettings = container.lookup("service:site-settings");
99
const isNavLinkEnabled =
1010
siteSettings.discourse_subscriptions_extra_nav_subscribe;
1111
if (isNavLinkEnabled) {

‎assets/javascripts/discourse/models/admin-coupon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ajax } from "discourse/lib/ajax";
21
import EmberObject from "@ember/object";
2+
import { ajax } from "discourse/lib/ajax";
33
import discourseComputed from "discourse-common/utils/decorators";
44

55
const AdminCoupon = EmberObject.extend({

‎assets/javascripts/discourse/models/admin-plan.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import Plan from "discourse/plugins/discourse-subscriptions/discourse/models/plan";
2-
import discourseComputed from "discourse-common/utils/decorators";
31
import { ajax } from "discourse/lib/ajax";
2+
import discourseComputed from "discourse-common/utils/decorators";
3+
import Plan from "discourse/plugins/discourse-subscriptions/discourse/models/plan";
44

55
const AdminPlan = Plan.extend({
66
isNew: false,

‎assets/javascripts/discourse/models/admin-product.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { ajax } from "discourse/lib/ajax";
21
import EmberObject from "@ember/object";
2+
import { ajax } from "discourse/lib/ajax";
33

44
const AdminProduct = EmberObject.extend({
55
isNew: false,

‎assets/javascripts/discourse/models/admin-subscription.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import discourseComputed from "discourse-common/utils/decorators";
2-
import { ajax } from "discourse/lib/ajax";
31
import EmberObject from "@ember/object";
2+
import { ajax } from "discourse/lib/ajax";
43
import getURL from "discourse-common/lib/get-url";
4+
import discourseComputed from "discourse-common/utils/decorators";
55

66
const AdminSubscription = EmberObject.extend({
77
@discourseComputed("status")

‎assets/javascripts/discourse/models/subscription.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import discourseComputed from "discourse-common/utils/decorators";
2-
import { ajax } from "discourse/lib/ajax";
31
import EmberObject from "@ember/object";
2+
import { ajax } from "discourse/lib/ajax";
3+
import discourseComputed from "discourse-common/utils/decorators";
44

55
const Subscription = EmberObject.extend({
66
@discourseComputed("status")

‎assets/javascripts/discourse/models/user-payment.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import EmberObject from "@ember/object";
2-
import discourseComputed from "discourse-common/utils/decorators";
32
import { ajax } from "discourse/lib/ajax";
3+
import discourseComputed from "discourse-common/utils/decorators";
44

55
const UserPayment = EmberObject.extend({
66
@discourseComputed("amount")

‎assets/javascripts/discourse/models/user-subscription.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import EmberObject from "@ember/object";
2-
import discourseComputed from "discourse-common/utils/decorators";
32
import { ajax } from "discourse/lib/ajax";
4-
import Plan from "discourse/plugins/discourse-subscriptions/discourse/models/plan";
3+
import discourseComputed from "discourse-common/utils/decorators";
54
import I18n from "I18n";
5+
import Plan from "discourse/plugins/discourse-subscriptions/discourse/models/plan";
66

77
const UserSubscription = EmberObject.extend({
88
@discourseComputed("status")

‎assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-coupons.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { action } from "@ember/object";
12
import Route from "@ember/routing/route";
23
import AdminCoupon from "discourse/plugins/discourse-subscriptions/discourse/models/admin-coupon";
3-
import { action } from "@ember/object";
44

55
export default Route.extend({
66
model() {

‎assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import Route from "@ember/routing/route";
2-
import AdminProduct from "discourse/plugins/discourse-subscriptions/discourse/models/admin-product";
3-
import I18n from "I18n";
41
import { action } from "@ember/object";
2+
import Route from "@ember/routing/route";
53
import { inject as service } from "@ember/service";
4+
import I18n from "I18n";
5+
import AdminProduct from "discourse/plugins/discourse-subscriptions/discourse/models/admin-product";
66

77
export default Route.extend({
88
dialog: service(),

‎assets/javascripts/discourse/routes/admin-plugins-discourse-subscriptions-products-show-plans-show.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Route from "@ember/routing/route";
2-
import AdminPlan from "discourse/plugins/discourse-subscriptions/discourse/models/admin-plan";
3-
import Group from "discourse/models/group";
42
import { hash } from "rsvp";
3+
import Group from "discourse/models/group";
4+
import AdminPlan from "discourse/plugins/discourse-subscriptions/discourse/models/admin-plan";
55

66
export default Route.extend({
77
model(params) {

0 commit comments

Comments
 (0)