DEV: Update linting (#77)

This commit is contained in:
Jarek Radosz 2024-01-16 17:57:10 +01:00 committed by GitHub
parent 321a8c41f9
commit 956fd3ee18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 1201 additions and 667 deletions

View File

@ -1,4 +0,0 @@
{
"extends": "eslint-config-discourse",
"ignorePatterns": ["/public"]
}

1
.eslintrc.cjs Normal file
View File

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

View File

@ -1 +0,0 @@
{}

1
.prettierrc.cjs Normal file
View File

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

1
.template-lintrc.cjs Normal file
View File

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

View File

@ -1,4 +0,0 @@
module.exports = {
plugins: ["ember-template-lint-plugin-discourse"],
extends: "discourse:recommended",
};

View File

@ -2,47 +2,52 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
ast (2.4.2) ast (2.4.2)
json (2.6.2) json (2.7.1)
parallel (1.22.1) language_server-protocol (3.17.0.3)
parser (3.1.2.1) parallel (1.24.0)
parser (3.3.0.4)
ast (~> 2.4.1) ast (~> 2.4.1)
prettier_print (1.2.0) racc
prettier_print (1.2.1)
racc (1.7.3)
rainbow (3.1.1) rainbow (3.1.1)
regexp_parser (2.6.0) regexp_parser (2.9.0)
rexml (3.2.5) rexml (3.2.6)
rubocop (1.36.0) rubocop (1.60.0)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 3.1.2.1) parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0) regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0) rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.20.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0) unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.21.0) rubocop-ast (1.30.0)
parser (>= 3.1.1.0) parser (>= 3.2.1.0)
rubocop-discourse (3.0) rubocop-capybara (2.20.0)
rubocop (>= 1.1.0) rubocop (~> 1.41)
rubocop-rspec (>= 2.0.0) rubocop-discourse (3.6.0)
rubocop-rspec (2.13.2) rubocop (>= 1.59.0)
rubocop (~> 1.33) rubocop-rspec (>= 2.25.0)
ruby-progressbar (1.11.0) rubocop-factory_bot (2.25.1)
syntax_tree (5.1.0) rubocop (~> 1.41)
rubocop-rspec (2.26.1)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-progressbar (1.13.0)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0) prettier_print (>= 1.2.0)
unicode-display_width (2.3.0) unicode-display_width (2.5.0)
PLATFORMS PLATFORMS
arm64-darwin-20
ruby ruby
x86_64-darwin-18
x86_64-darwin-19
x86_64-darwin-20
x86_64-linux
DEPENDENCIES DEPENDENCIES
rubocop-discourse rubocop-discourse
syntax_tree syntax_tree
BUNDLED WITH BUNDLED WITH
2.3.10 2.5.4

View File

@ -1,5 +1,6 @@
import { withPluginApi } from "discourse/lib/plugin-api"; import $ from "jquery";
import loadScript from "discourse/lib/load-script"; import loadScript from "discourse/lib/load-script";
import { withPluginApi } from "discourse/lib/plugin-api";
function ensureKaTeX() { function ensureKaTeX() {
return loadScript("/plugins/discourse-math/katex/katex.min.js").then(() => { return loadScript("/plugins/discourse-math/katex/katex.min.js").then(() => {
@ -71,7 +72,7 @@ function initializeMath(api) {
export default { export default {
name: "apply-math-katex", name: "apply-math-katex",
initialize(container) { initialize(container) {
const siteSettings = container.lookup("site-settings:main"); const siteSettings = container.lookup("service:site-settings");
if ( if (
siteSettings.discourse_math_enabled && siteSettings.discourse_math_enabled &&
siteSettings.discourse_math_provider === "katex" siteSettings.discourse_math_provider === "katex"

View File

@ -1,7 +1,7 @@
import { later } from "@ember/runloop";
import loadScript from "discourse/lib/load-script";
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import { getURLWithCDN } from "discourse-common/lib/get-url"; import { getURLWithCDN } from "discourse-common/lib/get-url";
import loadScript from "discourse/lib/load-script";
import { later } from "@ember/runloop";
let initializedMathJax = false; let initializedMathJax = false;
@ -131,7 +131,7 @@ function initializeMath(api, discourseMathOptions) {
export default { export default {
name: "apply-math-mathjax", name: "apply-math-mathjax",
initialize(container) { initialize(container) {
const siteSettings = container.lookup("site-settings:main"); const siteSettings = container.lookup("service:site-settings");
let discourse_math_opts = { let discourse_math_opts = {
zoom_on_hover: siteSettings.discourse_math_zoom_on_hover, zoom_on_hover: siteSettings.discourse_math_zoom_on_hover,
enable_accessibility: siteSettings.discourse_math_enable_accessibility, enable_accessibility: siteSettings.discourse_math_enable_accessibility,

View File

@ -1,10 +1,10 @@
{ {
"name": "discourse-math", "name": "discourse-math",
"version": "0.9.0", "private": true,
"repository": "https://github.com/discourse/discourse-math",
"author": "Discourse",
"license": "MIT",
"devDependencies": { "devDependencies": {
"eslint-config-discourse": "^3.4.0" "@discourse/lint-configs": "^1.3.5",
"ember-template-lint": "^5.13.0",
"eslint": "^8.56.0",
"prettier": "^2.8.8"
} }
} }

View File

@ -6,7 +6,6 @@
# version: 0.9 # version: 0.9
# authors: Sam Saffron (sam) # authors: Sam Saffron (sam)
# url: https://github.com/discourse/discourse-math # url: https://github.com/discourse/discourse-math
# transpile_js: true
register_asset "stylesheets/common/discourse-math.scss" register_asset "stylesheets/common/discourse-math.scss"
register_asset "stylesheets/ext/discourse-chat.scss" register_asset "stylesheets/ext/discourse-chat.scss"

1777
yarn.lock

File diff suppressed because it is too large Load Diff