Merge pull request #1570 from merico-dev/1569-failed-to-execute-fetch…

…-on-workerglobalscope 1569 failed to execute fetch on workerglobalscope
merico-dev · Nov 13, 2024 · 696304c · 696304c
2 parents 21c4f8f + f438e98
commit 696304c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/api/package.json b/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "13.43.10",
+  "version": "13.43.11",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "13.43.10",
+  "version": "13.43.11",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "13.43.10",
+  "version": "13.43.11",
   "private": true,
   "workspaces": [
     "api",

diff --git a/settings-form/package.json b/settings-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "13.43.10",
+  "version": "13.43.11",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

diff --git a/website/package.json b/website/package.json
@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "13.43.10",
+  "version": "13.43.11",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"

diff --git a/website/src/utils/config.ts b/website/src/utils/config.ts
@@ -2,7 +2,13 @@ import { IDashboardConfig } from '@devtable/dashboard';
 import { ISettingsFormConfig } from '@devtable/settings-form';
 import { APICaller } from '../api-caller';
 
-export const MonacoPath = import.meta.env.VITE_WEBSITE_BASE_URL + '/assets/monaco-editor/min/vs';
+const joinPath = (a: string, b: string) => {
+  return (a + b).replace(/\/\//, '/');
+};
+export const MonacoPath = new URL(
+  joinPath(import.meta.env.VITE_WEBSITE_BASE_URL, '/assets/monaco-editor/min/vs'),
+  window.location.origin,
+).toString();
 
 export const BaseDashboardConfig: IDashboardConfig = {
   apiBaseURL: import.meta.env.VITE_API_BASE_URL,