Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Устанавливаем Node.JS для сборки приложения
- uses: actions/setup-node@v1
with:
node-version: 18
node-version: 22

- name: Install yarn
id: yarn-setup
Expand All @@ -41,7 +41,7 @@ jobs:
${{ runner.os }}-yarn-

- name: Install dependencies
run: yarn --frozen-lockfile
run: yarn add "install-peers-cli@https://github.com/evless/install-peers-cli#fix-yarn-policies" && yarn --frozen-lockfile

# Записываем в переменные окружения имя текущей ветки
# Чтобы избежать конфиликтов с URL, меняем точки на _, а слеши на минусы
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 18
node-version: 22

- name: Установка yarn
id: yarn-setup
Expand All @@ -34,6 +34,6 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: Установка зависимостей
run: yarn --frozen-lockfile
run: yarn add "install-peers-cli@https://github.com/evless/install-peers-cli#fix-yarn-policies" && yarn --frozen-lockfile
- name: Тесты
run: yarn test
2 changes: 1 addition & 1 deletion .husky/prepare-commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

exec < /dev/tty && npx cz --hook || true
if [ exec < /dev/tty ]; then exec < /dev/tty && npx cz --hook || true; else echo non-interactive variant; fi
16 changes: 14 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,18 @@
"@babel/preset-env": "^7.18.9",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@bem-react/classname": "^1.6.0",
"@bem-react/classnames": "^1.3.10",
"@bem/sdk.naming.cell.match": "^0.1.3",
"@bem/sdk.naming.presets": "^0.2.3",
"@consta/stand": "^0.0.128",
"@consta/icons": "^1.0.1",
"@consta/stand": "^0.0.150",
"@consta/uikit": "^5.0.0",
"@mdx-js/loader": "^2.1.5",
"@oclif/command": "^1.8.16",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
"@reatom/framework": "^3.4.6",
"@reatom/npm-react": "^3.10.6",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.0.0",
"@testing-library/react-hooks": "^7.0.2",
Expand All @@ -117,11 +123,13 @@
"camelcase": "^6.2.1",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"commitizen": "^4.2.5",
"compute-scroll-into-view": "^1.0.17",
"cross-env": "^7.0.3",
"css-loader": "^6.5.1",
"css-minimizer-webpack-plugin": "^3.4.1",
"cssnano": "^5.1.12",
"cz-conventional-changelog": "3.3.0",
"date-fns": "^2.30.0",
"dotenv": "^10.0.0",
"dotenv-expand": "^5.1.0",
"eslint": "^8.20.0",
Expand All @@ -137,7 +145,7 @@
"html-webpack-plugin": "^5.5.0",
"husky": "^8.0.1",
"identity-obj-proxy": "^3.0.0",
"install-peers-cli": "https://github.com/evless/install-peers-cli#fix-yarn-policies",
"install-peers-cli": "2.2.0",
"jest": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"lint-staged": "^13.0.3",
Expand All @@ -160,8 +168,12 @@
"react-app-polyfill": "^3.0.0",
"react-dev-utils": "^12.0.0",
"react-dom": "^18.0.0",
"react-dropzone": "^14.2.3",
"react-imask": "^7.2.1",
"react-refresh": "^0.11.0",
"react-test-renderer": "^18.0.0",
"react-textarea-autosize": "^8.5.3",
"react-transition-group": "^4.4.5",
"resolve": "^1.20.0",
"resolve-url-loader": "^4.0.0",
"sass-loader": "^12.3.0",
Expand Down
Loading
Loading