Fix Custom Components and Add SDK to build

pedrozadotdev · Nov 8, 2023 · 792371e · 792371e
1 parent 456c3da
commit 792371e
Show file tree

Hide file tree

Showing 15 changed files with 10,419 additions and 31 deletions.
diff --git a/client/packages/openblocks-comps/src/i18n/comps/locales/echarts/pt.ts b/client/packages/openblocks-comps/src/i18n/comps/locales/echarts/pt.ts
@@ -47,7 +47,7 @@ export const pt = {
       "Jul",
       "Ago",
       "Set",
-      "out",
+      "Out",
       "Nov",
       "Dez",
     ],

diff --git a/client/packages/openblocks-sdk/index.html b/client/packages/openblocks-sdk/index.html
@@ -20,6 +20,7 @@
         margin-right: 10px;
       }
     </style>
+    <script type="module" crossorigin src="/js/proxy.js"></script>
   </head>
   <body>
     <h1 class="demo-title">Use in vanilla app</h1>

diff --git a/client/packages/openblocks-sdk/index.tsx b/client/packages/openblocks-sdk/index.tsx
@@ -4,7 +4,7 @@ import { AppViewInstance, bootstrapAppAt, OpenblocksAppView } from "./src/index"
 
 const url = new URL(location.href);
 const appId = url.searchParams.get("appId");
-const baseUrl = url.searchParams.get("baseUrl") || "http://localhost:8000";
+const baseUrl = url.searchParams.get("baseUrl") || window.location.origin;
 
 function ReactDemoApp() {
   const ref = useRef<AppViewInstance | null>(null);

diff --git a/client/packages/openblocks-sdk/vite.config.mts b/client/packages/openblocks-sdk/vite.config.mts
@@ -34,10 +34,10 @@ export const viteConfig: UserConfig = {
       formats: ["es"],
       entry: "./src/index.ts",
       name: "Openblocks",
-      fileName: "openblocks-sdk",
+      fileName: "main",
     },
     rollupOptions: {
-      external: ["react", "react-dom"],
+      external: ["react", "react-dom", "/js/proxy.js"],
       output: {
         chunkFileNames: "[hash].js",
       },
@@ -53,10 +53,12 @@ export const viteConfig: UserConfig = {
   },
   server: {
     proxy: {
-      "/api": {
-        target: "http://localhost:3000",
-        changeOrigin: false,
+      "/js/proxy.js": "http://127.0.0.1:8090",
+      "/api/realtime": {
+        target: "ws://127.0.0.1:8090",
+        ws: true,
       },
+      "/api": "http://127.0.0.1:8090",
     },
   },
   css: {

diff --git a/client/packages/openblocks/public/cc/index.html b/client/packages/openblocks/public/cc/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <script src="/cc/js/babel.min.js"></script>
+    <title>Custom Component</title>
+    <script defer="defer" src="/cc/js/runtime.js"></script>
+    <script defer="defer" src="/cc/js/main.js"></script>
+  </head>
+  <body></body>
+</html>
diff --git a/client/packages/openblocks/public/cc/js/babel.min.js b/client/packages/openblocks/public/cc/js/babel.min.js