diff --git a/client/client.mjs b/client/client.mjs index b2f55b36..d1bb9737 100644 --- a/client/client.mjs +++ b/client/client.mjs @@ -17,7 +17,7 @@ import { apiURL, formatMsg, buildFromJSON, -} from '../common/cloudfunc.mjs'; +} from '#common/cloudfunc'; import {loadModule} from './load-module.mjs'; const noJS = (a) => a.replace(/.js$/, ''); diff --git a/client/cloudcmd.mjs b/client/cloudcmd.mjs index 5a207f8a..ab6bf282 100644 --- a/client/cloudcmd.mjs +++ b/client/cloudcmd.mjs @@ -5,7 +5,7 @@ import * as Util from '#common/util'; import '../css/main.css'; import {registerSW, listenSW} from './sw/register.mjs'; import {initSortPanel, sortPanel} from './sort.mjs'; -import * as CloudFunc from '../common/cloudfunc.mjs'; +import * as CloudFunc from '#common/cloudfunc'; import DOM from './dom/index.mjs'; import {createCloudCmd} from './client.mjs'; import * as Listeners from './listeners/index.mjs'; diff --git a/client/dom/current-file.mjs b/client/dom/current-file.mjs index 124c1e62..e5120f7d 100644 --- a/client/dom/current-file.mjs +++ b/client/dom/current-file.mjs @@ -2,7 +2,7 @@ /* global CloudCmd */ import createElement from '@cloudcmd/create-element'; import {encode, decode} from '../../common/entity.js'; -import {getTitle, FS} from '../../common/cloudfunc.mjs'; +import {getTitle, FS} from '#common/cloudfunc'; let Title; diff --git a/client/dom/directory.mjs b/client/dom/directory.mjs index e0cabab7..5189836f 100644 --- a/client/dom/directory.mjs +++ b/client/dom/directory.mjs @@ -2,7 +2,7 @@ import philip from 'philip'; import * as Dialog from '#dom/dialog'; import * as Images from './images.mjs'; -import {FS} from '../../common/cloudfunc.mjs'; +import {FS} from '#common/cloudfunc'; export const uploadDirectory = (items) => { if (items.length) diff --git a/client/dom/io/index.js b/client/dom/io/index.js index a17360ae..d69d31af 100644 --- a/client/dom/io/index.js +++ b/client/dom/io/index.js @@ -1,6 +1,6 @@ 'use strict'; -const {FS} = require('../../../common/cloudfunc.mjs'); +const {FS} = require('#common/cloudfunc'); const _sendRequest = require('./send-request'); const imgPosition = { diff --git a/client/dom/upload-files.mjs b/client/dom/upload-files.mjs index 908c402b..4254354c 100644 --- a/client/dom/upload-files.mjs +++ b/client/dom/upload-files.mjs @@ -4,7 +4,7 @@ import wraptile from 'wraptile'; import * as load from '#dom/load'; import {alert} from '#dom/dialog'; import * as Images from './images.mjs'; -import {FS} from '../../common/cloudfunc.mjs'; +import {FS} from '#common/cloudfunc'; import {getCurrentDirPath} from './current-file.mjs'; const loadFile = wraptile(_loadFile); diff --git a/client/listeners/index.mjs b/client/listeners/index.mjs index 99514b98..f320a397 100644 --- a/client/listeners/index.mjs +++ b/client/listeners/index.mjs @@ -7,7 +7,7 @@ import clipboard from '@cloudcmd/clipboard'; import * as Events from '#dom/events'; import {uploadFiles} from '#dom/upload-files'; import {getRange} from './get-range.mjs'; -import {FS} from '../../common/cloudfunc.mjs'; +import {FS} from '#common/cloudfunc'; import {getIndex} from './get-index.mjs'; const NBSP_REG = RegExp(String.fromCharCode(160), 'g'); diff --git a/client/modules/config/index.mjs b/client/modules/config/index.mjs index ad7b2acb..ac8db4d5 100644 --- a/client/modules/config/index.mjs +++ b/client/modules/config/index.mjs @@ -12,7 +12,7 @@ import * as Files from '#dom/files'; import '../../../css/config.css'; import * as input from './input.mjs'; import * as Images from '../../dom/images.mjs'; -import {getTitle} from '../../../common/cloudfunc.mjs'; +import {getTitle} from '#common/cloudfunc'; const {Dialog, setTitle} = DOM; diff --git a/client/modules/edit.js b/client/modules/edit.js index 7aa6715c..55ec0465 100644 --- a/client/modules/edit.js +++ b/client/modules/edit.js @@ -8,7 +8,7 @@ const {promisify} = require('es6-promisify'); const {tryToCatch} = require('try-to-catch'); const createElement = require('@cloudcmd/create-element'); const load = require('load.js'); -const {MAX_FILE_SIZE: maxSize} = require('../../common/cloudfunc.mjs'); +const {MAX_FILE_SIZE: maxSize} = require('#common/cloudfunc'); const {time, timeEnd} = require('#common/util'); const getEditor = () => editor; diff --git a/client/modules/menu/index.mjs b/client/modules/menu/index.mjs index a8c7d0df..3d3f4412 100644 --- a/client/modules/menu/index.mjs +++ b/client/modules/menu/index.mjs @@ -4,7 +4,7 @@ import wrap from 'wraptile'; import createElement from '@cloudcmd/create-element'; import {getIdBySrc} from '#dom/load'; import * as RESTful from '#dom/rest'; -import {FS} from '../../../common/cloudfunc.mjs'; +import {FS} from '#common/cloudfunc'; const {config, Key} = CloudCmd; diff --git a/client/modules/view/index.mjs b/client/modules/view/index.mjs index 91d9caf6..713ab5db 100644 --- a/client/modules/view/index.mjs +++ b/client/modules/view/index.mjs @@ -1,4 +1,4 @@ -/* global CloudCmd, DOM */ +import '#css/view.css'; import rendy from 'rendy'; import currify from 'currify'; import wraptile from 'wraptile'; @@ -9,8 +9,7 @@ import _createElement from '@cloudcmd/create-element'; import {time} from '#common/util'; import * as Files from '#dom/files'; import * as Events from '#dom/events'; -import '../../../css/view.css'; -import {FS} from '../../../common/cloudfunc.mjs'; +import {FS} from '#common/cloudfunc'; import { isImage, isAudio, diff --git a/common/cloudfunc.spec.mjs b/common/cloudfunc.spec.mjs index 79ddfedf..6f4ff9fe 100644 --- a/common/cloudfunc.spec.mjs +++ b/common/cloudfunc.spec.mjs @@ -7,7 +7,7 @@ import { getPathLink, buildFromJSON, _getDataName, -} from './cloudfunc.mjs'; +} from '#common/cloudfunc'; const templatePath = new URL('../tmpl/fs', import.meta.url).pathname; diff --git a/package.json b/package.json index f388737a..5f72bf99 100644 --- a/package.json +++ b/package.json @@ -220,6 +220,7 @@ "webpackbar": "^7.0.0" }, "imports": { + "#css/": "./css/", "#dom/events": "./client/dom/events/index.mjs", "#dom/load": "./client/dom/load.mjs", "#dom/dialog": "./client/dom/dialog.mjs", @@ -227,7 +228,8 @@ "#dom/upload-files": "./client/dom/upload-files.mjs", "#dom/storage": "./client/dom/storage.mjs", "#dom/rest": "./client/dom/rest.mjs", - "#common/util": "./common/util.mjs" + "#common/util": "./common/util.mjs", + "#common/cloudfunc": "./common/cloudfunc.mjs" }, "engines": { "node": ">=22" diff --git a/server/cloudcmd.mjs b/server/cloudcmd.mjs index 936e72c3..3afb544c 100644 --- a/server/cloudcmd.mjs +++ b/server/cloudcmd.mjs @@ -14,7 +14,7 @@ import dword from 'dword'; import deepword from 'deepword'; import nomine from 'nomine'; import fileop from '@cloudcmd/fileop'; -import * as cloudfunc from '../common/cloudfunc.mjs'; +import * as cloudfunc from '#common/cloudfunc'; import authentication from './auth.js'; import {createConfig, configPath} from './config.mjs'; import modulas from './modulas.mjs'; diff --git a/server/config.spec.mjs b/server/config.spec.mjs index 3c6bbbc0..fc36fb1b 100644 --- a/server/config.spec.mjs +++ b/server/config.spec.mjs @@ -1,7 +1,7 @@ import {createRequire} from 'node:module'; import {test, stub} from 'supertape'; import {createConfig, _cryptoPass} from './config.mjs'; -import {apiURL} from '../common/cloudfunc.mjs'; +import {apiURL} from '#common/cloudfunc'; import {connect} from '../test/before.mjs'; const require = createRequire(import.meta.url); diff --git a/server/rest/index.mjs b/server/rest/index.mjs index f5e6c8da..dae04761 100644 --- a/server/rest/index.mjs +++ b/server/rest/index.mjs @@ -12,7 +12,7 @@ import ponse from 'ponse'; import copymitter from 'copymitter'; import _moveFiles from '@cloudcmd/move-files'; import root from '../root.js'; -import * as CloudFunc from '../../common/cloudfunc.mjs'; +import * as CloudFunc from '#common/cloudfunc'; import markdown from '../markdown/index.js'; import info from './info.js'; diff --git a/server/route.mjs b/server/route.mjs index fabde3fb..952f2bda 100644 --- a/server/route.mjs +++ b/server/route.mjs @@ -12,7 +12,7 @@ import pipe from 'pipe-io'; import {contentType} from 'mime-types'; import root from './root.js'; import prefixer from './prefixer.js'; -import * as CloudFunc from '../common/cloudfunc.mjs'; +import * as CloudFunc from '#common/cloudfunc'; import Template from './template.js'; import {getColumns} from './columns.mjs'; import {getThemes} from './theme.mjs'; diff --git a/test/common/cloudfunc.js b/test/common/cloudfunc.js index 41844cf0..44ca9e14 100644 --- a/test/common/cloudfunc.js +++ b/test/common/cloudfunc.js @@ -7,7 +7,7 @@ const {test} = require('supertape'); const readFilesSync = require('@cloudcmd/read-files-sync'); const {time, timeEnd} = require(`../../common/util.mjs`); -const CloudFunc = require('../../common/cloudfunc.mjs'); +const CloudFunc = require('#common/cloudfunc'); const DIR = `${__dirname}/../../`; @@ -43,7 +43,8 @@ const data = { }], }; -let Expect = '