Merge branch 'master' into feat/multi-tenancy

# Conflicts: # packages/webapp-libs/webapp-core/package.json # pnpm-lock.yaml
apptension · May 20, 2024 · 9065ca3 · 9065ca3
2 parents 6127c1c + 569fcee
commit 9065ca3
Show file tree

Hide file tree

Showing 9 changed files with 1,046 additions and 1,292 deletions.
diff --git a/package.json b/package.json
@@ -29,18 +29,18 @@
     "@storybook/react": "^8.0.9",
     "@svgr/webpack": "^8.1.0",
     "@tailwindcss/typography": "^0.5.10",
-    "@testing-library/dom": "^9.3.3",
-    "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "15.0.6",
+    "@testing-library/dom": "10.1.0",
+    "@testing-library/jest-dom": "^6.4.5",
+    "@testing-library/react": "15.0.7",
     "@testing-library/react-hooks": "^8.0.1",
-    "@testing-library/user-event": "^14.5.1",
+    "@testing-library/user-event": "^14.5.2",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/gtag.js": "^0.0.14",
     "@types/jest": "^29.5.10",
     "@types/node": "18.19.32",
     "@types/ramda": "^0.28.25",
-    "@types/react": "18.3.1",
-    "@types/react-dom": "18.3.0",
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.0",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "5.3.3",
     "@types/react-test-renderer": "^18.0.7",

diff --git a/packages/webapp-libs/webapp-contentful/package.json b/packages/webapp-libs/webapp-contentful/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@sb/webapp-api-client": "workspace:*",
     "@sb/webapp-core": "workspace:*",
-    "lucide-react": "^0.224.0",
+    "lucide-react": "^0.378.0",
     "query-string": "^7.1.3"
   },
   "peerDependencies": {

diff --git a/packages/webapp-libs/webapp-core/package.json b/packages/webapp-libs/webapp-core/package.json
@@ -9,36 +9,36 @@
     "type-check": "tsc --noEmit --project tsconfig.lib.json"
   },
   "dependencies": {
-    "@radix-ui/react-alert-dialog": "^1.0.5",
-    "@radix-ui/react-avatar": "^1.0.4",
-    "@radix-ui/react-checkbox": "^1.0.4",
-    "@radix-ui/react-dialog": "^1.0.5",
-    "@radix-ui/react-dropdown-menu": "^2.0.6",
-    "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-label": "^2.0.2",
-    "@radix-ui/react-popover": "^1.0.7",
-    "@radix-ui/react-radio-group": "^1.1.3",
-    "@radix-ui/react-select": "^1.2.2",
-    "@radix-ui/react-separator": "^1.0.3",
-    "@radix-ui/react-slot": "^1.0.2",
-    "@radix-ui/react-tabs": "^1.0.4",
-    "@radix-ui/react-toast": "^1.1.5",
-    "@radix-ui/react-tooltip": "^1.0.7",
+    "@radix-ui/react-alert-dialog": "1.0.5",
+    "@radix-ui/react-avatar": "1.0.4",
+    "@radix-ui/react-checkbox": "1.0.4",
+    "@radix-ui/react-dialog": "1.0.5",
+    "@radix-ui/react-dropdown-menu": "2.0.6",
+    "@radix-ui/react-icons": "1.3.0",
+    "@radix-ui/react-label": "2.0.2",
+    "@radix-ui/react-popover": "1.0.7",
+    "@radix-ui/react-radio-group": "1.1.3",
+    "@radix-ui/react-select": "1.2.2",
+    "@radix-ui/react-separator": "1.0.3",
+    "@radix-ui/react-slot": "1.0.2",
+    "@radix-ui/react-tabs": "1.0.4",
+    "@radix-ui/react-toast": "1.1.5",
+    "@radix-ui/react-tooltip": "1.0.7",
     "color": "^4.2.3",
-    "core-js": "^3.33.3",
+    "core-js": "^3.37.1",
     "lodash.throttle": "^4.1.1",
     "react-dropzone": "^14.2.3"
   },
   "devDependencies": {
     "@types/color": "^3.0.6",
     "@types/lodash.throttle": "^4.1.9",
-    "babel-jest": "28.1.3",
-    "class-variance-authority": "^0.6.1",
-    "clsx": "^1.2.1",
+    "babel-jest": "29.7.0",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.1",
     "isomorphic-fetch": "^3.0.0",
-    "lucide-react": "^0.224.0",
+    "lucide-react": "^0.378.0",
     "mockdate": "^3.0.5",
     "resize-observer-polyfill": "^1.5.1",
-    "tailwind-merge": "^1.14.0"
+    "tailwind-merge": "^2.3.0"
   }
 }
diff --git a/packages/webapp-libs/webapp-crud-demo/package.json b/packages/webapp-libs/webapp-crud-demo/package.json
@@ -12,7 +12,7 @@
     "@sb/webapp-api-client": "workspace:*",
     "@sb/webapp-core": "workspace:*",
     "@sb/webapp-notifications": "workspace:*",
-    "lucide-react": "^0.224.0",
+    "lucide-react": "^0.378.0",
     "react-click-away-listener": "^2.2.3"
   }
 }
diff --git a/packages/webapp-libs/webapp-documents/package.json b/packages/webapp-libs/webapp-documents/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@sb/webapp-api-client": "workspace:*",
     "@sb/webapp-core": "workspace:*",
-    "lucide-react": "^0.224.0"
+    "lucide-react": "^0.378.0"
   }
 }
diff --git a/packages/webapp-libs/webapp-finances/package.json b/packages/webapp-libs/webapp-finances/package.json
@@ -17,6 +17,6 @@
     "react-click-away-listener": "^2.2.3"
   },
   "devDependencies": {
-    "lucide-react": "^0.224.0"
+    "lucide-react": "^0.378.0"
   }
 }
diff --git a/packages/webapp-libs/webapp-notifications/package.json b/packages/webapp-libs/webapp-notifications/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@sb/webapp-api-client": "workspace:*",
     "@sb/webapp-core": "workspace:*",
-    "lucide-react": "^0.224.0",
+    "lucide-react": "^0.378.0",
     "react-click-away-listener": "^2.2.3",
     "react-infinite-scroll-hook": "^4.1.1"
   }

diff --git a/packages/webapp/package.json b/packages/webapp/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "intl": "^1.2.5",
-    "lucide-react": "^0.279.0",
+    "lucide-react": "^0.378.0",
     "qrcode": "^1.5.3",
     "react": "18.3.1",
     "react-dom": "18.3.1"