feat(postcss): move insertPlugin in createPostcssConfig

Author: Обмочевский Владислав Вячеславович

packages/arui-scripts/src/configs/postcss.config.ts

@@ -1,3 +1,8 @@
+import path from 'path';
+
+import { insertPlugin } from '../plugins/insert-plugin';
+import { postCssGlobalData } from '../plugins/postcss-global-data/postcss-global-data';
+
 import config from './app-configs';
 import supportingBrowsers from './supporting-browsers';
 /**
@@ -10,13 +15,18 @@ export function createPostcssConfig(
     plugins: string[],
     options: Record<string, unknown>,
 ): string[] | unknown[] {
-    return plugins.map((pluginName) => {
+    const postcssPlugins = plugins.map((pluginName) => {
         if (pluginName in options) {
             return [pluginName, options[pluginName]];
         }
 
         return pluginName;
     });
+
+    // добавляем postCssGlobalData плагин перед postcss-custom-media
+   return insertPlugin(postcssPlugins, 'postcss-custom-media', postCssGlobalData({
+        files: [path.join(__dirname, 'mq.css'), config.componentsTheme].filter(Boolean) as string[]
+    }));
 }
 
 export const postcssPlugins = [

packages/arui-scripts/src/configs/webpack.client.ts

@@ -20,8 +20,6 @@ import { WebpackDeduplicationPlugin } from 'webpack-deduplication-plugin';
 import { WebpackManifestPlugin } from 'webpack-manifest-plugin';
 
 import { AruiRuntimePlugin, getInsertCssRuntimeMethod } from '../plugins/arui-runtime';
-import { insertPlugin } from '../plugins/insert-plugin';
-import { postCssGlobalData } from '../plugins/postcss-global-data/postcss-global-data';
 import { htmlTemplate } from '../templates/html.template';
 
 import { getImageMin } from './config-extras/minimizers';
@@ -287,10 +285,7 @@ export const createSingleClientWebpackConfig = (
                                 loader: require.resolve('postcss-loader'),
                                 options: {
                                     postcssOptions: {
-                                        // добавляем postCssGlobalData плагин перед postcss-custom-media
-                                        plugins: insertPlugin(postcssConf, 'postcss-custom-media', postCssGlobalData({
-                                            files: [path.join(__dirname, 'mq.css'), configs.componentsTheme].filter(Boolean) as string[]
-                                        }))
+                                        plugins: postcssConf,
                                     },
                                 },
                             },
@@ -318,10 +313,7 @@ export const createSingleClientWebpackConfig = (
                                 loader: require.resolve('postcss-loader'),
                                 options: {
                                     postcssOptions: {
-                                        // добавляем postCssGlobalData плагин перед postcss-custom-media
-                                        plugins: insertPlugin(postcssConf, 'postcss-custom-media', postCssGlobalData({
-                                            files: [path.join(__dirname, 'mq.css'), configs.componentsTheme].filter(Boolean) as string[]
-                                        }))
+                                        plugins: postcssConf,
                                     },
                                 },
                             },