diff --git a/.webpack/cp.mjs b/.webpack/cp.mjs deleted file mode 100644 index 1dacb044..00000000 --- a/.webpack/cp.mjs +++ /dev/null @@ -1,17 +0,0 @@ -import {cpSync} from 'node:fs'; - -cpSync('./css/columns', './dist-dev/columns', { - recursive: true, -}); - -cpSync('./css/themes', './dist-dev/themes', { - recursive: true, -}); - -cpSync('./css/columns', './dist/columns', { - recursive: true, -}); - -cpSync('./css/themes', './dist/themes', { - recursive: true, -}); diff --git a/.webpack/css.js b/.webpack/css.js index 7b4486e1..2d3faf55 100644 --- a/.webpack/css.js +++ b/.webpack/css.js @@ -1,39 +1,37 @@ 'use strict'; -const {env} = require('node:process') +const {env} = require('node:process'); const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); -const MiniCssExtractPlugin = require("mini-css-extract-plugin"); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const isDev = env.NODE_ENV === 'development'; const clean = (a) => a.filter(Boolean); const plugins = clean([ - new MiniCssExtractPlugin({ - filename: '[name].css', - }), + new MiniCssExtractPlugin({ + filename: '[name].css', + }), !isDev && new OptimizeCssAssetsPlugin(), ]); const rules = [{ test: /\.css$/i, use: [MiniCssExtractPlugin.loader, { - loader: "css-loader", + loader: 'css-loader', options: { - url: true, + url: true, }, }], - }, { +}, { test: /\.(png|gif|svg|woff|woff2|eot|ttf)$/, type: 'asset/inline', -}] - +}]; module.exports = { plugins, - module: { - rules, - }, + module: { + rules, + }, }; - diff --git a/.webpack/js.js b/.webpack/js.js index 1efe48b1..814146c5 100644 --- a/.webpack/js.js +++ b/.webpack/js.js @@ -11,6 +11,7 @@ const { EnvironmentPlugin, NormalModuleReplacementPlugin, } = require('webpack'); + const WebpackBar = require('webpackbar'); const modules = './modules'; @@ -78,7 +79,7 @@ const splitChunks = { 'columns/name-size', 'columns/name-size-date', ]; - + return !lazyChunks.includes(chunk.name); }, minChunks: 1, @@ -97,8 +98,8 @@ module.exports = { 'node:path': 'path', }, fallback: { - 'path': require.resolve('path-browserify'), - 'process': require.resolve('process/browser'), + path: require.resolve('path-browserify'), + process: require.resolve('process/browser'), }, }, devtool, @@ -111,13 +112,13 @@ module.exports = { 'columns/name-size': `${dirColumns}/name-size.css`, 'columns/name-size-date': `${dirColumns}/name-size-date.css`, 'nojs': `${dirCss}/nojs.css`, - help: `${dirCss}/help.css`, - view: `${dirCss}/view.css`, - config: `${dirCss}/config.css`, - terminal: `${dirCss}/terminal.css`, + 'help': `${dirCss}/help.css`, + 'view': `${dirCss}/view.css`, + 'config': `${dirCss}/config.css`, + 'terminal': `${dirCss}/terminal.css`, 'user-menu': `${dirCss}/user-menu.css`, - sw: `${dir}/sw/sw.js`, - cloudcmd: `${dir}/cloudcmd.js`, + 'sw': `${dir}/sw/sw.js`, + 'cloudcmd': `${dir}/cloudcmd.js`, [`${modules}/edit`]: `${dirModules}/edit.js`, [`${modules}/edit-file`]: `${dirModules}/edit-file.js`, [`${modules}/edit-file-vim`]: `${dirModules}/edit-file-vim.js`, diff --git a/client/client.js b/client/client.js index ee164763..5c547deb 100644 --- a/client/client.js +++ b/client/client.js @@ -142,7 +142,6 @@ function CloudCmdProto(DOM) { CloudCmd.route(location.hash); }; - this.route = (path) => { const query = path.split('/'); diff --git a/client/modules/menu.js b/client/modules/menu.js index dda0dcf5..a8db2924 100644 --- a/client/modules/menu.js +++ b/client/modules/menu.js @@ -326,7 +326,7 @@ function listener(event) { const key = event.keyCode; const isBind = Key.isBind(); - + if (key === ESC) return hide(); diff --git a/server/theme.mjs b/server/theme.mjs index 0de0b3a9..3e1b88bb 100644 --- a/server/theme.mjs +++ b/server/theme.mjs @@ -29,7 +29,5 @@ const readFilesSyncMemo = nanomemoize((isDev) => { .readdirSync(themesDir) .filter(not(isMap)); - const a = readFilesSync(themesDir, names, 'utf8'); - - return a; + return readFilesSync(themesDir, names, 'utf8'); });