Merge pull request #21 from Navigraph/bun

Migrate to Bun, remove unused scripts and speed up builds

Author: SkySails

.cargo/config.toml

@@ -1,24 +1,3 @@
-[target.wasm32-wasip1]
-rustflags = [
-  "-Ctarget-feature=-crt-static,+bulk-memory",
-  "-Clink-self-contained=no",
-  "-Clink-arg=-l",
-  "-Clink-arg=c",
-  "-Clink-arg=/workdir/MSFS_SDK/WASM/wasi-sysroot/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a",
-  "-Clink-arg=-L",
-  "-Clink-arg=/workdir/MSFS_SDK/WASM/wasi-sysroot/lib/wasm32-wasi",
-  "-Clink-arg=--export-table",
-  "-Clink-arg=--allow-undefined",
-  "-Clink-arg=--export-dynamic",
-  "-Clink-arg=--export=__wasm_call_ctors",
-  "-Clink-arg=--export=malloc",
-  "-Clink-arg=--export=free",
-  "-Clink-arg=--export=mark_decommit_pages",
-  "-Clink-arg=--export=mallinfo",
-  "-Clink-arg=--export=mchunkit_begin",
-  "-Clink-arg=--export=mchunkit_next",
-  "-Clink-arg=--export=get_pages_state",
-]
-
-[build]
-target = "wasm32-wasip1"
+[build]
+target = "wasm32-wasip1"
+target-dir = "targets/2020"

.dockerignore

@@ -1,6 +1,6 @@
 name: Store rust cache
 
-# This workflow is needed since any cache created 
+# This workflow is needed since any cache created
 # on a feature-branch will NOT be available on any other ref.
 # See: https://github.com/actions/cache/issues/79
 
@@ -48,4 +48,4 @@ jobs:
           key: rust-targets
 
       - name: Build WASM
-        run: bun run build:wasm && bun run package
+        run: bun run build:wasm

.eslintrc

@@ -36,17 +36,34 @@ jobs:
     if: ${{ needs.filter.outputs.js-interface == 'true' && !github.event.pull_request.draft && !contains(github.event.pull_request.labels.*.name , 'release') }}
     steps:
       - uses: actions/checkout@v4
-      
-      - uses: actions/setup-node@v4
+
+      - uses: oven-sh/setup-bun@v2
         with:
-          node-version: "18"
-          cache: "npm"
+          bun-version: latest
 
       - name: Install node modules
-        run: npm ci
+        run: bun i --frozen-lockfile
 
       - name: Run linting
-        run: npm run lint:js -- --max-warnings 0
+        run: bun lint --max-warnings 0
+
+  typecheck:
+    name: Check types 🕵️‍♂️
+    runs-on: ubuntu-latest
+    needs: [filter]
+    if: ${{ needs.filter.outputs.js-interface == 'true' && !github.event.pull_request.draft && !contains(github.event.pull_request.labels.*.name , 'release') }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Install node modules
+        run: bun i --frozen-lockfile
+
+      - name: Check types
+        run: bun typecheck
 
   build-test:
     name: Build & test 🛠️
@@ -63,15 +80,38 @@ jobs:
           echo NAVIGATION_DATA_SIGNED_URL=${{ secrets.NAVIGATION_DATA_SIGNED_URL }} >> .env
           echo SENTRY_URL=${{ secrets.SENTRY_URL }} >> .env
 
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Install node modules
+        run: bun i --frozen-lockfile
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build cargo-msfs image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          tags: navigation-data-interface-wasm-build:latest
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha
+
+      - name: Cache target directories
+        uses: actions/cache@v4
+        with:
+          path: targets
+          key: rust-targets
 
       - name: Build WASM
-        run: ./scripts/workflow.sh
+        run: bun run build:wasm && bun run package
 
-        
       - name: Upload WASM module to GitHub
         uses: actions/upload-artifact@v4
         with:
-          name: msfs_navigation_data_interface
+          name: wasm
           path: |
-            ./2020.zip
-            ./2024.zip
+            ./wasm.zip

.github/workflows/cache.yml

@@ -18,15 +18,40 @@ jobs:
         run: |
           echo SENTRY_URL=${{ secrets.SENTRY_URL }} >> .env
 
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Install node modules
+        run: bun i --frozen-lockfile
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build cargo-msfs image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          tags: navigation-data-interface-wasm-build:latest
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha
+
+      - name: Cache target directories
+        uses: actions/cache@v4
+        with:
+          path: targets
+          key: rust-targets
+
       - name: Build WASM
-        run: ./scripts/workflow.sh
+        run: bun run build:wasm && bun run package
 
       - name: Pre-Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            ./2020.zip
-            ./2024.zip
+            ./wasm.zip
           prerelease: true
           generate_release_notes: true
 
@@ -51,4 +76,4 @@ jobs:
   #     - name: Publish to NPM
   #       env:
   #         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-  #       run: cd src/js && npm publish --tag next
+  #       run: cd src/js && npm publish --tag next

.github/workflows/pr.yml

@@ -5,7 +5,7 @@ on:
       - "!v*-rc*"
       - "!v*-alpha*"
       - "!v*-beta*"
-      
+
 name: Create release
 run-name: Create release for `${{ github.ref_name }}`
 
@@ -19,15 +19,40 @@ jobs:
         run: |
           echo SENTRY_URL=${{ secrets.SENTRY_URL }} >> .env
 
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Install node modules
+        run: bun i --frozen-lockfile
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build cargo-msfs image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile
+          tags: navigation-data-interface-wasm-build:latest
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha
+
+      - name: Cache target directories
+        uses: actions/cache@v4
+        with:
+          path: targets
+          key: rust-targets
+
       - name: Build WASM
-        run: ./scripts/workflow.sh
+        run: bun run build:wasm && bun run package
 
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            ./2020.zip
-            ./2024.zip
+            ./wasm.zip
           generate_release_notes: true
 
   # Enable in future to automate publishing of NPM package
@@ -36,19 +61,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: oven-sh/setup-bun@v2
         with:
-          node-version: "18"
-          registry-url: 'https://registry.npmjs.org'
-          cache: "npm"
+          bun-version: latest
 
       - name: Install node modules
-        run: npm ci
+        run: bun i --frozen-lockfile
 
       - name: Build JS Interface
-        run: cd src/js && npm run build
+        run: cd src/ts && bun run build
 
       - name: Publish to NPM
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: cd src/js && npm publish
+          NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: cd src/ts && bun publish

.github/workflows/pre-release.yml

@@ -5,21 +5,14 @@ _PackageInt
 tsconfig.tsbuildinfo
 .vs
 examples/aircraft/NavigationDataInterfaceAircraftProject.xml.user
-examples/aircraft/PackageSources/html_ui/Pages/VCockpit/Instruments/Navigraph/NavigationDataInterfaceSample
-examples/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/panel/msfs_navigation_data_interface.wasm
-out
-out20
-out24
+example/aircraft/PackageSources/html_ui/Pages/VCockpit/Instruments/Navigraph/NavigationDataInterfaceSample
+example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_Interface_Aircraft/panel/msfs_navigation_data_interface.wasm
 
 # Rust
 # will have compiled files and executables
 debug/
-target/
+targets
 
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-# Cargo.lock
-# Who put this here
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
@@ -32,5 +25,5 @@ target/
 *.local
 .DS_Store
 
-test_work/
-dist
+dist
+

.github/workflows/release.yml

@@ -1,10 +1,8 @@
 {
-  "trailingComma": "all",
-  "printWidth": 120,
-  "singleQuote": false,
-  "arrowParens": "avoid",
-  "semi": false,
-  "endOfLine": "auto",
-  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
-  "importOrder": ["<THIRD_PARTY_MODULES>", "@[A-Z](.*)", "^[./]"]
-}
+    "trailingComma": "all",
+    "printWidth": 120,
+    "singleQuote": false,
+    "arrowParens": "avoid",
+    "semi": true,
+    "endOfLine": "auto"
+}

.gitignore

@@ -1,4 +1,4 @@
-FROM rust:1.84
+FROM rust:1.84.1
 
 # Install needed packages and clean up
 RUN apt update && \
@@ -19,6 +19,9 @@ RUN rustup target install wasm32-wasip1
 # Install cargo-msfs
 RUN cargo install --git https://github.com/navigraph/cargo-msfs
 
+# Cache bust arg to re-install both SDKs
+ARG CACHEBUST
+
 # Install MSFS2020 and MSFS2024 SDK
 RUN cargo-msfs install msfs2020 && \
     cargo-msfs install msfs2024