From 79fb49479e38240109a55708902d47788a9d5031 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 3 Jul 2024 12:01:49 +0000 Subject: [PATCH] =?UTF-8?q?chore:=20cloudcmd:=20actions:=20lint=20?= =?UTF-8?q?=E2=98=98=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .madrun.mjs | 2 +- bin/release.mjs | 2 +- client/cloudcmd.js | 3 ++- server/columns.spec.mjs | 2 +- server/distribute/export.spec.mjs | 2 +- server/distribute/import.mjs | 2 +- server/distribute/import.spec.mjs | 2 +- server/themes.spec.mjs | 2 +- server/user-menu.spec.mjs | 2 +- test/before.mjs | 6 +++--- test/rest/copy.mjs | 2 +- test/rest/move.mjs | 2 +- test/rest/pack.mjs | 4 ++-- test/server/console.mjs | 2 +- 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.madrun.mjs b/.madrun.mjs index 428eec7a..0cc7a5ec 100644 --- a/.madrun.mjs +++ b/.madrun.mjs @@ -1,5 +1,5 @@ -import {run, cutEnv} from 'madrun'; import process from 'node:process'; +import {run, cutEnv} from 'madrun'; const testEnv = { THREAD_IT_COUNT: 0, diff --git a/bin/release.mjs b/bin/release.mjs index e9ac53d9..1c12c20e 100755 --- a/bin/release.mjs +++ b/bin/release.mjs @@ -1,13 +1,13 @@ #!/usr/bin/env node import {promisify} from 'node:util'; +import process from 'node:process'; import tryToCatch from 'try-to-catch'; import {createSimport} from 'simport'; import minor from 'minor'; import _place from 'place'; import rendy from 'rendy'; import shortdate from 'shortdate'; -import process from 'node:process'; const simport = createSimport(import.meta.url); const place = promisify(_place); diff --git a/client/cloudcmd.js b/client/cloudcmd.js index 937f6d77..47019e55 100644 --- a/client/cloudcmd.js +++ b/client/cloudcmd.js @@ -10,7 +10,7 @@ const {registerSW, listenSW} = require('./sw/register'); const isDev = process.env.NODE_ENV === 'development'; -module.exports = window.CloudCmd = async (config) => { +module.exports = async (config) => { window.Util = require('../common/util'); window.CloudFunc = require('../common/cloudfunc'); @@ -27,6 +27,7 @@ module.exports = window.CloudCmd = async (config) => { window.CloudCmd.init(prefix, config); }; +window.CloudCmd = module.exports; function getPrefix(prefix) { if (!prefix) diff --git a/server/columns.spec.mjs b/server/columns.spec.mjs index 1e62f5f7..8ddcd54c 100644 --- a/server/columns.spec.mjs +++ b/server/columns.spec.mjs @@ -1,7 +1,7 @@ import {dirname} from 'node:path'; import {fileURLToPath} from 'node:url'; -import test from 'supertape'; import fs from 'node:fs'; +import test from 'supertape'; import {getColumns, isDev} from './columns.mjs'; const __filename = fileURLToPath(import.meta.url); diff --git a/server/distribute/export.spec.mjs b/server/distribute/export.spec.mjs index db65638d..e6dd1f8a 100644 --- a/server/distribute/export.spec.mjs +++ b/server/distribute/export.spec.mjs @@ -1,7 +1,7 @@ -import Config from '../config.js'; import {once} from 'node:events'; import test from 'supertape'; import io from 'socket.io-client'; +import Config from '../config.js'; import {connect} from '../../test/before.mjs'; const config = Config.createConfig(); diff --git a/server/distribute/import.mjs b/server/distribute/import.mjs index 72ce438d..f776abc0 100644 --- a/server/distribute/import.mjs +++ b/server/distribute/import.mjs @@ -3,9 +3,9 @@ import wraptile from 'wraptile'; import squad from 'squad'; import fullstore from 'fullstore'; import io from 'socket.io-client'; +import _forEachKey from 'for-each-key'; import log from './log.mjs'; import env from '../env.js'; -import _forEachKey from 'for-each-key'; const noop = () => {}; const forEachKey = currify(_forEachKey); diff --git a/server/distribute/import.spec.mjs b/server/distribute/import.spec.mjs index 9df6f846..9823aaff 100644 --- a/server/distribute/import.spec.mjs +++ b/server/distribute/import.spec.mjs @@ -1,6 +1,6 @@ import process from 'node:process'; -import test from 'supertape'; import {promisify} from 'node:util'; +import test from 'supertape'; import tryToCatch from 'try-to-catch'; import {connect} from '../../test/before.mjs'; import {createConfigManager} from '../cloudcmd.mjs'; diff --git a/server/themes.spec.mjs b/server/themes.spec.mjs index 6c828343..e88a3ec9 100644 --- a/server/themes.spec.mjs +++ b/server/themes.spec.mjs @@ -1,7 +1,7 @@ import {dirname} from 'node:path'; import {fileURLToPath} from 'node:url'; -import test from 'supertape'; import fs from 'node:fs'; +import test from 'supertape'; import {getThemes, isDev} from './theme.mjs'; const __filename = fileURLToPath(import.meta.url); diff --git a/server/user-menu.spec.mjs b/server/user-menu.spec.mjs index 7ac64f97..0125bd9e 100644 --- a/server/user-menu.spec.mjs +++ b/server/user-menu.spec.mjs @@ -1,10 +1,10 @@ import {dirname, join} from 'node:path'; import {fileURLToPath} from 'node:url'; +import {readFileSync} from 'node:fs'; import {test, stub} from 'supertape'; import serveOnce from 'serve-once'; import threadIt from 'thread-it'; import userMenu from './user-menu.mjs'; -import {readFileSync} from 'node:fs'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/test/before.mjs b/test/before.mjs index 2c15bdd3..6e6e3f99 100644 --- a/test/before.mjs +++ b/test/before.mjs @@ -1,13 +1,13 @@ import process from 'node:process'; import http from 'node:http'; import os from 'node:os'; +import {promisify} from 'node:util'; +import {fileURLToPath} from 'node:url'; +import {dirname} from 'node:path'; import express from 'express'; import {Server} from 'socket.io'; import writejson from 'writejson'; import readjson from 'readjson'; -import {promisify} from 'node:util'; -import {fileURLToPath} from 'node:url'; -import {dirname} from 'node:path'; import cloudcmd from '../server/cloudcmd.mjs'; const __filename = fileURLToPath(import.meta.url); diff --git a/test/rest/copy.mjs b/test/rest/copy.mjs index 3c673b7b..98e8ea4d 100644 --- a/test/rest/copy.mjs +++ b/test/rest/copy.mjs @@ -1,7 +1,7 @@ import {dirname, join} from 'node:path'; import {fileURLToPath} from 'node:url'; -import serveOnce from 'serve-once'; import {mkdirSync} from 'node:fs'; +import serveOnce from 'serve-once'; import test from 'supertape'; import {rimraf} from 'rimraf'; import cloudcmd from '../../server/cloudcmd.mjs'; diff --git a/test/rest/move.mjs b/test/rest/move.mjs index ee7d1637..e962e5f0 100644 --- a/test/rest/move.mjs +++ b/test/rest/move.mjs @@ -1,5 +1,5 @@ -import wait from '@iocmd/wait'; import {EventEmitter} from 'node:events'; +import wait from '@iocmd/wait'; import {test, stub} from 'supertape'; import serveOnce from 'serve-once'; import cloudcmd from '../../server/cloudcmd.mjs'; diff --git a/test/rest/pack.mjs b/test/rest/pack.mjs index 61332949..5b9c2210 100644 --- a/test/rest/pack.mjs +++ b/test/rest/pack.mjs @@ -1,13 +1,13 @@ import fs from 'node:fs'; import {join, dirname} from 'node:path'; import {promisify} from 'node:util'; +import {fileURLToPath} from 'node:url'; import test from 'supertape'; import tar from 'tar-stream'; import gunzip from 'gunzip-maybe'; import pullout from 'pullout'; -import cloudcmd from '../../server/cloudcmd.mjs'; import serveOnce from 'serve-once'; -import {fileURLToPath} from 'node:url'; +import cloudcmd from '../../server/cloudcmd.mjs'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/test/server/console.mjs b/test/server/console.mjs index cf42d5bd..266cce14 100644 --- a/test/server/console.mjs +++ b/test/server/console.mjs @@ -1,8 +1,8 @@ import path, {dirname} from 'node:path'; import {once} from 'node:events'; -import test from 'supertape'; import {fileURLToPath} from 'node:url'; import {createRequire} from 'node:module'; +import test from 'supertape'; import io from 'socket.io-client'; import {connect} from '../before.mjs';