From dee50a854827eeabae8fb250099866fd2e12ea44 Mon Sep 17 00:00:00 2001 From: coderiaser Date: Thu, 29 Jan 2026 14:27:19 +0200 Subject: [PATCH] feature: client: dom: files: migrate to ESM --- client/dom/{files.js => files.mjs} | 13 +++++-------- client/dom/index.js | 2 +- client/dom/load-remote.js | 2 +- client/modules/cloud.mjs | 2 +- client/modules/config/index.mjs | 2 +- client/modules/upload.js | 2 +- client/modules/view/index.js | 2 +- package.json | 3 ++- 8 files changed, 13 insertions(+), 15 deletions(-) rename client/dom/{files.js => files.mjs} (93%) diff --git a/client/dom/files.js b/client/dom/files.mjs similarity index 93% rename from client/dom/files.js rename to client/dom/files.mjs index d7f79d3d..238384be 100644 --- a/client/dom/files.js +++ b/client/dom/files.mjs @@ -1,11 +1,8 @@ -'use strict'; - /* global CloudCmd */ -const itype = require('itype'); -const {promisify} = require('es6-promisify'); - -const load = require('#dom/load'); -const RESTful = require('./rest'); +import itype from 'itype'; +import {promisify} from 'es6-promisify'; +import * as load from '#dom/load'; +import RESTful from './rest.js'; const Promises = {}; const FILES_JSON = 'config|modules'; @@ -16,7 +13,7 @@ const DIR_HTML_FS = `${DIR_HTML}fs/`; const DIR_JSON = '/json/'; const timeout = getTimeoutOnce(2000); -module.exports.get = getFile; +export const get = getFile; function getFile(name) { const type = itype(name); diff --git a/client/dom/index.js b/client/dom/index.js index 2b489986..859c2697 100644 --- a/client/dom/index.js +++ b/client/dom/index.js @@ -22,7 +22,7 @@ const CurrentInfo = {}; DOM.Images = Images; DOM.load = require('#dom/load'); -DOM.Files = require('./files'); +DOM.Files = require('#dom/files'); DOM.RESTful = RESTful; DOM.IO = require('./io'); DOM.Storage = Storage; diff --git a/client/dom/load-remote.js b/client/dom/load-remote.js index b1b798a8..3d37bb0c 100644 --- a/client/dom/load-remote.js +++ b/client/dom/load-remote.js @@ -8,7 +8,7 @@ const {tryToCatch} = require('try-to-catch'); const {findObjByNameInArr} = require('../../common/util'); -const Files = require('./files'); +const Files = require('#dom/files'); module.exports = (name, options, callback = options) => { const {prefix, config} = CloudCmd; diff --git a/client/modules/cloud.mjs b/client/modules/cloud.mjs index c9df155c..f0fbb31e 100644 --- a/client/modules/cloud.mjs +++ b/client/modules/cloud.mjs @@ -3,7 +3,7 @@ import exec from 'execon'; import currify from 'currify'; import load from 'load.js'; import {ajax} from '#dom/load'; -import Files from '../dom/files.js'; +import * as Files from '#dom/files'; import * as Images from '../dom/images.mjs'; const {log} = CloudCmd; diff --git a/client/modules/config/index.mjs b/client/modules/config/index.mjs index 91b8e7e3..d524f314 100644 --- a/client/modules/config/index.mjs +++ b/client/modules/config/index.mjs @@ -11,7 +11,7 @@ import * as Events from '#dom/events'; import '../../../css/config.css'; import * as input from './input.mjs'; import * as Images from '../../dom/images.mjs'; -import Files from '../../dom/files.js'; +import * as Files from '#dom/files'; import {getTitle} from '../../../common/cloudfunc.mjs'; const {Dialog, setTitle} = DOM; diff --git a/client/modules/upload.js b/client/modules/upload.js index 23fbdaf5..fe84bcd5 100644 --- a/client/modules/upload.js +++ b/client/modules/upload.js @@ -5,7 +5,7 @@ CloudCmd.Upload = exports; const createElement = require('@cloudcmd/create-element'); -const Files = require('../dom/files'); +const Files = require('#dom/files'); const Images = require('../dom/images.mjs'); const uploadFiles = require('../dom/upload-files'); diff --git a/client/modules/view/index.js b/client/modules/view/index.js index 89d68ee4..82c7b50e 100644 --- a/client/modules/view/index.js +++ b/client/modules/view/index.js @@ -25,7 +25,7 @@ const { getType, } = require('./types'); -const Files = require('../../dom/files'); +const Files = require('#dom/files'); const Events = require('#dom/events'); const Images = require('../../dom/images.mjs'); diff --git a/package.json b/package.json index 401f5f0c..40fc7b63 100644 --- a/package.json +++ b/package.json @@ -220,7 +220,8 @@ "imports": { "#dom/events": "./client/dom/events/index.mjs", "#dom/load": "./client/dom/load.mjs", - "#dom/dialog": "./client/dom/dialog.mjs" + "#dom/dialog": "./client/dom/dialog.mjs", + "#dom/files": "./client/dom/files.mjs" }, "engines": { "node": ">=22"