Merge branch 'main' into improve-actions

reisxd · Aug 14, 2024 · 5aadb14 · 5aadb14
2 parents 5ed5d15 + 892c355
commit 5aadb14
Show file tree

Hide file tree

Showing 6 changed files with 2,707 additions and 12 deletions.
diff --git a/.github/workflows/build-new-release.yaml b/.github/workflows/build-new-release.yaml
@@ -21,7 +21,7 @@ jobs:
         run: |
           echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
           echo "hash=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
-      
+
       - name: Install additional packages and npm modules
         run: |
           sudo apt install -y expect zip coreutils
@@ -38,12 +38,23 @@ jobs:
         working-directory: tizenbrew-updater/TizenBrewUpdater/service
         run: |
           npm install
-
-      - name: Build standalone service
+      
+      - name: Build transpiled service
         working-directory: tizenbrew-app/TizenBrew/service
         run: |
-          ncc build service.js
+          npx babel . --out-dir transpiled --copy-files
           rm -r node_modules
+      
+      - name: Build standalone service
+        working-directory: tizenbrew-app/TizenBrew/service/transpiled
+        run: |
+          ncc build service.js -o ../dist
+          rm -r node_modules
+          
+       - name: Clean up transpiled files
+        working-directory: tizenbrew-app/TizenBrew/service
+        run: |
+          rm -r transpiled
   
       - name: Build updater service
         working-directory: tizenbrew-updater/TizenBrewUpdater/service
@@ -60,10 +71,6 @@ jobs:
             tizen-studio-data/profile
           key: tizen-studio-v${{ env.TIZEN_STUDIO_VER }}-cache
 
-      # - name: Create "tizen-studio-data" folder
-      #   if: steps.cache-tizen-studio.outputs.cache-hit == 'true'
-      #   run: mkdir tizen-studio-data
-
       - name: Download Tizen Studio
         if: steps.cache-tizen-studio.outputs.cache-hit != 'true'
         run: |

diff --git a/tizenbrew-app/TizenBrew/js/wsClient.js b/tizenbrew-app/TizenBrew/js/wsClient.js
@@ -198,7 +198,7 @@ function autoLaunchModule() {
         }
 
         setTimeout(() => {
-            send({ type: 'launch', package: `${autoLaunch.type}/${autoLaunch.name}`, tvIp: webapis.network.getIp() });
+            send({ type: 'launch', package: `${autoLaunch.type}/${autoLaunch.name}`, tvIp: webapis.network.getIp(), isTizen3 });
             if (app.getAttribute('data-moddedTizenApp') === 'false') {
                 location.href = appPath;
             }

diff --git a/tizenbrew-app/TizenBrew/service/babel.config.json b/tizenbrew-app/TizenBrew/service/babel.config.json
@@ -0,0 +1,9 @@
+{
+  "presets": ["@babel/preset-env"],
+  "ignore": [
+    "node_modules/@babel/",
+    "node_modules/adbhost/",
+    "node_modules/has-symbols/",
+    "node_modules/node-fetch/"
+  ]
+}
diff --git a/tizenbrew-app/TizenBrew/service/debugger.js b/tizenbrew-app/TizenBrew/service/debugger.js
@@ -1,5 +1,5 @@
 "use strict";
-const WebSocket = require('ws');
+const WebSocket = require('ws-old');
 const fetch = require('node-fetch');
 let client = null;
 let currentID = 12;