Merge pull request #1739 from lowcoder-org/dev

FalkWolsky · web-flow · commit 6284ae756425 · 2025-06-03T10:31:28.000+02:00
Dev -&gt; Main for 2.7.1
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,6 @@ server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
 translations/locales/node_modules/
 server/api-service/lowcoder-server/src/main/resources/application-local-dev-ee.yaml
 node_modules
+
+# Local Netlify folder
+.netlify
diff --git a/client/README.md b/client/README.md
@@ -116,4 +116,73 @@ When you finish developing and testing the plugin, you can publish it into the n
 yarn build --publish
 ```
 
-You can check a code demo here:  [Code Demo on Github](https://github.com/lowcoder-org/lowcoder/tree/main/client/packages/lowcoder-plugin-demo)
+You can check a code demo here:  [Code Demo on Github](https://github.com/lowcoder-org/lowcoder/tree/main/client/packages/lowcoder-plugin-demo)
+
+# Deployment of the Lowcoder Frontend to Netlify (Local Build Flow)
+
+## ⚙️ Prerequisites
+
+* Node.js & Yarn installed
+* Netlify CLI installed:
+
+```bash
+npm install -g netlify-cli
+```
+
+* Netlify CLI authenticated:
+
+```bash
+netlify login
+```
+
+* The project is linked to the correct Netlify site:
+
+```bash
+cd client
+netlify link
+```
+
+---
+
+## 🛠 Setup `netlify.toml` (only once)
+
+Inside the `client/` folder, create or update `netlify.toml`:
+
+```toml
+[build]
+  base = "client"
+  command = "yarn workspace lowcoder build"
+  publish = "client/packages/lowcoder/build"
+```
+
+This ensures Netlify uses the correct build and publish paths when building locally.
+
+---
+
+## 🚀 Deployment Steps
+
+1️⃣ Navigate into the `client` folder:
+
+```bash
+cd client
+```
+
+2️⃣ Run local build (with Netlify environment variables injected):
+
+```bash
+netlify build
+```
+
+3️⃣ Deploy to production:
+
+```bash
+netlify deploy --prod --dir=packages/lowcoder/build
+```
+
+---
+
+## 🔧 Notes
+
+* This local build flow fully honors the environment variables configured in Netlify.
+* No build happens on Netlify servers — only the deploy step runs on Netlify.
+* This approach avoids Netlify’s build memory limits.
diff --git a/client/netlify.toml b/client/netlify.toml
@@ -2,5 +2,7 @@
   from = "/*"
   to = "/"
   status = 200
-[[plugins]]
-  package = "@netlify/plugin-cache"
+[build]
+  base = "client"
+  command = "yarn workspace lowcoder build"
+  publish = "client/packages/lowcoder/build"
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/DatasourcePluginClient.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/plugin/client/DatasourcePluginClient.java
@@ -138,7 +138,7 @@ public Mono<QueryExecutionResult> executeQuery(String pluginName, Object queryDs
                         String json = OBJECT_MAPPER.writeValueAsString(body);
 
                         boolean encryptionEnabled = !(commonConfig.getJsExecutor().getPassword().isEmpty() || commonConfig.getJsExecutor().getSalt().isEmpty());
-                        String payload;
+                        Object payload;
                         WebClient.RequestBodySpec requestSpec = WEB_CLIENT
                                 .post()
                                 .uri(nodeServerHelper.createUri(RUN_PLUGIN_QUERY))
@@ -148,7 +148,7 @@ public Mono<QueryExecutionResult> executeQuery(String pluginName, Object queryDs
                             payload = encryptionService.encryptStringForNodeServer(json);
                             requestSpec = requestSpec.header("X-Encrypted", "true");
                         } else {
-                            payload = json;
+                            payload = body;
                         }
 
                         return requestSpec
