Merge branch 'master' into fix/lineclamp/unexpected-tooltip-shown@970

kufu · Jun 13, 2024 · 02faffa · 02faffa
2 parents b5a1e3e + 71053ed
commit 02faffa
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 53 deletions.
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "lint-staged": "^15.2.5",
     "prettier": "^3.3.1",
     "prettier-config-smarthr": "^1.0.0",
-    "prettier-plugin-tailwindcss": "^0.6.2",
+    "prettier-plugin-tailwindcss": "^0.6.4",
     "stylelint": "^16.6.1",
     "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-smarthr": "^3.0.1",
@@ -27,7 +27,7 @@
     "commitmsg": "commitlint -e $GIT_PARAMS",
     "prepare": "husky"
   },
-  "packageManager": "pnpm@9.2.0",
+  "packageManager": "pnpm@9.3.0",
   "pnpm": {
     "overrides": {
       "@babel/helper-compilation-targets": "^7.24.7",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sandbox/next/package.json b/sandbox/next/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "next": "14.2.3",
+    "next": "14.2.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "smarthr-ui": "workspace:*"