Merge branch 'feat/plugins' of https://github.com/langgenius/dify into feat/plugins

web/app/components/develop/md.tsx

@@ -54,7 +54,7 @@ export const Heading = function H2({
 
 export function Row({ children }: IChildrenProps) {
   return (
-    <div className="grid items-start grid-cols-1 gap-x-16 gap-y-10 xl:max-w-none xl:grid-cols-2">
+    <div className="grid items-start grid-cols-1 gap-x-16 gap-y-10 xl:!max-w-none xl:grid-cols-2">
       {children}
     </div>
   )

web/app/components/workflow/block-selector/tool-picker.tsx

@@ -51,7 +51,7 @@ const ToolPicker: FC<Props> = ({
 
   const { data: buildInTools } = useAllBuiltInTools()
   const { data: customTools } = useAllCustomTools()
-  const { invalidate: invalidateCustomTools } = useInvalidateAllCustomTools()
+  const invalidateCustomTools = useInvalidateAllCustomTools()
   const { data: workflowTools } = useAllWorkflowTools()
 
   const handleAddedCustomTool = invalidateCustomTools

web/package.json

@@ -42,8 +42,7 @@
     "@sentry/react": "^7.54.0",
     "@sentry/utils": "^7.54.0",
     "@svgdotjs/svg.js": "^3.2.4",
-    "@tailwindcss/line-clamp": "^0.4.4",
+    "@tailwindcss/typography": "^0.5.15",
-    "@tailwindcss/typography": "^0.5.9",
     "@tanstack/react-query": "^5.59.20",
     "@tanstack/react-query-devtools": "^5.59.20",
     "@types/hast": "^3.0.4",
@@ -107,7 +106,7 @@
     "sharp": "^0.33.5",
     "sortablejs": "^1.15.3",
     "swr": "^2.1.0",
-    "tailwind-merge": "^2.4.0",
+    "tailwind-merge": "^2.5.4",
     "use-context-selector": "^2.0.0",
     "uuid": "^10.0.0",
     "zod": "^3.23.8",
@@ -152,7 +151,7 @@
     "@types/semver": "^7.5.8",
     "@types/sortablejs": "^1.15.1",
     "@types/uuid": "^10.0.0",
-    "autoprefixer": "^10.4.14",
+    "autoprefixer": "^10.4.20",
     "bing-translate-api": "^4.0.2",
     "code-inspector-plugin": "^0.17.4",
     "cross-env": "^7.0.3",
@@ -166,10 +165,10 @@
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^15.2.10",
     "magicast": "^0.3.4",
-    "postcss": "^8.4.31",
+    "postcss": "^8.4.47",
     "sass": "^1.80.3",
     "storybook": "^8.3.6",
-    "tailwindcss": "^3.4.4",
+    "tailwindcss": "^3.4.14",
     "ts-node": "^10.9.2",
     "typescript": "4.9.5",
     "uglify-js": "^3.19.3"

web/pnpm-lock.yaml

@@ -67,11 +67,8 @@ importers:
       '@svgdotjs/svg.js':
         specifier: ^3.2.4
         version: 3.2.4
-      '@tailwindcss/line-clamp':
-        specifier: ^0.4.4
-        version: 0.4.4(tailwindcss@3.4.14(ts-node@10.9.2(@types/node@18.15.0)(typescript@4.9.5)))
       '@tailwindcss/typography':
-        specifier: ^0.5.9
+        specifier: ^0.5.15
         version: 0.5.15(tailwindcss@3.4.14(ts-node@10.9.2(@types/node@18.15.0)(typescript@4.9.5)))
       '@tanstack/react-query':
         specifier: ^5.59.20
@@ -263,7 +260,7 @@ importers:
         specifier: ^2.1.0
         version: 2.2.5(react@18.2.0)
       tailwind-merge:
-        specifier: ^2.4.0
+        specifier: ^2.5.4
         version: 2.5.4
       use-context-selector:
         specifier: ^2.0.0
@@ -393,7 +390,7 @@ importers:
         specifier: ^10.0.0
         version: 10.0.0
       autoprefixer:
-        specifier: ^10.4.14
+        specifier: ^10.4.20
         version: 10.4.20(postcss@8.4.47)
       bing-translate-api:
         specifier: ^4.0.2
@@ -435,7 +432,7 @@ importers:
         specifier: ^0.3.4
         version: 0.3.5
       postcss:
-        specifier: ^8.4.31
+        specifier: ^8.4.47
         version: 8.4.47
       sass:
         specifier: ^1.80.3
@@ -444,7 +441,7 @@ importers:
         specifier: ^8.3.6
         version: 8.3.6
       tailwindcss:
-        specifier: ^3.4.4
+        specifier: ^3.4.14
         version: 3.4.14(ts-node@10.9.2(@types/node@18.15.0)(typescript@4.9.5))
       ts-node:
         specifier: ^10.9.2
@@ -2371,11 +2368,6 @@ packages:
     resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
     engines: {node: '>=10'}
 
-  '@tailwindcss/line-clamp@0.4.4':
-    resolution: {integrity: sha512-5U6SY5z8N42VtrCrKlsTAA35gy2VSyYtHWCsg1H87NU1SXnEfekTVlrga9fzUDrrHcGi2Lb5KenUWb4lRQT5/g==}
-    peerDependencies:
-      tailwindcss: '>=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1'
-
   '@tailwindcss/typography@0.5.15':
     resolution: {integrity: sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==}
     peerDependencies:
@@ -10649,10 +10641,6 @@ snapshots:
     dependencies:
       defer-to-connect: 2.0.1
 
-  '@tailwindcss/line-clamp@0.4.4(tailwindcss@3.4.14(ts-node@10.9.2(@types/node@18.15.0)(typescript@4.9.5)))':
-    dependencies:
-      tailwindcss: 3.4.14(ts-node@10.9.2(@types/node@18.15.0)(typescript@4.9.5))
-
   '@tailwindcss/typography@0.5.15(tailwindcss@3.4.14(ts-node@10.9.2(@types/node@18.15.0)(typescript@4.9.5)))':
     dependencies:
       lodash.castarray: 4.4.0

web/service/use-tools.ts

@@ -30,13 +30,11 @@ export const useAllCustomTools = () => {
 
 export const useInvalidateAllCustomTools = () => {
   const queryClient = useQueryClient()
-  return {
+  return () => {
-    invalidate: () => {
+    queryClient.invalidateQueries(
-      queryClient.invalidateQueries(
+      {
-        {
+        queryKey: useAllCustomToolsKey,
-          queryKey: useAllCustomToolsKey,
+      })
-        })
-    },
   }
 }