Merge pull request #196 from engageLively/fix/build-scripts

Fix/build scripts
engageLively · Apr 25, 2024 · 68ce1fc · 68ce1fc
2 parents 8baf0c8 + 5575508
commit 68ce1fc
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   },
   "lively": {
     "projectDependencies": [],
-    "boundLivelyVersion": "acaf0fc025a77f874d9c036b7827cdcaf624afee",
+    "boundLivelyVersion": "c776d0f511d09064c6e27e0e76efbcfcdd5a2364",
     "canUsePages": true
   }
 }
diff --git 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
@@ -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;

diff --git 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',

diff --git 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) {

diff --git 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
@@ -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
@@ -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}