From 8f52376d3fa9dfecd9a6e4c86956a0d6f9c62a08 Mon Sep 17 00:00:00 2001
From: coderiaser <coderaiser@cloudcmd.io>
Date: Sun, 6 Jul 2025 20:02:22 +0300
Subject: [PATCH] feature: cloudcmd: revert: optimize-css-assets-webpack-plugin
 -> css-minimizer-webpack-plugin: broken spinner

This reverts commit 820087491266128043c816e1d8dc27cd5962b8b1.
---
 .webpack/css.js         |  6 ++++++
 .webpack/js.js          | 13 -------------
 package.json            |  2 +-
 server/columns.spec.mjs |  7 +++----
 server/themes.spec.mjs  |  7 +++----
 5 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/.webpack/css.js b/.webpack/css.js
index 900269dd..2d3faf55 100644
--- a/.webpack/css.js
+++ b/.webpack/css.js
@@ -1,13 +1,19 @@
 'use strict';
 
+const {env} = require('node:process');
+
+const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-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',
     }),
+    !isDev && new OptimizeCssAssetsPlugin(),
 ]);
 
 const rules = [{
diff --git a/.webpack/js.js b/.webpack/js.js
index 51fd2628..814146c5 100644
--- a/.webpack/js.js
+++ b/.webpack/js.js
@@ -13,7 +13,6 @@ const {
 } = require('webpack');
 
 const WebpackBar = require('webpackbar');
-const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 
 const modules = './modules';
 const dirModules = './client/modules';
@@ -106,18 +105,6 @@ module.exports = {
     devtool,
     optimization: {
         splitChunks,
-        minimize: true,
-        minimizer: [
-            new CssMinimizerPlugin({
-                minimizerOptions: {
-                    preset: ['default', {
-                        discardComments: {
-                            removeAll: true,
-                        },
-                    }],
-                },
-            }),
-        ],
     },
     entry: {
         'themes/dark': `${dirThemes}/dark.css`,
diff --git a/package.json b/package.json
index 0b2cb706..ba8a7648 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,6 @@
     "clean-css-loader": "^4.2.1",
     "codegen.macro": "^4.0.0",
     "css-loader": "^7.1.2",
-    "css-minimizer-webpack-plugin": "^7.0.2",
     "css-modules-require-hook": "^4.2.3",
     "domtokenlist-shim": "^1.2.0",
     "emitify": "^4.0.1",
@@ -193,6 +192,7 @@
     "morgan": "^1.6.1",
     "multi-rename": "^2.0.0",
     "nodemon": "^3.0.1",
+    "optimize-css-assets-webpack-plugin": "^6.0.1",
     "path-browserify": "^1.0.1",
     "philip": "^3.0.0",
     "place": "^1.1.4",
diff --git a/server/columns.spec.mjs b/server/columns.spec.mjs
index ded8d5e6..76d80254 100644
--- a/server/columns.spec.mjs
+++ b/server/columns.spec.mjs
@@ -1,4 +1,4 @@
-import {join, dirname} from 'node:path';
+import {dirname} from 'node:path';
 import {fileURLToPath} from 'node:url';
 import fs from 'node:fs';
 import test from 'supertape';
@@ -6,7 +6,6 @@ import {getColumns, isDev} from './columns.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const distDir = join(__dirname, '..', 'dist-dev');
 
 test('columns: prod', (t) => {
     const columns = getColumns({
@@ -22,7 +21,7 @@ test('columns: dev', (t) => {
         isDev: true,
     });
     
-    const css = fs.readFileSync(`${distDir}/columns/name-size-date.css`, 'utf8');
+    const css = fs.readFileSync(`${__dirname}/../css/columns/name-size-date.css`, 'utf8');
     
     t.match(columns['name-size-date'], css);
     t.end();
@@ -33,7 +32,7 @@ test('columns: no args', (t) => {
     isDev(true);
     const columns = getColumns();
     
-    const css = fs.readFileSync(`${distDir}/columns/name-size-date.css`, 'utf8');
+    const css = fs.readFileSync(`${__dirname}/../css/columns/name-size-date.css`, 'utf8');
     isDev(currentIsDev);
     
     t.match(columns['name-size-date'], css);
diff --git a/server/themes.spec.mjs b/server/themes.spec.mjs
index a4acc855..ecb99e97 100644
--- a/server/themes.spec.mjs
+++ b/server/themes.spec.mjs
@@ -1,4 +1,4 @@
-import {dirname, join} from 'node:path';
+import {dirname} from 'node:path';
 import {fileURLToPath} from 'node:url';
 import fs from 'node:fs';
 import test from 'supertape';
@@ -6,14 +6,13 @@ import {getThemes, isDev} from './theme.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
-const distDir = join(__dirname, '..', 'dist-dev');
 
 test('themes: dev', (t) => {
     const themes = getThemes({
         isDev: true,
     });
     
-    const css = fs.readFileSync(`${distDir}/themes/dark.css`, 'utf8');
+    const css = fs.readFileSync(`${__dirname}/../css/themes/dark.css`, 'utf8');
     const result = themes.dark.includes(css);
     
     t.ok(result);
@@ -25,7 +24,7 @@ test('themes: no args', (t) => {
     isDev(true);
     const themes = getThemes();
     
-    const css = fs.readFileSync(`${distDir}/themes/light.css`, 'utf8');
+    const css = fs.readFileSync(`${__dirname}/../css/themes/light.css`, 'utf8');
     isDev(currentIsDev);
     
     t.match(themes.light, css);