Merge pull request #366 from dokar3/dokar/bun

Migrate from Node and Yarn to Bun

Author: dokar3

.github/workflows/build.yaml

@@ -37,35 +37,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up node.js
-        uses: actions/setup-node@v4
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
         with:
-          node-version: 18
+          bun-version: latest
 
-      - name: Upgrade yarn
-        run: |
-          corepack enable
-          corepack prepare yarn@stable --activate
-          echo "yarn version: $(yarn -v)"
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get globalFolder)/cache" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Restore yarn cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: yarn-cache-folder-${{ hashFiles('js/**/yarn.lock', 'js/**/.yarnrc.yml') }}
-          restore-keys: |
-            yarn-cache-folder-
-
-      - name: Setup yarn and js projects
-        run: |
-          node ./scripts/service/setup.js
-          echo "yarn version: $(yarn -v)"
-        shell: bash
+      - name: Setup js projects
+        run: bun ./scripts/service/setup.js
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -90,7 +68,7 @@ jobs:
             echo "secret 'keystore_base64' is not set"
             exit 1
           fi
-          node ./scripts/fileBase64Converter.js str2f $ENCODED_KEYSTORE $KEYSTORE_PATH
+          bun ./scripts/fileBase64Converter.js str2f $ENCODED_KEYSTORE $KEYSTORE_PATH
 
       # https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners/
       - name: Enable KVM group perms

android/app/build_services.gradle

@@ -49,14 +49,8 @@ def cmd(File dir, String command) {
     )
 }
 
-def checkNodeJs() {
-    def check = "node -v"
-    def out = cmd(builtinServicesDir(), check).stdout
-    return Pattern.compile("v\\d+\\.\\d+\\.\\d+").matcher(out).matches()
-}
-
-def checkYarn() {
-    def check = "yarn -v"
+def checkBun() {
+    def check = "bun -v"
     def out = cmd(builtinServicesDir(), check).stdout
     return Pattern.compile("\\d+\\.\\d+\\.\\d+").matcher(out).matches()
 }
@@ -69,22 +63,17 @@ task compileBuiltinJsServices() {
     inputs.files(inputFiles)
     outputs.dir(compiledJsDir())
     doLast {
-        // Check nodejs
-        println("Checking node.js")
-        if (!checkNodeJs()) {
-            throw new GradleException("Node.js is not installed, please install it " +
-                    "manually: https://nodejs.org")
-        }
-
-        if (!checkYarn()) {
-            throw new GradleException("Yarn is not installed, please install it " +
-                    "manually: https://yarnpkg.com/getting-started/install")
+        // Check Bun
+        println("Checking Bun...")
+        if (!checkBun()) {
+            throw new GradleException("Bun is not installed, please install it " +
+                    "manually: https://bun.sh")
         }
 
         println("Compiling builtin js services...")
         // Compile js files
         def outputDir = compiledJsDir().absolutePath
-        def buildCmd = "node scripts/service/buildAll.js " +
+        def buildCmd = "bun scripts/service/buildAll.js " +
                 "--platform=android " +
                 "--output=${outputDir} " +
                 "--file-prefix=file:///android_asset/js/"

js/README.md

@@ -38,8 +38,7 @@ Built-in services.
 
 **Requirements:**
 
-- [Node.js](https://nodejs.org/) The JavaScript runtime for compiling and packing.
-- [yarn](https://yarnpkg.com/) The dependency management.
+- [Bun](https://bun.sh/) The JavaScript runtime and package manager.
 
 **Setup:**
 
@@ -51,41 +50,40 @@ node ./scripts/service/setup.js
 
 The `setup.js` script will do:
 
-1. Check and install `yarn` (if not)
-2. Install dependencies for projects in the `js/any-***` and `js/services/` folder
-3. Build local dependencies, e.g. `js/any-service-api`, `js/any-service-test`
-4. Link `js/any-service-cli` so you can use the `any-service-cli` command to create a new project
+1. Install dependencies for projects in the `js/any-***` and `js/services/` folder
+2. Build local dependencies, e.g. `js/any-service-api`, `js/any-service-test`
+3. Link `js/any-service-cli` so you can use the `any-service-cli` command to create a new project
 
 **Create and run a new service:**
 
 
-3. Run `any-service-cli` command to create new project:
+1. Run `any-service-cli` command to create new project:
 
     ```shell
     cd js/services/
 
     any-service-cli
     ```
 
-4. Install dependencies:
+2. Install dependencies:
 
     ```shell
     cd NewProject
 
-    yarn
+    bun install
     ```
 
-5. Test, run and build:
+3. Test, run and build:
 
     ```shell
     # Test with jest framework
-    yarn test
+    bun test
     
     # (WIP) Start runner servers to debug service in a browser
-    yarn runner
+    bun runner
     
     # Build
-    yarn build-android
+    bun build-android
     ```
 
 ### Other commands and scripts
@@ -94,14 +92,14 @@ The `setup.js` script will do:
 
 ```shell
 # Install dependencies for all projects
-node ./scripts/service/runInEachProject.js yarn
+bun ./scripts/service/runInEachProject.js bun install
 
 # Upgrade 'typescript' for all projects
-node ./scripts/service/runInEachProject.js yarn up typescript
+bun ./scripts/service/runInEachProject.js bun update typescript
 ```
 
 **Build all built-in services:**
 
 ```shell
-node ./scripts/service/buildAll.js --platform=android --output=/path/to/output_dir
+bun ./scripts/service/buildAll.js --platform=android --output=/path/to/output_dir
 ```

js/any-service-api/bun.lockb

@@ -7,14 +7,12 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "test": "jest ./test",
+    "test": "bun test",
     "build": "tsc",
-    "gen-doc": "yarn typedoc --entryPoints src/index.ts --disableSources --includeVersion"
+    "gen-doc": "typedoc --entryPoints src/index.ts --disableSources --includeVersion"
   },
   "devDependencies": {
-    "@types/jest": "^29.0.0",
-    "jest": "^29.0.0",
-    "ts-jest": "^29.0.0",
+    "@types/bun": "^1.1.3",
     "tsc": "^2.0.4",
     "typedoc": "^0.25.0",
     "typescript": "^5.0.0"

js/any-service-api/jest.config.js

@@ -7,7 +7,8 @@
     "declaration": true,
     "emitDeclarationOnly": false,
     "allowJs": true,
-    "outDir": "dist"
+    "outDir": "dist",
+    "skipLibCheck": true
   },
   "include": [
     "src/**/*"

js/any-service-api/package.json

@@ -1,10 +1,7 @@
 {
   "name": "any-service-runner",
   "version": "1.0.0",
-  "description": "Any service runner for browsers.",
-  "type": "module",
   "author": "Any",
-  "license": "Apache-2.0",
   "dependencies": {
     "@babel/core": "^7.20.5",
     "@babel/preset-env": "^7.16.11",
@@ -21,9 +18,9 @@
     "webpack": "^5.75.0",
     "webpack-dev-server": "^5.0.0"
   },
-  "devDependencies": {
-    "any-service-compile": "portal:../any-service-compile"
-  },
   "bin": "./src/main.js",
-  "packageManager": "[email protected]"
+  "description": "Any service runner for browsers.",
+  "license": "Apache-2.0",
+  "packageManager": "[email protected]",
+  "type": "module"
 }

js/any-service-api/test/Features.test.ts

@@ -6,7 +6,7 @@
   "license": "{{license}}",
   "type": "module",
   "scripts": {
-    "test": "jest ./test",
+    "test": "bun test",
     "build-android": "any-service-build --platform=android --output=./dist/",
     "build-desktop": "any-service-build --platform=desktop --output=./dist/",
     "build-browser": "any-service-build --platform=browser --output=./dist/",
@@ -15,15 +15,13 @@
     "runner": "concurrently --kill-others -n \"Backend \",\"Frontend\" \"npm run any-service-runner-backend\" \"npm run any-service-runner-frontend\""
   },
   "dependencies": {
-    "any-service-api": "portal:{{anyApiPath}}"
+    "any-service-api": "link:any-service-api"
   },
   "devDependencies": {
-    "@types/jest": "^29.0.0",
-    "any-service-compile": "portal:{{anyCompilePath}}",
-    "any-service-runner": "portal:{{anyRunnerPath}}",
-    "any-service-testing": "portal:{{anyTestingPath}}",
-    "concurrently": "^8.0.0",
-    "jest": "^29.0.0",
-    "ts-jest": "^29.0.0"
+    "@types/bun": "^1.1.3",
+    "any-service-compile": "link:any-service-compile",
+    "any-service-runner": "link:any-service-runner",
+    "any-service-testing": "link:any-service-testing",
+    "concurrently": "^8.0.0"
   }
 }

js/any-service-api/tsconfig.json

@@ -1,4 +1,3 @@
-import { describe, expect, test } from "@jest/globals";
 import { createTestService } from "any-service-testing";
 import { features } from "../src/main";
 

js/any-service-cli/bun.lockb

@@ -1,24 +1,23 @@
 {
-  "name": "any-testing",
+  "name": "any-service-testing",
   "version": "1.0.0",
   "author": "Any",
   "description": "Create and test services on the node.js environment",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "test": "jest ./test",
+    "test": "bun test",
     "build": "tsc"
   },
   "license": "Apache-2.0",
+  "dependencies": {
+    "any-service-api": "link:any-service-api"
+  },
   "devDependencies": {
-    "@types/jest": "^29.2.2",
-    "any-service-api": "portal:../any-service-api",
-    "jest": "^29.3.1",
+    "@types/bun": "^1.1.3",
     "jsdom": "^24.0.0",
     "os-locale": "^6.0.2",
     "sync-request": "^6.1.0",
-    "ts-jest": "^29.0.3",
     "typescript": "^5.0.0"
-  },
-  "packageManager": "[email protected]"
+  }
 }

js/any-service-compile/bun.lockb

@@ -1,4 +1,3 @@
-import { describe, expect, test } from "@jest/globals";
 import {
   NotImplementedError,
   ServiceFeatures,

js/any-service-runner/bun.lockb

@@ -6,7 +6,8 @@
     "allowJs": true,
     "declaration": true,
     "emitDeclarationOnly": false,
-    "outDir": "dist"
+    "outDir": "dist",
+    "skipLibCheck": true
   },
   "include": [
     "src/**/*"