Merge branch 'main' into chore/ruby-setup

Author: chrispader

.clang-format-ignore

@@ -0,0 +1 @@
+package/cpp/sqlite/*

.gitattributes

@@ -1,4 +1,3 @@
 *.pbxproj -text
 # specific for windows script files
 *.bat text eol=crlf
-.lockb binary diff=lockb

.github/workflows/build-android-release.yml

@@ -5,8 +5,8 @@ on:
     types: [published]
 
 jobs:
-  build_release:
-    name: Build Android Example App (release, new architecture)
+  build:
+    name: Build Android Example App (release)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/build-android.yml

@@ -27,55 +27,18 @@ on:
       - "**/nitro.json"
 
 jobs:
-  build_new:
-    name: Build Android Example App (new architecture)
+  build:
+    name: Build Android Example App
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: oven-sh/setup-bun@v2
 
       - name: Install npm dependencies (bun)
         run: bun install
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: "zulu"
-          java-version: 17
-          java-package: jdk
-
-      - name: Restore Gradle cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Run Gradle Build for example/android/
-        working-directory: example/android
-        run: ./gradlew assembleDebug --no-daemon --build-cache
-
-      # Gradle cache doesn't like daemons
-      - name: Stop Gradle Daemon
-        working-directory: example/android
-        run: ./gradlew --stop
-
-  build_old:
-    name: Build Android Example App (old architecture)
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2
-
-      - name: Install npm dependencies (bun)
-        run: bun install
-
-      - name: Disable new architecture in gradle.properties
-        run: sed -i "s/newArchEnabled=true/newArchEnabled=false/g" example/android/gradle.properties
-
-      - name: Setup JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "zulu"
           java-version: 17

.github/workflows/build-ios.yml

@@ -32,8 +32,8 @@ env:
   USE_CCACHE: 1
 
 jobs:
-  build_new:
-    name: Build iOS Example App (new architecture)
+  build:
+    name: Build iOS Example App
     runs-on: macOS-15
     steps:
       - uses: actions/checkout@v4
@@ -59,53 +59,7 @@ jobs:
           key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock') }}
           restore-keys: |
             ${{ runner.os }}-pods-
-      - name: Install Pods
-        working-directory: example/ios
-        run: pod install
-      - name: Build App
-        working-directory: example/ios
-        run: "set -o pipefail && xcodebuild \
-          CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
-          -derivedDataPath build -UseModernBuildSystem=YES \
-          -workspace NitroSQLiteExample.xcworkspace \
-          -scheme NitroSQLiteExample \
-          -sdk iphonesimulator \
-          -configuration Debug \
-          -destination 'platform=iOS Simulator,name=iPhone 16' \
-          build \
-          CODE_SIGNING_ALLOWED=NO"
-
-  build_old:
-    name: Build iOS Example App (old architecture)
-    runs-on: macOS-15
-    steps:
-      - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2
 
-      - name: Install npm dependencies (bun)
-        run: bun install
-
-      - name: Disable new architecture in Podfile
-        run: sed -i "" "s/ENV\['RCT_NEW_ARCH_ENABLED'\] = '1'/ENV['RCT_NEW_ARCH_ENABLED'] = '0'/g" example/ios/Podfile
-
-      - name: Restore buildcache
-        uses: mikehardy/buildcache-action@v2
-        continue-on-error: true
-
-      - name: Setup Ruby (bundle)
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.3.0
-          bundler-cache: true
-          working-directory: example/ios
-
-      - name: Restore Pods cache
-        uses: actions/cache@v4
-        with:
-          path: example/ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock', '**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pods-
       - name: Install Pods
         working-directory: example/ios
         run: pod install

.github/workflows/lint-typescript.yml

@@ -36,38 +36,38 @@ jobs:
     name: Compile TypeScript (tsc)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: oven-sh/setup-bun@v2
       - uses: reviewdog/action-setup@v1
 
       - name: Install npm dependencies (bun)
         run: bun install
 
-      - name: Run TypeScript (tsc)
+      - name: Run TypeScript (tsc) in example
+        working-directory: example
+        run: |
+          bun typecheck | reviewdog -name="tsc" -efm="%f(%l,%c): error TS%n: %m" -reporter="github-pr-review" -filter-mode="nofilter" -fail-level=any -tee
+        env:
+          REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run TypeScript (tsc) in react-native-nitro-sqlite
+        working-directory: package
         run: |
-          bun typescript | reviewdog -name="tsc" -efm="%f(%l,%c): error TS%n: %m" -reporter="github-pr-review" -filter-mode="nofilter" -fail-on-error -tee
+          bun typecheck | reviewdog -name="tsc" -efm="%f(%l,%c): error TS%n: %m" -reporter="github-pr-review" -filter-mode="nofilter" -fail-level=any -tee
         env:
           REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   lint:
     name: Lint TypeScript (eslint, prettier)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: oven-sh/setup-bun@v2
-      - uses: reviewdog/action-setup@v1
 
       - name: Install npm dependencies (bun)
         run: bun install
 
-      - name: Run ESLint CI in example/
-        working-directory: example
-        run: bun lint-ci
-      - name: Run ESLint CI in react-native-nitro-sqlite
-        working-directory: package
-        run: bun lint-ci
-
-      - name: Run ESLint with auto-fix in example/
+      - name: Run ESLint with auto-fix in example
         working-directory: example
         run: bun lint
       - name: Run ESLint with auto-fix in react-native-nitro-sqlite

.prettierignore

@@ -0,0 +1,20 @@
+*.html
+*.yml
+*.yaml
+*.css
+*.scss
+*.md
+*.markdown
+
+package/lib
+
+.well-known
+android
+ios
+vendor
+package.json
+package-lock.json
+
+# The GH actions don't seem to compile and verify themselves well when Prettier is applied to them
+.github/actions/javascript/**/index.js
+

.prettierrc.js

@@ -0,0 +1,9 @@
+module.exports = {
+  quoteProps: 'consistent',
+  singleQuote: true,
+  tabWidth: 2,
+  trailingComma: 'all',
+  useTabs: false,
+  singleAttributePerLine: true,
+  semi: false,
+}

.vscode/settings.json

@@ -1,14 +1,14 @@
 {
   "[javascript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascriptreact]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescriptreact]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }

.watchmanconfig

@@ -1 +1 @@
-{}
+{}