Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into fix/lineclamp/unexpected-t…
Browse files Browse the repository at this point in the history
…ooltip-shown@970
  • Loading branch information
Qs-F committed Jul 22, 2024
2 parents 654ab12 + 19f0206 commit 6587fbb
Show file tree
Hide file tree
Showing 4 changed files with 1,017 additions and 1,036 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"eslint": "^8.57.0",
"eslint-config-smarthr": "^6.33.0",
"eslint-plugin-storybook": "^0.8.0",
"husky": "^9.0.11",
"husky": "^9.1.1",
"lint-staged": "^15.2.7",
"prettier": "^3.3.3",
"prettier-config-smarthr": "^1.0.0",
Expand All @@ -27,7 +27,7 @@
"commitmsg": "commitlint -e $GIT_PARAMS",
"prepare": "husky"
},
"packageManager": "pnpm@9.5.0",
"packageManager": "pnpm@9.6.0",
"pnpm": {
"overrides": {
"@babel/helper-compilation-targets": "^7.24.8",
Expand Down
44 changes: 22 additions & 22 deletions packages/smarthr-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"@smarthr/wareki": "^1.2.0",
"css-loader": "^7.1.2",
"dayjs": "^1.11.11",
"dayjs": "^1.11.12",
"lodash.merge": "^4.6.2",
"lodash.range": "^3.2.0",
"polished": "^4.3.0",
Expand All @@ -20,35 +20,35 @@
"tailwindcss": "^3.4.6"
},
"devDependencies": {
"@babel/core": "^7.24.8",
"@babel/core": "^7.24.9",
"@babel/preset-env": "^7.24.8",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@storybook/addon-a11y": "^8.2.2",
"@storybook/addon-actions": "^8.2.2",
"@storybook/addon-essentials": "^8.2.2",
"@storybook/addon-interactions": "^8.2.2",
"@storybook/addon-storysource": "^8.2.2",
"@storybook/addon-a11y": "^8.2.5",
"@storybook/addon-actions": "^8.2.5",
"@storybook/addon-essentials": "^8.2.5",
"@storybook/addon-interactions": "^8.2.5",
"@storybook/addon-storysource": "^8.2.5",
"@storybook/addon-styling": "^1.3.7",
"@storybook/addon-styling-webpack": "^1.0.0",
"@storybook/addon-viewport": "^8.2.2",
"@storybook/addon-viewport": "^8.2.5",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/blocks": "^8.2.2",
"@storybook/cli": "^8.2.2",
"@storybook/manager-api": "^8.2.2",
"@storybook/react": "^8.2.2",
"@storybook/react-webpack5": "^8.2.2",
"@storybook/source-loader": "^8.2.2",
"@storybook/test": "^8.2.2",
"@storybook/blocks": "^8.2.5",
"@storybook/cli": "^8.2.5",
"@storybook/manager-api": "^8.2.5",
"@storybook/react": "^8.2.5",
"@storybook/react-webpack5": "^8.2.5",
"@storybook/source-loader": "^8.2.5",
"@storybook/test": "^8.2.5",
"@storybook/test-runner": "^0.19.1",
"@storybook/theming": "^8.2.2",
"@swc/core": "^1.6.13",
"@storybook/theming": "^8.2.5",
"@swc/core": "^1.7.0",
"@swc/jest": "^0.2.36",
"@testing-library/react": "^16.0.0",
"@types/jest": "^29.5.12",
"@types/lodash.merge": "^4.6.9",
"@types/lodash.range": "^3.2.9",
"@types/node": "^20.14.10",
"@types/node": "^20.14.11",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-test-renderer": "^17.0.9",
Expand All @@ -59,7 +59,7 @@
"babel-loader": "^9.1.3",
"babel-plugin-polyfill-corejs2": "^0.4.11",
"babel-plugin-polyfill-regenerator": "^0.6.2",
"chromatic": "^11.5.5",
"chromatic": "^11.5.6",
"ecma-version-validator-webpack-plugin": "^1.2.1",
"fs-extra": "^11.2.0",
"glob": "11.0.0",
Expand All @@ -69,19 +69,19 @@
"jest-styled-components": "^7.2.0",
"memory-fs": "^0.5.0",
"npm-run-all": "^4.1.5",
"playwright": "^1.45.1",
"playwright": "^1.45.2",
"postcss": "^8.4.39",
"postcss-styled-syntax": "^0.6.4",
"postcss-syntax": "^0.36.2",
"puppeteer": "^22.13.0",
"puppeteer": "^22.13.1",
"react": "^18.3.1",
"react-docgen-typescript": "^2.2.2",
"react-dom": "^18.3.1",
"react-ga4": "^2.1.0",
"react-test-renderer": "^18.3.1",
"rimraf": "^6.0.1",
"standard-version": "^9.3.2",
"storybook": "^8.2.2",
"storybook": "^8.2.5",
"storybook-addon-pseudo-states": "^3.1.1",
"styled-components": "^5.3.11",
"testcafe": "3.6.2",
Expand Down
Loading

0 comments on commit 6587fbb

Please sign in to comment.