diff --git a/.eslintrc.js b/.eslintrc.js index d1f25b4..95a3652 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -55,7 +55,7 @@ module.exports = { 'react-hooks/rules-of-hooks': 'error', 'react-hooks/exhaustive-deps': 'error', 'no-param-reassign': 'off', - 'linebreak-style': ['error', 'windows'], // Добавьте эту строку + 'linebreak-style': 'off', }, globals: { __IS_DEV__: true, diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 41c475a..72340e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,9 @@ name: linting, testing, building on: push: - branches: [ master ] + branches: [ master, develop ] pull_request: - branches: [ master ] + branches: [ master, develop ] jobs: pipeline: runs-on: ubuntu-latest @@ -33,6 +33,6 @@ jobs: - name: build storybook run: npm run storybook:build if: always() - - name: screenshot testing - run: npm run test:ui:ci - if: always() + # - name: screenshot testing + # run: npm run test:ui:ci + # if: always() diff --git a/config/build/buildPlugins.ts b/config/build/buildPlugins.ts index 7658841..9c42960 100644 --- a/config/build/buildPlugins.ts +++ b/config/build/buildPlugins.ts @@ -1,6 +1,6 @@ import HtmlWebpackPlugin from 'html-webpack-plugin'; -import webpack from 'webpack'; import MiniCssExtractPlugin from 'mini-css-extract-plugin'; +import webpack from 'webpack'; import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'; import { BuildOptions } from './types/config';