Use Biome instead of Prettier and Eslint

pull/103/head
Yuta Hayashibe 2024-06-23 20:58:33 +09:00 committed by Yuta Hayashibe
parent 27f9ae230a
commit e82e6236be
7 changed files with 165 additions and 690 deletions

View File

@ -1,8 +1,8 @@
{
"MD007": {
"indent": 4
},
"line-length": false,
"no-inline-html": false,
"MD026": false
"MD007": {
"indent": 4
},
"line-length": false,
"no-inline-html": false,
"MD026": false
}

View File

@ -1 +0,0 @@
{}

17
biome.json Normal file
View File

@ -0,0 +1,17 @@
{
"$schema": "https://biomejs.dev/schemas/1.8.2/schema.json",
"organizeImports": {
"enabled": true
},
"formatter": {
"enabled": true,
"indentStyle": "space",
"indentWidth": 2
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
}
}

View File

@ -1,15 +0,0 @@
import eslintConfigPrettier from "eslint-config-prettier";
export default [
{
languageOptions: {
globals: {
amd: true,
browser: true,
es6: true,
jquery: true,
node: true,
},
},
},
eslintConfigPrettier,
];

View File

@ -1,9 +1,11 @@
var enableCheckerInit = function () {
const enableCheckerInit = () => {
function isDarkColor(color) {
if (color.length == 0) {
if (color.length === 0) {
return false;
}
let r, g, b;
let r;
let g;
let b;
if (color.startsWith("#")) {
[r, g, b] = color
@ -81,12 +83,13 @@ var enableCheckerInit = function () {
}
getComponent(id) {
let target = id;
if (id.startsWith("component-")) {
id = Number(id.replace(/^component-/, ""));
target = Number(id.replace(/^component-/, ""));
}
return window.gradio_config.components[
this.componentId2componentIndex[id]
this.componentId2componentIndex[target]
];
}
}
@ -111,10 +114,10 @@ var enableCheckerInit = function () {
if (
text.startsWith("enable") ||
text.endsWith("enabled") ||
text == "active" ||
text == "啟用" ||
text == "启用" ||
text == "Share attention in batch".toLowerCase() // sd-webui-forge
text === "active" ||
text === "啟用" ||
text === "启用" ||
text === "Share attention in batch".toLowerCase() // sd-webui-forge
) {
return span;
}
@ -125,7 +128,7 @@ var enableCheckerInit = function () {
const snodes = node.parentNode.childNodes;
for (let k = 0; k < snodes.length; k++) {
const snode = snodes[k];
if (snode.nodeName == "INPUT") {
if (snode.nodeName === "INPUT") {
return snode.checked;
}
}
@ -162,13 +165,13 @@ var enableCheckerInit = function () {
const divs = controlnet_parts
.querySelector(".tabs")
.querySelectorAll(":scope>div");
if (divs == undefined || divs.length < 1) {
if (divs === undefined || divs.length < 1) {
return null;
}
const tabs = controlnet_parts
.querySelectorAll(".tab-nav")[0]
.querySelectorAll("button");
if (tabs.length == 0) {
if (tabs.length === 0) {
return null;
}
for (let k = 1; k < divs.length; k++) {
@ -199,7 +202,7 @@ var enableCheckerInit = function () {
if (!input) {
continue;
}
if (input.value == 0) {
if (input.value === 0) {
input.style.backgroundColor = setting.custom_color_zero_weihgt;
} else {
input.style.backgroundColor = "";
@ -297,20 +300,20 @@ var enableCheckerInit = function () {
const header = get_component_header(component);
const checkbox = header.querySelector("input[type=checkbox]");
let is_active = checkbox.checked;
if (is_active && header.innerText.split("\n")[0] == "Refiner") {
if (is_active && header.innerText.split("\n")[0] === "Refiner") {
const labels = component.querySelectorAll("label");
for (let j = 0; j < labels.length; j++) {
const label = labels[j];
const text = label.querySelector(":scope>span").innerText;
if (text == "Checkpoint") {
if (text === "Checkpoint") {
const model = label.querySelector("input");
if (model.value == "") {
if (model.value === "") {
is_active = false;
break;
}
} else if (text == "Switch at") {
} else if (text === "Switch at") {
const input = component.querySelector('input[type="number"]');
if (input.value == 1) {
if (input.value === 1) {
is_active = false;
break;
}
@ -329,8 +332,8 @@ var enableCheckerInit = function () {
}
if (
target?.tagName?.toLowerCase() != "a" ||
target?.innerText != "Generate forever"
target?.tagName?.toLowerCase() !== "a" ||
target?.innerText !== "Generate forever"
) {
return;
}
@ -358,7 +361,7 @@ var enableCheckerInit = function () {
}
function main_enable_checker(ev) {
if (Object.keys(opts).length == 0) {
if (Object.keys(opts).length === 0) {
// not ready
return;
}
@ -396,7 +399,8 @@ var enableCheckerInit = function () {
!setting?.enable_checker_activate_extra_network_check
) {
return;
} else if (!force && setting.loras !== null) {
}
if (!force && setting.loras !== null) {
return;
}
@ -438,20 +442,20 @@ var enableCheckerInit = function () {
(item) => !setting.loras.includes(item),
);
if (notIncluded.length == 0) {
if (notIncluded.length === 0) {
dom.style.background = "";
log_dom.innerText = "";
return;
}
dom.style.background = setting.color_invalid_additional_networks;
log_dom.innerText = `Not found LoRA: ` + notIncluded.join(", ");
log_dom.innerText = `Not found LoRA: ${notIncluded.join(", ")}`;
}
function check_version_for_enable_checker() {
const versions_str =
document.getElementsByClassName("versions")[0].innerText;
const items = versions_str.split(" ");
if (items.length >= 2 && items[0] == "version:") {
if (items.length >= 2 && items[0] === "version:") {
const vers = items[1].split(".");
let err = false;
@ -461,7 +465,7 @@ var enableCheckerInit = function () {
// Support >= v1.7.0 for sd-webui
if (vers[0].startsWith("v")) {
const v0 = Number(vers[0].substring(1));
if (v0 < 1 || (v0 == 1 && Number(vers[1]) < 7)) {
if (v0 < 1 || (v0 === 1 && Number(vers[1]) < 7)) {
err = true;
}
} else if (vers[0].startsWith("f")) {
@ -491,7 +495,7 @@ var enableCheckerInit = function () {
return;
}
["txt2img", "img2img"].forEach((tabname) => {
for (const tabname of ["txt2img", "img2img"]) {
gradioApp()
.querySelector(
`#${tabname}_extra_refresh,#${tabname}_lora_extra_refresh_internal`,
@ -500,7 +504,7 @@ var enableCheckerInit = function () {
init_network_checker(tabname, true);
});
["prompt", "neg_prompt"].forEach((target_prompt) => {
for (const target_prompt of ["prompt", "neg_prompt"]) {
const prefix = `${tabname}_${target_prompt}`;
const textarea = gradioApp().querySelector(
`#${prefix} > label > textarea`,
@ -509,8 +513,8 @@ var enableCheckerInit = function () {
init_network_checker(tabname, false);
main_network_checker(prefix);
});
});
});
}
}
}
return [
@ -527,18 +531,18 @@ const init_network_checker = init_enableChecker[1];
const main_network_checker = init_enableChecker[2];
const onui_enable_checker = init_enableChecker[3];
gradioApp().addEventListener("click", function (ev) {
gradioApp().addEventListener("click", (ev) => {
main_enable_checker(ev);
});
gradioApp().addEventListener("change", function (ev) {
gradioApp().addEventListener("change", (ev) => {
main_enable_checker(ev);
});
onUiUpdate(function (ev) {
onUiUpdate((ev) => {
main_enable_checker(ev);
});
onUiLoaded(function () {
onUiLoaded(() => {
onui_enable_checker();
});

View File

@ -6,11 +6,10 @@
"main": "index.js",
"scripts": {
"preinstall": "npx only-allow pnpm",
"test:eslint": "eslint ./javascript",
"test:prettier": "prettier --check javascript",
"prettier": "prettier --write javascript",
"test:biome": "biome check",
"format": "iome format --write",
"test:md": "npx markdownlint *.md",
"test": "run-s test:eslint test:prettier test:md"
"test": "run-s test:biome test:md"
},
"repository": {
"type": "git",
@ -23,12 +22,10 @@
},
"homepage": "https://github.com/shirayu/sd-webui-enable-checker",
"devDependencies": {
"eslint": "^9.5.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"@biomejs/biome": "1.8.2",
"markdownlint-cli": "^0.41.0",
"npm-run-all": "^4.1.5",
"pyright": "^1.1.367"
"pyright": "^1.1.368"
},
"engines": {
"npm": "Use pnpm instead of npm!"

File diff suppressed because it is too large Load Diff