Merge branch 'main' into feat/vfolder-trash-bin

lablup · Mar 13, 2024 · decc101 · decc101
2 parents 0b7394f + 3bdc4fa
commit decc101
Show file tree

Hide file tree

Showing 54 changed files with 3,121 additions and 211 deletions.
diff --git a/README.md b/README.md
@@ -391,8 +391,8 @@ Electron building is automated using `Makefile`.
 ```console
 $ make clean      # clean prebuilt codes
 $ make mac        # build macOS app (both Intel/Apple)
-$ make mac_intel  # build macOS app (Intel x64)
-$ make mac_apple  # build macOS app (Apple Silicon)
+$ make mac_x64    # build macOS app (Intel x64)
+$ make mac_arm64  # build macOS app (Apple Silicon)
 $ make win        # build win64 app
 $ make linux      # build linux app
 $ make all        # build win64/macos/linux app
@@ -416,12 +416,12 @@ NOTE: Sometimes Apple silicon version compiled on Intel machine does not work.
 
 ##### Intel x64
 ```console
-$ make mac_intel
+$ make mac_x64
 ```
 
 ##### Apple Silicon (Apple M1 and above)
 ```console
-$ make mac_apple
+$ make mac_arm64
 ```
 
 ##### Building app with Code Signing (all platforms)

diff --git a/main.js b/main.js
@@ -250,7 +250,7 @@ app.once('ready', function() {
                 protocol: 'file',
                 slashes: true
               }));
-              mainContent.executeJavaScript(`window.__local_proxy = '${proxyUrl}'`);
+              mainContent.executeJavaScript(`window.__local_proxy = {}; window.__local_proxy.url = '${proxyUrl}';`);
               console.log('Re-connected to proxy: ' + proxyUrl);
             }
           },