From fe01d555bb4c3b1a08f61d01b3b736e70428bf90 Mon Sep 17 00:00:00 2001
From: Robin Schreiber <robin.schreiber@me.com>
Date: Wed, 24 Apr 2024 16:15:36 +0200
Subject: [PATCH 1/4] fix build scripts

---
 tools/build-en.mjs | 2 +-
 tools/build-jp.mjs | 2 +-
 tools/build.sh     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/build-en.mjs b/tools/build-en.mjs
index 55a085c..eb9cf90 100644
--- a/tools/build-en.mjs
+++ b/tools/build-en.mjs
@@ -28,7 +28,7 @@ const build = await rollup({
       ],
       resolver
     }),
-    jsonPlugin({ exclude: /https\:\/\/jspm.dev\/.*\.json/}),
+    jsonPlugin({ exclude: [/https\:\/\/jspm.dev\/.*\.json/, /esm\:\/\/cache\/.*\.json/]}),
      babel({
      babelHelpers: 'bundled', 
      presets: [PresetEnv]
diff --git a/tools/build-jp.mjs b/tools/build-jp.mjs
index 6ae1606..0872c94 100644
--- a/tools/build-jp.mjs
+++ b/tools/build-jp.mjs
@@ -28,7 +28,7 @@ const build = await rollup({
       ],
       resolver
     }),
-    jsonPlugin({ exclude: /https\:\/\/jspm.dev\/.*\.json/}),
+    jsonPlugin({ exclude: [/https\:\/\/jspm.dev\/.*\.json/, /esm\:\/\/cache\/.*\.json/]}),
      babel({
      babelHelpers: 'bundled', 
      presets: [PresetEnv]
diff --git a/tools/build.sh b/tools/build.sh
index 48264fe..176ea05 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-. ../../../scripts/lively-next-flatn-env.sh
+. ../../scripts/lively-next-flatn-env.sh
 lively_next_flatn_env "$(dirname "$(dirname "$(pwd)")")"
 export FLATN_DEV_PACKAGE_DIRS=$FLATN_DEV_PACKAGE_DIRS:$(pwd);
 
@@ -42,4 +42,4 @@ esac
 echo "Selected language: $lang"
 echo "Path: $path"
 
-node --no-warnings --experimental-import-meta-resolve --experimental-loader ../../../flatn/resolver.mjs ${path}
+node --no-warnings --experimental-import-meta-resolve --experimental-loader ../../flatn/resolver.mjs ${path}

From 92f1f3a08f4cc5bd2638eae653e1c54d137a9076 Mon Sep 17 00:00:00 2001
From: Robin Schreiber <robin.schreiber@me.com>
Date: Wed, 24 Apr 2024 16:17:55 +0200
Subject: [PATCH 2/4] remove async imports from build targets

---
 studio/int/en/app.js | 2 +-
 studio/int/jp/app.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/studio/int/en/app.js b/studio/int/en/app.js
index d4dd0fe..c17b198 100644
--- a/studio/int/en/app.js
+++ b/studio/int/en/app.js
@@ -1,10 +1,10 @@
 import { part, config } from 'lively.morphic';
 import { LivelyWorld } from 'lively.ide/world.js';
 import { GalyleoStudioWorld } from '../../ui.cp.js';
+import { GalyleoDashboardStudio } from '../../../studio/int/en/index.js';
 
 export async function main () {
   config.ide.studio.canvasModeEnabled = false;
-  const { GalyleoDashboardStudio } = await System.import('engageLively--galyleo-dashboard/studio/int/en/index.js');
   const dashboard = part(GalyleoDashboardStudio);
   dashboard.respondsToVisibleWindow = true;
   $world.addMorph(dashboard);
diff --git a/studio/int/jp/app.js b/studio/int/jp/app.js
index 1c551bd..fb9543a 100644
--- a/studio/int/jp/app.js
+++ b/studio/int/jp/app.js
@@ -1,10 +1,10 @@
 import { part, config } from 'lively.morphic';
 import { LivelyWorld } from 'lively.ide/world.js';
 import { GalyleoStudioWorld } from '../../ui.cp.js';
+import { GalyleoDashboardStudio } from '../../../studio/int/jp/index.cp.js';
 
 export async function main () {
   config.ide.studio.canvasModeEnabled = false;
-  const { GalyleoDashboardStudio } = await System.import('engageLively--galyleo-dashboard/studio/int/jp/index.cp.js');
   const dashboard = part(GalyleoDashboardStudio);
   // dashboard.openInWorld()
   dashboard.respondsToVisibleWindow = true;

From 07abc2aaa02c50ffead8d34316b518f483142c44 Mon Sep 17 00:00:00 2001
From: Robin Schreiber <robin.schreiber@me.com>
Date: Wed, 24 Apr 2024 16:19:09 +0200
Subject: [PATCH 3/4] fix top bar icons in japanese versioin

---
 studio/int/jp/top-bar.cp.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/studio/int/jp/top-bar.cp.js b/studio/int/jp/top-bar.cp.js
index 231e991..6efdab6 100644
--- a/studio/int/jp/top-bar.cp.js
+++ b/studio/int/jp/top-bar.cp.js
@@ -15,11 +15,7 @@ const GalyleoTopBarJp = component(GalyleoTopBar, {
       }]
     }, {
       name: 'upload button',
-      nativeCursor: 'text',
-      value: ['', {
-        fontFamily: '"Font Awesome 6 Free", "Font Awesome 6 Brands"',
-        fontWeight: '900'
-      }, ' 公開する', {
+      value: [...Icon.textAttribute('cloud-arrow-up'), ' 公開する', {
         fontFamily: 'Noto Sans',
         fontSize: 15,
         fontWeight: 'bold',

From 5575508cb6c32d5c402ea7ebac3d751d7b7eba22 Mon Sep 17 00:00:00 2001
From: Robin Schreiber <robin.schreiber@me.com>
Date: Wed, 24 Apr 2024 16:19:28 +0200
Subject: [PATCH 4/4] set world visible on load

---
 package.json    | 2 +-
 studio/ui.cp.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 15b03a6..741aa6f 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
   },
   "lively": {
     "projectDependencies": [],
-    "boundLivelyVersion": "acaf0fc025a77f874d9c036b7827cdcaf624afee",
+    "boundLivelyVersion": "c776d0f511d09064c6e27e0e76efbcfcdd5a2364",
     "canUsePages": true
   }
 }
\ No newline at end of file
diff --git a/studio/ui.cp.js b/studio/ui.cp.js
index 6f54b9d..b30f6cd 100644
--- a/studio/ui.cp.js
+++ b/studio/ui.cp.js
@@ -93,6 +93,7 @@ export class GalyleoStudioWorld extends LivelyWorld {
   onLoad () {
     super.onLoad();
     // document.getElementById('loading-screen').remove();
+    this.opacity = 1;
   }
 
   defaultMenuItems (morph, evt) {