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
6 changes: 3 additions & 3 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 @@ -33,15 +33,15 @@ jobs:
echo "::set-output name=cache_dir::$(yarn cache dir)"

- name: Настройка кэширования yarn
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ steps.yarn-setup.outputs.cache_dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ 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
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 18
node-version: 22

- name: Установка yarn
id: yarn-setup
run: |
yarn policies set-version 1.22.18
echo "::set-output name=cache_dir::$(yarn cache dir)"
- name: Настройка кэширования yarn
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ steps.yarn-setup.outputs.cache_dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
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
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"unit:clear": "jest --clearCache",
"build:css": "cross-env NODE_ENV=buildProduction postcss src/**/*.css --base src --dir dist/__internal__/src/",
"build:js": "cross-env NODE_ENV=buildProduction BUILDING_JS=true babel --extensions .ts,.tsx --config-file ./babel.config.js --source-maps --out-dir dist/__internal__/src/ ./src",
"build:types": "cross-env NODE_ENV=buildProduction ttsc --declaration --outDir dist/__internal__/src/ --emitDeclarationOnly -p tsconfig.build.json",
"build:types": "cross-env NODE_ENV=buildProduction tsc --declaration --outDir dist/__internal__/src/ --emitDeclarationOnly -p tsconfig.build.json",
"build:package.json": "node scripts/prepare-package-json.js",
"build:reexports": "node scripts/generateReExports.js --config=scripts/generateReExportsConfig.js",
"build:copy-assets": "node scripts/copyAssets.js",
Expand All @@ -26,7 +26,8 @@
"stand:start": "cross-env NODE_ENV=development webpack serve --open --progress --mode development --hot --progress --config node_modules/@consta/stand/webpack.config.js",
"start": "yarn stand:generate && yarn stand:start",
"rm:dist": "node ./scripts/rm.js --path=./dist",
"rm:build": "node ./scripts/rm.js --path=./build"
"rm:build": "node ./scripts/rm.js --path=./build",
"rm:node_modules": "node ./scripts/rm.js --path=./node_modules"
},
"files": [
"*",
Expand Down Expand Up @@ -105,7 +106,7 @@
"@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.134",
"@consta/stand": "^0.0.150",
"@consta/uikit": "^5.0.0",
"@mdx-js/loader": "^2.1.5",
"@oclif/command": "^1.8.16",
Expand All @@ -114,7 +115,7 @@
"@testing-library/react": "^13.0.0",
"@testing-library/react-hooks": "^7.0.2",
"@types/jest": "^27.4.1",
"@types/node": "^16.7.13",
"@types/node": "^22.14.1",
"@types/react": "^18.0.17",
"@types/react-dom": "^18.0.6",
"@types/react-transition-group": "^4.4.5",
Expand Down Expand Up @@ -152,7 +153,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 Down Expand Up @@ -200,8 +201,7 @@
"terser-webpack-plugin": "^5.2.5",
"ts-jest": "^28.0.7",
"ts-loader": "^9.2.8",
"ttypescript": "^1.5.15",
"typescript": "^4.6.3",
"typescript": "^5.8.3",
"typescript-eslint-parser": "^22.0.0",
"typescript-transform-paths": "^3.3.1",
"use-subscription": "^1.5.1",
Expand Down
2 changes: 1 addition & 1 deletion src/utils/formatForValue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const formatDash = (value: string) => {

const formatSpace = (value: string) => {
if (value.indexOf('.') > 0 || value.indexOf(',') > 0) {
const newValue = value.split('.' || ',');
const newValue = value.split('.');
return `${newValue[0].replace(
/(\d)(?=(\d{3})+(\D|$))/g,
'$1 ',
Expand Down
Loading
Loading