From c0988590a7cb53534a14a6e9ad6da8d05fd0398b Mon Sep 17 00:00:00 2001 From: coderiaser Date: Fri, 30 Jan 2026 21:43:39 +0200 Subject: [PATCH] chore: lint --- .madrun.mjs | 13 +++++++------ client/dom/events/event-store.spec.js | 2 +- client/dom/io/send-request.spec.js | 2 +- client/modules/view/index.spec.js | 4 ++-- common/datetime.spec.js | 2 +- common/entity.spec.js | 2 +- common/try-to-promise-all.spec.js | 2 +- rules/split-autoglobals-with-tape.mjs | 8 ++++++++ server/env.spec.js | 2 +- server/prefixer.spec.js | 2 +- server/rest/index.spec.js | 2 +- static/user-menu.spec.js | 7 +++---- test/common/cloudfunc.js | 2 +- test/server/env.js | 2 +- test/server/show-config.js | 2 +- 15 files changed, 31 insertions(+), 23 deletions(-) create mode 100644 rules/split-autoglobals-with-tape.mjs diff --git a/.madrun.mjs b/.madrun.mjs index af6d06d2..ade83fa8 100644 --- a/.madrun.mjs +++ b/.madrun.mjs @@ -1,10 +1,11 @@ import process from 'node:process'; import {run, cutEnv} from 'madrun'; +import {defineEnv} from 'supertape/env'; -const testEnv = { - SUPERTAPE_TIMEOUT: 7000, - NODE_OPTIONS: '"--import supertape/css"', -}; +const testEnv = defineEnv({ + timeout: 7000, + css: true, +}); const is17 = /^v1[789]/.test(process.version); const is20 = process.version.startsWith('v2'); @@ -27,12 +28,12 @@ export default { 'build:start': () => run(['build:client', 'start']), 'build:start:dev': () => run(['build:client:dev', 'start:dev']), 'lint:all': () => run('lint:progress'), - 'lint': () => 'redlint scan; putout .', + 'lint': () => 'redlint scan; putout . --rulesdir rules', 'lint:progress': () => run('lint', '-f progress'), 'watch:lint': () => 'nodemon -w client -w server -w test -w common -w .webpack -x "putout -s"', 'fresh:lint': () => run('lint', '--fresh'), 'lint:fresh': () => run('lint', '--fresh'), - 'fix:lint': async () => `putout --fix . && redlint fix`, + 'fix:lint': async () => `putout --rulesdir rules --fix . && redlint fix`, 'lint:stream': () => run('lint', '-f stream'), 'test': () => [testEnv, `tape 'test/**/*.{js,mjs}' '{client,static,common,server}/**/*.spec.{js,mjs}' -f fail`], 'test:client': () => `tape 'test/client/**/*.js'`, diff --git a/client/dom/events/event-store.spec.js b/client/dom/events/event-store.spec.js index 82e6752a..7907a52c 100644 --- a/client/dom/events/event-store.spec.js +++ b/client/dom/events/event-store.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const test = require('supertape'); +const {test} = require('supertape'); const eventStore = require('./event-store'); test('event-store: get', (t) => { diff --git a/client/dom/io/send-request.spec.js b/client/dom/io/send-request.spec.js index e8d0449a..d0c7aa88 100644 --- a/client/dom/io/send-request.spec.js +++ b/client/dom/io/send-request.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const test = require('supertape'); +const {test} = require('supertape'); const {_replaceHash} = require('./send-request'); test('cloudcmd: client: io: replaceHash', (t) => { diff --git a/client/modules/view/index.spec.js b/client/modules/view/index.spec.js index cc46d07d..54dac8aa 100644 --- a/client/modules/view/index.spec.js +++ b/client/modules/view/index.spec.js @@ -4,8 +4,8 @@ require('css-modules-require-hook/preset'); const autoGlobals = require('auto-globals'); const {stub} = require('@cloudcmd/stub'); - -const test = autoGlobals(require('supertape')); +const {test: tape} = require('supertape'); +const test = autoGlobals(tape); const { _initConfig, _viewHtml, diff --git a/common/datetime.spec.js b/common/datetime.spec.js index cc321d8a..6da5fad2 100644 --- a/common/datetime.spec.js +++ b/common/datetime.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const test = require('supertape'); +const {test} = require('supertape'); const {tryCatch} = require('try-catch'); const datetime = require('./datetime'); diff --git a/common/entity.spec.js b/common/entity.spec.js index e83b75df..e555cc0d 100644 --- a/common/entity.spec.js +++ b/common/entity.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const test = require('supertape'); +const {test} = require('supertape'); const entity = require('./entity'); test('cloudcmd: entity: encode', (t) => { diff --git a/common/try-to-promise-all.spec.js b/common/try-to-promise-all.spec.js index 6a7e3b81..e86772fd 100644 --- a/common/try-to-promise-all.spec.js +++ b/common/try-to-promise-all.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const test = require('supertape'); +const {test} = require('supertape'); const tryToPromiseAll = require('./try-to-promise-all'); const resolve = Promise.resolve.bind(Promise); diff --git a/rules/split-autoglobals-with-tape.mjs b/rules/split-autoglobals-with-tape.mjs new file mode 100644 index 00000000..5c3c3eb2 --- /dev/null +++ b/rules/split-autoglobals-with-tape.mjs @@ -0,0 +1,8 @@ +export const report = () => `Use 'if condition' instead of 'ternary expression'`; + +export const replace = () => ({ + 'const test = autoGlobals(require("supertape"))': `{ + const {test: tape} = require('supertape'); + const test = autoGlobals(tape); + }`, +}); diff --git a/server/env.spec.js b/server/env.spec.js index d8f3faf6..f92273e5 100644 --- a/server/env.spec.js +++ b/server/env.spec.js @@ -1,7 +1,7 @@ 'use strict'; const process = require('node:process'); -const test = require('supertape'); +const {test} = require('supertape'); const env = require('./env.mjs'); test('cloudcmd: server: env: bool: upper case first', (t) => { diff --git a/server/prefixer.spec.js b/server/prefixer.spec.js index b858e546..2cc5b2d8 100644 --- a/server/prefixer.spec.js +++ b/server/prefixer.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const test = require('supertape'); +const {test} = require('supertape'); const prefixer = require('./prefixer'); diff --git a/server/rest/index.spec.js b/server/rest/index.spec.js index 540356ad..ab7ed78b 100644 --- a/server/rest/index.spec.js +++ b/server/rest/index.spec.js @@ -1,6 +1,6 @@ 'use strict'; -const test = require('supertape'); +const {test} = require('supertape'); const {tryToCatch} = require('try-to-catch'); const { diff --git a/static/user-menu.spec.js b/static/user-menu.spec.js index d46d4374..b5f6c43c 100644 --- a/static/user-menu.spec.js +++ b/static/user-menu.spec.js @@ -1,13 +1,12 @@ 'use strict'; -const autoGlobals = require('auto-globals'); const {stub} = require('@cloudcmd/stub'); const {tryToCatch} = require('try-to-catch'); const wraptile = require('wraptile'); +const {test: tape} = require('supertape'); +const autoGlobals = require('auto-globals'); const defaultMenu = require('./user-menu'); - -const test = autoGlobals(require('supertape')); - +const test = autoGlobals(tape); const {create} = autoGlobals; const {_data} = defaultMenu; diff --git a/test/common/cloudfunc.js b/test/common/cloudfunc.js index d0c70026..41844cf0 100644 --- a/test/common/cloudfunc.js +++ b/test/common/cloudfunc.js @@ -3,7 +3,7 @@ const fs = require('node:fs'); const {tryCatch} = require('try-catch'); -const test = require('supertape'); +const {test} = require('supertape'); const readFilesSync = require('@cloudcmd/read-files-sync'); const {time, timeEnd} = require(`../../common/util.mjs`); diff --git a/test/server/env.js b/test/server/env.js index 52f54b45..ce12e0df 100644 --- a/test/server/env.js +++ b/test/server/env.js @@ -1,7 +1,7 @@ 'use strict'; const process = require('node:process'); -const test = require('supertape'); +const {test} = require('supertape'); const env = require('../../server/env.mjs'); test('env: small', (t) => { diff --git a/test/server/show-config.js b/test/server/show-config.js index d0f3c8f6..d0ff8480 100644 --- a/test/server/show-config.js +++ b/test/server/show-config.js @@ -1,6 +1,6 @@ 'use strict'; -const test = require('supertape'); +const {test} = require('supertape'); const {tryCatch} = require('try-catch'); const showConfig = require('../../server/show-config');