Merge pull request #95 from web-ridge/new-architecture

New architecture

.github/actions/setup/action.yml

@@ -9,19 +9,28 @@ runs:
       with:
         node-version-file: .nvmrc
 
-    - name: Cache dependencies
+    - name: Restore dependencies
       id: yarn-cache
-      uses: actions/cache@v3
+      uses: actions/cache/restore@v4
       with:
         path: |
           **/node_modules
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          .yarn/install-state.gz
+        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
         restore-keys: |
+          ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
           ${{ runner.os }}-yarn-
 
     - name: Install dependencies
       if: steps.yarn-cache.outputs.cache-hit != 'true'
-      run: |
-        yarn install --cwd example --frozen-lockfile
-        yarn install --frozen-lockfile
+      run: yarn install --immutable
       shell: bash
+
+    - name: Cache dependencies
+      if: steps.yarn-cache.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          **/node_modules
+          .yarn/install-state.gz
+        key: ${{ steps.yarn-cache.outputs.cache-primary-key }}

.github/workflows/ci.yml

@@ -23,17 +23,17 @@ jobs:
       - name: Typecheck files
         run: yarn typecheck
 
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-
-      - name: Run unit tests
-        run: yarn test --maxWorkers=2 --coverage
+#  test:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#
+#      - name: Setup
+#        uses: ./.github/actions/setup
+#
+#      - name: Run unit tests
+#        run: yarn test --maxWorkers=2 --coverage
 
   build:
     runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Build package
-        run: yarn prepack
+        run: yarn prepare
   release:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main'

.gitignore

@@ -1,11 +1,9 @@
 # OSX
 #
 .DS_Store
-coverage
+
 # XDE
 .expo/
-example/ios
-example/android
 
 # VSCode
 .vscode/
@@ -62,10 +60,23 @@ buck-out/
 android/app/libs
 android/keystores/debug.keystore
 
+# Yarn
+.yarn/plugins
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # Expo
-.expo/*
+.expo/
+
+# Turborepo
+.turbo/
 
 # generated by bob
 lib/
-.env
-example/web-build/*
+
+# React Native Codegen
+ios/generated
+android/generated

.husky/commit-msg

@@ -1,37 +1,57 @@
 #!/bin/sh
 
-if [ "$LEFTHOOK" = "0" ]; then
-  exit 0
+if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
+  set -x
 fi
 
-if [ -t 1 ] ; then
-  exec < /dev/tty ; # <- enables interactive shell
+if [ "$LEFTHOOK" = "0" ]; then
+  exit 0
 fi
 
-dir="$(git rev-parse --show-toplevel)"
-
 call_lefthook()
 {
-  if lefthook -h >/dev/null 2>&1
+  if test -n "$LEFTHOOK_BIN"
   then
-    eval lefthook $@
-  elif test -f "$dir/node_modules/@arkweid/lefthook/bin/lefthook"
+    "$LEFTHOOK_BIN" "$@"
+  elif lefthook -h >/dev/null 2>&1
   then
-    eval "$dir/node_modules/@arkweid/lefthook/bin/lefthook $@"
-  elif bundle exec lefthook -h >/dev/null 2>&1
-  then
-    bundle exec lefthook $@
-  elif npx @arkweid/lefthook -h >/dev/null 2>&1
-  then
-    npx @arkweid/lefthook $@
-  elif yarn lefthook -h >/dev/null 2>&1
-  then
-    yarn lefthook $@
+    lefthook "$@"
   else
-    echo "Can't find lefthook in PATH"
+    dir="$(git rev-parse --show-toplevel)"
+    osArch=$(uname | tr '[:upper:]' '[:lower:]')
+    cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
+    if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
+    then
+      "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/lefthook/bin/index.js"
+    then
+      "$dir/node_modules/lefthook/bin/index.js" "$@"
+
+    elif bundle exec lefthook -h >/dev/null 2>&1
+    then
+      bundle exec lefthook "$@"
+    elif yarn lefthook -h >/dev/null 2>&1
+    then
+      yarn lefthook "$@"
+    elif pnpm lefthook -h >/dev/null 2>&1
+    then
+      pnpm lefthook "$@"
+    elif swift package plugin lefthook >/dev/null 2>&1
+    then
+      swift package --disable-sandbox plugin lefthook "$@"
+    elif command -v mint >/dev/null 2>&1
+    then
+      mint run csjones/lefthook-plugin "$@"
+    else
+      echo "Can't find lefthook in PATH"
+    fi
   fi
 }
 
-
-
-call_lefthook "run commit-msg $@"
+call_lefthook run "commit-msg" "$@"

.husky/pre-commit

@@ -1,37 +1,57 @@
 #!/bin/sh
 
-if [ "$LEFTHOOK" = "0" ]; then
-  exit 0
+if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
+  set -x
 fi
 
-if [ -t 1 ] ; then
-  exec < /dev/tty ; # <- enables interactive shell
+if [ "$LEFTHOOK" = "0" ]; then
+  exit 0
 fi
 
-dir="$(git rev-parse --show-toplevel)"
-
 call_lefthook()
 {
-  if lefthook -h >/dev/null 2>&1
+  if test -n "$LEFTHOOK_BIN"
   then
-    eval lefthook $@
-  elif test -f "$dir/node_modules/@arkweid/lefthook/bin/lefthook"
+    "$LEFTHOOK_BIN" "$@"
+  elif lefthook -h >/dev/null 2>&1
   then
-    eval "$dir/node_modules/@arkweid/lefthook/bin/lefthook $@"
-  elif bundle exec lefthook -h >/dev/null 2>&1
-  then
-    bundle exec lefthook $@
-  elif npx @arkweid/lefthook -h >/dev/null 2>&1
-  then
-    npx @arkweid/lefthook $@
-  elif yarn lefthook -h >/dev/null 2>&1
-  then
-    yarn lefthook $@
+    lefthook "$@"
   else
-    echo "Can't find lefthook in PATH"
+    dir="$(git rev-parse --show-toplevel)"
+    osArch=$(uname | tr '[:upper:]' '[:lower:]')
+    cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
+    if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
+    then
+      "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/lefthook/bin/index.js"
+    then
+      "$dir/node_modules/lefthook/bin/index.js" "$@"
+
+    elif bundle exec lefthook -h >/dev/null 2>&1
+    then
+      bundle exec lefthook "$@"
+    elif yarn lefthook -h >/dev/null 2>&1
+    then
+      yarn lefthook "$@"
+    elif pnpm lefthook -h >/dev/null 2>&1
+    then
+      pnpm lefthook "$@"
+    elif swift package plugin lefthook >/dev/null 2>&1
+    then
+      swift package --disable-sandbox plugin lefthook "$@"
+    elif command -v mint >/dev/null 2>&1
+    then
+      mint run csjones/lefthook-plugin "$@"
+    else
+      echo "Can't find lefthook in PATH"
+    fi
   fi
 }
 
-
-
-call_lefthook "run pre-commit $@"
+call_lefthook run "pre-commit" "$@"

.husky/prepare-commit-msg

@@ -1,39 +1,57 @@
 #!/bin/sh
 
-if [ "$LEFTHOOK" = "0" ]; then
-  exit 0
+if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then
+  set -x
 fi
 
-if [ -t 1 ] ; then
-  exec < /dev/tty ; # <- enables interactive shell
+if [ "$LEFTHOOK" = "0" ]; then
+  exit 0
 fi
 
-dir="$(git rev-parse --show-toplevel)"
-
 call_lefthook()
 {
-  if lefthook -h >/dev/null 2>&1
+  if test -n "$LEFTHOOK_BIN"
   then
-    eval lefthook $@
-  elif test -f "$dir/node_modules/@arkweid/lefthook/bin/lefthook"
+    "$LEFTHOOK_BIN" "$@"
+  elif lefthook -h >/dev/null 2>&1
   then
-    eval "$dir/node_modules/@arkweid/lefthook/bin/lefthook $@"
-  elif bundle exec lefthook -h >/dev/null 2>&1
-  then
-    bundle exec lefthook $@
-  elif npx @arkweid/lefthook -h >/dev/null 2>&1
-  then
-    npx @arkweid/lefthook $@
-  elif yarn lefthook -h >/dev/null 2>&1
-  then
-    yarn lefthook $@
+    lefthook "$@"
   else
-    echo "Can't find lefthook in PATH"
+    dir="$(git rev-parse --show-toplevel)"
+    osArch=$(uname | tr '[:upper:]' '[:lower:]')
+    cpuArch=$(uname -m | sed 's/aarch64/arm64/;s/x86_64/x64/')
+    if test -f "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook"
+    then
+      "$dir/node_modules/lefthook-${osArch}-${cpuArch}/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook/bin/lefthook-${osArch}-${cpuArch}/lefthook" "$@"
+    elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook"
+    then
+      "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook" "$@"
+    elif test -f "$dir/node_modules/lefthook/bin/index.js"
+    then
+      "$dir/node_modules/lefthook/bin/index.js" "$@"
+
+    elif bundle exec lefthook -h >/dev/null 2>&1
+    then
+      bundle exec lefthook "$@"
+    elif yarn lefthook -h >/dev/null 2>&1
+    then
+      yarn lefthook "$@"
+    elif pnpm lefthook -h >/dev/null 2>&1
+    then
+      pnpm lefthook "$@"
+    elif swift package plugin lefthook >/dev/null 2>&1
+    then
+      swift package --disable-sandbox plugin lefthook "$@"
+    elif command -v mint >/dev/null 2>&1
+    then
+      mint run csjones/lefthook-plugin "$@"
+    else
+      echo "Can't find lefthook in PATH"
+    fi
   fi
 }
 
-# lefthook_version: 9df6c1f1f0b607d16db43f25a405e842
-
-call_lefthook "install"
-
-call_lefthook "run prepare-commit-msg $@"
+call_lefthook run "prepare-commit-msg" "$@"

.nvmrc

@@ -1 +1 @@
-16.18.1
+v18