diff --git a/server/cloudcmd.mjs b/server/cloudcmd.mjs index 95f2f66b..76f9e937 100644 --- a/server/cloudcmd.mjs +++ b/server/cloudcmd.mjs @@ -20,7 +20,7 @@ import {createConfig, configPath} from './config.js'; import modulas from './modulas.js'; import userMenu from './user-menu.mjs'; import rest from './rest/index.js'; -import route from './route.js'; +import route from './route.mjs'; import validate from './validate.js'; import prefixer from './prefixer.js'; import terminal from './terminal.js'; diff --git a/server/route.js b/server/route.mjs similarity index 84% rename from server/route.js rename to server/route.mjs index ab5ea491..60fd70f1 100644 --- a/server/route.js +++ b/server/route.mjs @@ -1,24 +1,22 @@ -'use strict'; - -const {extname} = require('node:path'); - -const _win32 = require('win32'); -const ponse = require('ponse'); -const rendy = require('rendy'); -const format = require('format-io'); -const currify = require('currify'); -const wraptile = require('wraptile'); -const tryToCatch = require('try-to-catch'); -const once = require('once'); -const pipe = require('pipe-io'); -const {contentType} = require('mime-types'); - -const root = require(`./root`); -const prefixer = require(`./prefixer`); -const CloudFunc = require(`../common/cloudfunc`); -const {getColumns} = require(`./columns`); -const Template = require(`./template`); +import {createRequire} from 'node:module'; +import {extname} from 'node:path'; +import _win32 from 'win32'; +import ponse from 'ponse'; +import rendy from 'rendy'; +import format from 'format-io'; +import currify from 'currify'; +import wraptile from 'wraptile'; +import tryToCatch from 'try-to-catch'; +import once from 'once'; +import pipe from 'pipe-io'; +import {contentType} from 'mime-types'; +import root from './root.js'; +import prefixer from './prefixer.js'; +import CloudFunc from '../common/cloudfunc.js'; +import {getColumns} from './columns.js'; +import Template from './template.js'; +const require = createRequire(import.meta.url); const {stringify} = JSON; const {FS} = CloudFunc; @@ -46,7 +44,7 @@ const getReadDir = (config, {win32 = _win32} = {}) => { /** * routing of server queries */ -module.exports = currify((config, options, request, response, next) => { +export default currify((config, options, request, response, next) => { const name = ponse.getPathName(request); const isFS = RegExp(`^/$|^${FS}`).test(name); @@ -61,7 +59,7 @@ module.exports = currify((config, options, request, response, next) => { }).catch(next); }); -module.exports._getReadDir = getReadDir; +export const _getReadDir = getReadDir; async function route({config, options, request, response}) { const name = ponse.getPathName(request); @@ -184,7 +182,8 @@ function buildIndex(config, html, data) { }); } -module.exports._hideKeysPanel = hideKeysPanel; +export const _hideKeysPanel = hideKeysPanel; + function hideKeysPanel(html) { const keysPanel = '