fix(demo): split SDK build and install stamps

Author: fadi-george

.gitignore

@@ -5,6 +5,7 @@ node_modules
 dist/
 coverage/
 .capacitor-sdk-source.stamp
+.capacitor-sdk-installed.stamp
 .cap-sync.stamp
 
 # macOS

examples/demo_pods/package.json

@@ -8,10 +8,16 @@
     "build": "vp build",
     "clean:android": "rm -rf android/app/build android/app/.cxx android/build",
     "clean:ios": "rm -rf ios/App/Pods ios/App/build",
+    "dev": "vp dev --host --port 5173",
+    "dev:android": "bash ../dev-android.sh",
+    "dev:ios": "bash ../dev-ios.sh",
     "ios": "bash ../run-ios.sh",
-    "preandroid": "bun run setup",
-    "preios": "bun run setup",
-    "setup": "../setup.sh"
+    "preandroid": "vp run setup",
+    "predev:android": "vp run setup",
+    "predev:ios": "vp run setup",
+    "preios": "vp run setup",
+    "setup": "../setup.sh",
+    "update:pods": "(cd ios/App && pod update OneSignalXCFramework --no-repo-update)"
   },
   "dependencies": {
     "@capacitor/android": "^8.3.0",
@@ -36,13 +42,7 @@
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
     "@vitejs/plugin-react": "^6.0.1",
-    "typescript": "^6.0.2",
-    "vite": "npm:@voidzero-dev/vite-plus-core@latest",
-    "vite-plus": "0.1.17"
+    "typescript": "^6.0.3"
   },
-  "overrides": {
-    "vite": "npm:@voidzero-dev/vite-plus-core@latest",
-    "vitest": "npm:@voidzero-dev/vite-plus-test@latest"
-  },
-  "packageManager": "bun@1.3.11"
+  "packageManager": "bun@1.3.13"
 }

examples/demo_pods/src/hooks/useOneSignal.ts

@@ -278,7 +278,9 @@ export function useOneSignal(): UseOneSignalReturn {
       setIsLoading(false);
     });
 
+    console.log('Loaded OneSignal');
     return () => {
+      console.log('Cleaning up OneSignal listeners');
       OneSignal.InAppMessages.removeEventListener('willDisplay', handleIamWillDisplay);
       OneSignal.InAppMessages.removeEventListener('didDisplay', handleIamDidDisplay);
       OneSignal.InAppMessages.removeEventListener('willDismiss', handleIamWillDismiss);

examples/setup.sh

@@ -8,9 +8,16 @@ SDK_ROOT=$(cd "$ORIGINAL_DIR/../.." && pwd)
 info() { echo -e "\033[0;32m[setup]\033[0m $*"; }
 
 # ── Plugin tarball cache ─────────────────────────────────────────────────────
-# Skip rebuild/repack/`vp add` when plugin sources haven't changed.
-SDK_STAMP="$SDK_ROOT/.capacitor-sdk-source.stamp"
+# Two stamps: the SDK build is shared across demos (one tarball serves all),
+# but the `vp add` install is per-demo. Without the split, running setup in
+# `demo` first would leave the shared stamp at the new hash, and a follow-up
+# `demo_pods` setup would short-circuit the install and keep stale sources in
+# `demo_pods/node_modules/@onesignal/capacitor-plugin/` — which is what
+# CocoaPods path-references, so the native pod stays pre-fix.
+SDK_BUILD_STAMP="$SDK_ROOT/.capacitor-sdk-source.stamp"
+INSTALLED_STAMP="$ORIGINAL_DIR/.capacitor-sdk-installed.stamp"
 INSTALLED_DIR="$ORIGINAL_DIR/node_modules/@onesignal/capacitor-plugin"
+TARBALL="$SDK_ROOT/onesignal-capacitor-plugin.tgz"
 
 SDK_SRC_HASH=$(find "$SDK_ROOT/src" "$SDK_ROOT/android" "$SDK_ROOT/ios" \
                     "$SDK_ROOT/package.json" \
@@ -23,21 +30,25 @@ SDK_SRC_HASH=$(find "$SDK_ROOT/src" "$SDK_ROOT/android" "$SDK_ROOT/ios" \
                | shasum \
                | awk '{print $1}')
 
-if [[ -d "$INSTALLED_DIR" ]] && [[ -f "$SDK_STAMP" ]] && [[ "$(cat "$SDK_STAMP")" == "$SDK_SRC_HASH" ]]; then
-  info "Capacitor SDK source unchanged, skipping rebuild + repack"
+if [[ -f "$TARBALL" ]] && [[ -f "$SDK_BUILD_STAMP" ]] && [[ "$(cat "$SDK_BUILD_STAMP")" == "$SDK_SRC_HASH" ]]; then
+  info "Capacitor SDK tarball is up-to-date, skipping rebuild + repack"
 else
   info "Building Capacitor plugin & packing tarball..."
   (cd "$SDK_ROOT" && vp run build)
   (cd "$SDK_ROOT" && rm -f onesignal-capacitor-plugin*.tgz && vp pm pack && mv onesignal-capacitor-plugin-*.tgz onesignal-capacitor-plugin.tgz)
+  echo "$SDK_SRC_HASH" > "$SDK_BUILD_STAMP"
+fi
 
+if [[ -d "$INSTALLED_DIR" ]] && [[ -f "$INSTALLED_STAMP" ]] && [[ "$(cat "$INSTALLED_STAMP")" == "$SDK_SRC_HASH" ]]; then
+  info "Plugin already installed at current SDK hash, skipping vp add"
+else
   # Remove before add so bun.lock's integrity hash refreshes against the new
   # tarball; otherwise `vp add` hits a dependency-loop error under bun 1.3+.
   # Keep the relative `file:../../...` path to match package.json's spec.
   info "Registering tarball with vp (refreshes bun.lock integrity hash)..."
   vp remove @onesignal/capacitor-plugin 2>/dev/null || true
   vp add file:../../onesignal-capacitor-plugin.tgz
-
-  echo "$SDK_SRC_HASH" > "$SDK_STAMP"
+  echo "$SDK_SRC_HASH" > "$INSTALLED_STAMP"
 fi
 
 # ── Vite prebundle staleness check ───────────────────────────────────────────