arui-scripts 15.8.1 → 15.9.0

package/.eslintrc.js

@@ -9,5 +9,7 @@ module.exports = {
     rules: {
         'import/no-default-export': 'warn',
         'import/no-named-as-default': 'warn',
+        // чтобы могли использовать for и генераторы
+        'no-restricted-syntax': 'off',
     },
 };

package/.turbo/turbo-lint.log

@@ -175,22 +175,27 @@
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/supporting-browsers.ts
   8:8  warning  Prefer named exports  import/no-default-export
 
+/home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/util/__tests__/find-plugin.tests.ts
+   6:14  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+   8:26  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+  12:43  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/util/__tests__/get-polyfills.tests.ts
   41:83  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
   53:83  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/util/apply-overrides.ts
     5:8   warning  Using exported name 'appConfigs' as identifier for default export  import/no-named-as-default
-   24:12  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-   25:18  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+   25:12  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
    26:18  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-   27:24  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-   29:14  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-   40:38  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-   88:9   warning  Unexpected console statement                                       no-console
-   89:9   warning  Unexpected console statement                                       no-console
-  107:48  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
-  130:8   warning  Prefer named exports                                               import/no-default-export
+   27:18  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+   28:24  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+   30:14  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+   41:38  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+   97:9   warning  Unexpected console statement                                       no-console
+   98:9   warning  Unexpected console statement                                       no-console
+  116:48  warning  Unexpected any. Specify a different type                           @typescript-eslint/no-explicit-any
+  139:8   warning  Prefer named exports                                               import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/util/check-node-version.ts
   7:8  warning  Prefer named exports  import/no-default-export
@@ -199,6 +204,9 @@
   9:24  warning  Forbidden non-null assertion  @typescript-eslint/no-non-null-assertion
   9:24  warning  Forbidden non-null assertion  @typescript-eslint/no-non-null-assertion
 
+/home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/util/find-plugin.ts
+  112:39  warning  Unexpected any. Specify a different type  @typescript-eslint/no-explicit-any
+
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/util/get-entry.ts
   32:8  warning  Prefer named exports  import/no-default-export
 
@@ -209,10 +217,10 @@
   24:9  warning  Unexpected console statement  no-console
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/webpack.client.dev.ts
-  14:8  warning  Prefer named exports  import/no-default-export
+  16:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/webpack.client.prod.ts
-  14:8  warning  Prefer named exports  import/no-default-export
+  16:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/webpack.client.ts
    24:8   warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
@@ -220,10 +228,10 @@
   181:58  warning  Unexpected any. Specify a different type                        @typescript-eslint/no-explicit-any
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/webpack.server.dev.ts
-  11:8  warning  Prefer named exports  import/no-default-export
+  12:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/webpack.server.prod.ts
-  11:8  warning  Prefer named exports  import/no-default-export
+  12:8  warning  Prefer named exports  import/no-default-export
 
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/configs/webpack.server.ts
   14:8   warning  Using exported name 'configs' as identifier for default export  import/no-named-as-default
@@ -256,5 +264,5 @@
 /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/src/types.d.ts
   4:12  warning  Prefer named exports  import/no-default-export
 
-✖ 143 problems (0 errors, 143 warnings)
+✖ 147 problems (0 errors, 147 warnings)
 

package/.turbo/turbo-test.log

@@ -1,4 +1,9 @@
-PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (41.137 s)
+Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
+Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
+Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
+Failed to load /home/runner/work/arui-scripts/arui-scripts/packages/arui-scripts/tsconfig.json: Missing baseUrl in compilerOptions
+PASS src/configs/util/__tests__/find-plugin.tests.ts (46.055 s)
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts
 PASS src/configs/util/__tests__/get-polyfills.tests.ts
 PASS src/configs/util/__tests__/apply-overrides.tests.ts
 PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
@@ -84,8 +89,8 @@ PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
       at Object.<anonymous> (src/configs/app-configs/__tests__/validate-settings-keys.tests.ts:15:29)
 
 
-Test Suites: 6 passed, 6 total
-Tests:       17 passed, 17 total
+Test Suites: 7 passed, 7 total
+Tests:       21 passed, 21 total
 Snapshots:   0 total
-Time:        47.455 s
+Time:        49.897 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # [15.3.0](https://github.com/core-ds/arui-scripts/compare/v15.2.0...v15.3.0) (2023-06-30)
 
+## 15.9.0
+
+### Minor Changes
+
+-   [#143](https://github.com/core-ds/arui-scripts/pull/143) [`1d94d1f`](https://github.com/core-ds/arui-scripts/commit/1d94d1fd57c1899966624b497c3506e0c818410e) Thanks [@Echzio](https://github.com/Echzio)! - добавление findPlugin хелпера для overrides-файла
+
+## 15.8.2
+
+### Patch Changes
+
+-   [#137](https://github.com/core-ds/arui-scripts/pull/137) [`6aa87a0`](https://github.com/core-ds/arui-scripts/commit/6aa87a046e7307847c55b95ed3bc7ba061b2de41) Thanks [@dependabot](https://github.com/apps/dependabot)! - Обновлен postcss для исправления уязвимостей
+
 ## 15.8.1
 
 ### Patch Changes

package/build/configs/util/apply-overrides.d.ts

@@ -3,6 +3,7 @@ import type { Configuration as WebpackDevServerConfiguration } from 'webpack-dev
 import { AppContextWithConfigs } from '../app-configs/types';
 import { createSingleClientWebpackConfig } from '../webpack.client';
 import { findLoader } from './find-loader';
+import { findPlugin } from './find-plugin';
 type Overrides = {
     webpack: WebpackConfiguration | WebpackConfiguration[];
     webpackClient: WebpackConfiguration | WebpackConfiguration[];
@@ -33,6 +34,11 @@ type BoundCreateSingleClientWebpackConfig = OmitFirstArg<typeof createSingleClie
 type ClientWebpackAdditionalArgs = {
     createSingleClientWebpackConfig: BoundCreateSingleClientWebpackConfig;
     findLoader: typeof findLoader;
+    findPlugin: ReturnType<typeof findPlugin<'client'>>;
+};
+type ServerWebpackAdditionalArgs = {
+    findLoader: typeof findLoader;
+    findPlugin: ReturnType<typeof findPlugin<'server'>>;
 };
 /**
  * Дополнительные аргументы, которые будут переданы в функцию оверрайда
@@ -42,6 +48,8 @@ type OverridesAdditionalArgs = {
     webpackClient: ClientWebpackAdditionalArgs;
     webpackDev: ClientWebpackAdditionalArgs;
     webpackClientDev: ClientWebpackAdditionalArgs;
+    webpackServer: ServerWebpackAdditionalArgs;
+    webpackServerDev: ServerWebpackAdditionalArgs;
 };
 type OverrideFunction<K extends keyof Overrides, AdditionalArgs = K extends keyof OverridesAdditionalArgs ? OverridesAdditionalArgs[K] : undefined> = (config: Overrides[K], appConfig: AppContextWithConfigs, additionalArgs: AdditionalArgs) => Overrides[K];
 export type OverrideFile = {

package/build/configs/util/find-plugin.d.ts

@@ -0,0 +1,83 @@
+/// <reference types="node" />
+import { Cluster } from 'cluster';
+import { ReactRefreshPluginOptions } from '@pmmmwh/react-refresh-webpack-plugin/types/lib/types';
+import AssetsPlugin from 'assets-webpack-plugin';
+import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
+import CompressionPlugin from 'compression-webpack-plugin';
+import { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-plugin/lib/ForkTsCheckerWebpackPluginOptions';
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import { RunScriptWebpackPlugin } from 'run-script-webpack-plugin';
+import webpack from 'webpack';
+import { WebpackDeduplicationPlugin } from 'webpack-deduplication-plugin';
+import { WebpackManifestPlugin } from 'webpack-manifest-plugin';
+type PluginsListClient = {
+    AssetsWebpackPlugin: {
+        options: AssetsPlugin.Options;
+    };
+    DefinePlugin: {
+        definitions: ConstructorParameters<typeof webpack.DefinePlugin>[number];
+    };
+    MiniCssExtractPlugin: {
+        options: MiniCssExtractPlugin.PluginOptions;
+        runtimeOptions: MiniCssExtractPlugin.RuntimeOptions;
+    };
+    ForkTsCheckerWebpackPlugin: {
+        options: ForkTsCheckerWebpackPluginOptions;
+    };
+    IgnorePlugin: {
+        options: {
+            contextRegExp?: RegExp;
+            resourceRegExp: RegExp;
+        } | {
+            checkResource: (resource: string, context: string) => boolean;
+        };
+        checkIgnore: (resolveData: webpack.ResolveData) => undefined | false;
+    };
+    WebpackDeduplicationPlugin: WebpackDeduplicationPlugin;
+    ReactRefreshPlugin: {
+        options: ReactRefreshPluginOptions;
+    };
+    CaseSensitivePathsPlugin: {
+        options: CaseSensitivePathsPlugin.Options;
+        logger: {
+            [K in keyof Console]: Console[K];
+        };
+    };
+    WebpackManifestPlugin: {
+        options: ConstructorParameters<typeof WebpackManifestPlugin>[number];
+    };
+    CompressionPlugin: {
+        options: ConstructorParameters<typeof CompressionPlugin>[number];
+    };
+    NormalModuleReplacementPlugin: webpack.NormalModuleReplacementPlugin;
+};
+type PluginsListServer = {
+    BannerPlugin: {
+        options: webpack.BannerPlugin['options'];
+    };
+    RunScriptWebpackPlugin: {
+        options: ConstructorParameters<typeof RunScriptWebpackPlugin>[number];
+    };
+    ReloadServerPlugin: {
+        done: (...props: unknown[]) => unknown | null;
+        workers: Array<Cluster['Worker']>;
+    };
+    CaseSensitivePathsPlugin: {
+        options: CaseSensitivePathsPlugin.Options;
+        logger: {
+            [K in keyof Console]: Console[K];
+        };
+    };
+    WatchMissingNodeModulesPlugin: {
+        nodeModulesPath: string;
+    };
+};
+type SelectedPluginsList<Type extends 'client' | 'server'> = Type extends 'client' ? PluginsListClient : PluginsListServer;
+/**
+ *
+ * @param config конфигурация webpack
+ * @param pluginName имя плагина
+ * @returns плагин или плагины, которые подошли под условие из testRule
+ */
+export declare function findPlugin<Type extends 'client' | 'server'>(): <PluginName extends keyof SelectedPluginsList<Type>>(config: webpack.Configuration, pluginName: PluginName) => SelectedPluginsList<Type>[PluginName][];
+export {};

package/build/configs/util/find-plugin.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findPlugin = void 0;
+/**
+ *
+ * @param config конфигурация webpack
+ * @param pluginName имя плагина
+ * @returns плагин или плагины, которые подошли под условие из testRule
+ */
+function findPlugin() {
+    return (config, pluginName) => {
+        if (!config.plugins || !pluginName)
+            return [];
+        const result = [];
+        for (const plugin of config.plugins) {
+            if ((plugin === null || plugin === void 0 ? void 0 : plugin.constructor.name) === pluginName) {
+                result.push(plugin);
+            }
+        }
+        return result;
+    };
+}
+exports.findPlugin = findPlugin;

package/build/configs/webpack.client.dev.js

@@ -5,9 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
 const find_loader_1 = require("./util/find-loader");
+const find_plugin_1 = require("./util/find-plugin");
 const webpack_client_1 = require("./webpack.client");
 const config = (0, apply_overrides_1.default)(['webpack', 'webpackClient', 'webpackDev', 'webpackClientDev'], (0, webpack_client_1.createClientWebpackConfig)('dev'), {
     createSingleClientWebpackConfig: webpack_client_1.createSingleClientWebpackConfig.bind(null, 'dev'),
     findLoader: find_loader_1.findLoader,
+    findPlugin: (0, find_plugin_1.findPlugin)(),
 });
 exports.default = config;

package/build/configs/webpack.client.prod.js

@@ -5,9 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
 const find_loader_1 = require("./util/find-loader");
+const find_plugin_1 = require("./util/find-plugin");
 const webpack_client_1 = require("./webpack.client");
 const config = (0, apply_overrides_1.default)(['webpack', 'webpackClient', 'webpackProd', 'webpackClientProd'], (0, webpack_client_1.createClientWebpackConfig)('prod'), {
     createSingleClientWebpackConfig: webpack_client_1.createSingleClientWebpackConfig.bind(null, 'prod'),
     findLoader: find_loader_1.findLoader,
+    findPlugin: (0, find_plugin_1.findPlugin)(),
 });
 exports.default = config;

package/build/configs/webpack.server.dev.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
 const find_loader_1 = require("./util/find-loader");
+const find_plugin_1 = require("./util/find-plugin");
 const webpack_server_1 = require("./webpack.server");
-const config = (0, apply_overrides_1.default)(['webpack', 'webpackServer', 'webpackDev', 'webpackServerDev'], (0, webpack_server_1.createServerConfig)('dev'), { findLoader: find_loader_1.findLoader });
+const config = (0, apply_overrides_1.default)(['webpack', 'webpackServer', 'webpackDev', 'webpackServerDev'], (0, webpack_server_1.createServerConfig)('dev'), { findLoader: find_loader_1.findLoader, findPlugin: (0, find_plugin_1.findPlugin)() });
 exports.default = config;

package/build/configs/webpack.server.prod.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const apply_overrides_1 = __importDefault(require("./util/apply-overrides"));
 const find_loader_1 = require("./util/find-loader");
+const find_plugin_1 = require("./util/find-plugin");
 const webpack_server_1 = require("./webpack.server");
-const config = (0, apply_overrides_1.default)(['webpack', 'webpackServer', 'webpackProd', 'webpackServerProd'], (0, webpack_server_1.createServerConfig)('prod'), { findLoader: find_loader_1.findLoader });
+const config = (0, apply_overrides_1.default)(['webpack', 'webpackServer', 'webpackProd', 'webpackServerProd'], (0, webpack_server_1.createServerConfig)('prod'), { findLoader: find_loader_1.findLoader, findPlugin: (0, find_plugin_1.findPlugin)() });
 exports.default = config;