expo-app-blocker 0.1.49 → 0.1.51

package/README.md

@@ -86,10 +86,9 @@ npx expo install expo-app-blocker
 
 ### 2. Configure `app.json`
 
-> **Three things are required on iOS** and skipping any of them produces a cryptic build failure:
-> 1. `ios.appleTeamId` — `@bacons/apple-targets` refuses to add the extension targets without it.
+> **Two things are required on iOS** and skipping either produces a cryptic build failure:
+> 1. `ios.appleTeamId` — `@bacons/apple-targets` (auto-registered by this plugin) refuses to add the extension targets without it.
 > 2. `ios.entitlements` with **Family Controls + the App Group** — the extension `expo-target.config.js` files read `ios.entitlements['com.apple.security.application-groups'][0]` to learn which App Group to embed. If it's missing they fall back to `group.expo.app-blocker` and the build fails with `An Application Group with Identifier 'group.expo.app-blocker' is not available`.
-> 3. `@bacons/apple-targets` must appear in the `plugins` array **after** `expo-app-blocker`. The targets only get added to the Xcode project when this plugin runs.
 
 ```json
 {
@@ -116,8 +115,7 @@ npx expo install expo-app-blocker
             "backgroundBlurStyle": "systemThickMaterialLight"
           }
         }
-      }],
-      "@bacons/apple-targets"
+      }]
     ]
   }
 }
@@ -125,6 +123,8 @@ npx expo install expo-app-blocker
 
 > The App Group identifier in `ios.entitlements` and `expo-app-blocker.ios.appGroup` **must match** — they describe the same shared-storage container for the main app and the three extensions.
 
+> **Monorepo note (pnpm / yarn workspaces):** `@bacons/apple-targets` is declared as a direct dependency of `expo-app-blocker` and is auto-registered by this plugin, so most monorepo setups work out of the box. If you ever see `Failed to load '@bacons/apple-targets'` during prebuild, add it as a direct dependency of your app (`pnpm add @bacons/apple-targets`) to defeat the workspace's resolver isolation.
+
 ### 3. Use in your app
 
 ```tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-app-blocker",
-  "version": "0.1.49",
+  "version": "0.1.51",
   "description": "Expo module for cross-platform app blocking. Android: UsageStatsManager + Overlay. iOS: Screen Time API (FamilyControls + ManagedSettings + DeviceActivity).",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/plugin/src/index.js

@@ -14,6 +14,32 @@ const {
 const fs = require("fs");
 const path = require("path");
 
+// ──────────────────────────────────────────────────────────────────────────────
+// Privacy manifest helper
+// ──────────────────────────────────────────────────────────────────────────────
+
+// Merges expo-app-blocker's required UserDefaults entry into config.ios.privacyManifests
+// so Expo's built-in withPrivacyInfo plugin writes it to PrivacyInfo.xcprivacy on prebuild.
+// Required for App Store submission: the blocker uses UserDefaults extensively for
+// AppGroup state sharing between the main app and Shield/DeviceActivityMonitor extensions.
+function mergeBlockerPrivacyManifest(config) {
+  const ios = config.ios ?? {};
+  const privacyManifests = ios.privacyManifests ?? {};
+  const apiTypes = [...(privacyManifests.NSPrivacyAccessedAPITypes ?? [])];
+  const TYPE = "NSPrivacyAccessedAPICategoryUserDefaults";
+  const REASON = "CA92.1";
+  const existing = apiTypes.find((t) => t.NSPrivacyAccessedAPIType === TYPE);
+  if (!existing) {
+    apiTypes.push({ NSPrivacyAccessedAPIType: TYPE, NSPrivacyAccessedAPITypeReasons: [REASON] });
+  } else if (!existing.NSPrivacyAccessedAPITypeReasons.includes(REASON)) {
+    existing.NSPrivacyAccessedAPITypeReasons = [...existing.NSPrivacyAccessedAPITypeReasons, REASON];
+  }
+  return {
+    ...config,
+    ios: { ...ios, privacyManifests: { ...privacyManifests, NSPrivacyAccessedAPITypes: apiTypes } },
+  };
+}
+
 // ──────────────────────────────────────────────────────────────────────────────
 // Android
 // ──────────────────────────────────────────────────────────────────────────────
@@ -185,6 +211,8 @@ function withAppBlockerAndroid(config, pluginConfig) {
 // ──────────────────────────────────────────────────────────────────────────────
 
 function withAppBlockerIOS(config, pluginConfig) {
+  config = mergeBlockerPrivacyManifest(config);
+
   const bundleId = config.ios?.bundleIdentifier || "expo.app-blocker";
   const appGroup = pluginConfig?.ios?.appGroup || `group.${bundleId}`;
 
@@ -201,6 +229,46 @@ function withAppBlockerIOS(config, pluginConfig) {
     return config;
   });
 
+  // Populate `targets/` synchronously at config-eval time so the
+  // `@bacons/apple-targets` plugin (registered just below) can glob the
+  // directory and register the Shield/DeviceActivityMonitor/ShieldConfiguration
+  // extensions on the first prebuild. Done synchronously because @bacons globs
+  // during config evaluation, before any withDangerousMod queued by this plugin
+  // would run.
+  const projectRoot = config._internal?.projectRoot;
+  if (projectRoot) {
+    const targetsDir = path.join(projectRoot, "targets");
+    const packageTargetsDir = path.resolve(__dirname, "..", "..", "targets");
+    if (fs.existsSync(packageTargetsDir)) {
+      for (const dir of fs.readdirSync(packageTargetsDir)) {
+        const srcDir = path.join(packageTargetsDir, dir);
+        const destDir = path.join(targetsDir, dir);
+        if (!fs.statSync(srcDir).isDirectory()) continue;
+        if (!fs.existsSync(destDir)) fs.mkdirSync(destDir, { recursive: true });
+        for (const file of fs.readdirSync(srcDir)) {
+          if (file.endsWith(".swift") || file === "expo-target.config.js") {
+            fs.copyFileSync(path.join(srcDir, file), path.join(destDir, file));
+          }
+        }
+      }
+    }
+  }
+
+  // Auto-register `@bacons/apple-targets` so users don't have to add it to
+  // their app.json plugins array. Resolved from this package's own
+  // node_modules (declared dep), which also makes it work in pnpm/yarn
+  // workspaces where transitive plugins aren't hoisted into the app root.
+  try {
+    const withTargetsDir = resolve("@bacons/apple-targets/app.plugin");
+    config = withTargetsDir(config, {});
+  } catch (err) {
+    throw new Error(
+      `[expo-app-blocker] Failed to load '@bacons/apple-targets'. In pnpm or ` +
+      `yarn-workspace monorepos, add it as a direct dependency of your app: ` +
+      `\`pnpm add @bacons/apple-targets\`. Original error: ${err.message}`
+    );
+  }
+
   config = withDangerousMod(config, [
     "ios",
     (config) => {
@@ -243,35 +311,10 @@ function withAppBlockerIOS(config, pluginConfig) {
         }
       }
 
-      // Copy fresh target templates from node_modules before replacing placeholders
+      // Templates were copied to `targets/` at config-eval time (see
+      // withAppBlockerIOS). This block only resolves the directory for the
+      // placeholder-substitution and shield-icon-copy steps below.
       const targetsDir = path.join(path.dirname(platformRoot), "targets");
-      const packageTargetsDir = path.resolve(__dirname, "..", "..", "targets");
-      if (fs.existsSync(packageTargetsDir)) {
-        function copyDirSync(src, dest) {
-          if (!fs.existsSync(dest)) fs.mkdirSync(dest, { recursive: true });
-          for (const entry of fs.readdirSync(src)) {
-            const srcPath = path.join(src, entry);
-            const destPath = path.join(dest, entry);
-            if (fs.statSync(srcPath).isDirectory()) {
-              copyDirSync(srcPath, destPath);
-            } else {
-              fs.copyFileSync(srcPath, destPath);
-            }
-          }
-        }
-        // Only copy Swift files and config (preserve user's assets, generated entitlements, Info.plist)
-        for (const dir of fs.readdirSync(packageTargetsDir)) {
-          const srcDir = path.join(packageTargetsDir, dir);
-          const destDir = path.join(targetsDir, dir);
-          if (!fs.statSync(srcDir).isDirectory()) continue;
-          if (!fs.existsSync(destDir)) fs.mkdirSync(destDir, { recursive: true });
-          for (const file of fs.readdirSync(srcDir)) {
-            if (file.endsWith(".swift") || file === "expo-target.config.js") {
-              fs.copyFileSync(path.join(srcDir, file), path.join(destDir, file));
-            }
-          }
-        }
-      }
 
       // Helper: hex to RGB floats
       function hexToRgb(hex) {