@appsent-co/react-native-watchos 0.1.0 → 0.1.2

package/build/xcframework/Hermes.xcframework/Info.plist

@@ -8,7 +8,7 @@
 			<key>BinaryPath</key>
 			<string>hermes.framework/hermes</string>
 			<key>LibraryIdentifier</key>
-			<string>watchos-arm64-simulator</string>
+			<string>watchos-arm64</string>
 			<key>LibraryPath</key>
 			<string>hermes.framework</string>
 			<key>SupportedArchitectures</key>
@@ -17,14 +17,12 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>watchos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>hermes.framework/hermes</string>
 			<key>LibraryIdentifier</key>
-			<string>watchos-arm64</string>
+			<string>watchos-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>hermes.framework</string>
 			<key>SupportedArchitectures</key>
@@ -33,6 +31,8 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>watchos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/cli/init.js

@@ -34,6 +34,13 @@ async function main() {
   const targetsRoot = path.join(cwd, 'targets');
   const existing = listWatchTargets(targetsRoot);
 
+  // `create-target watch` loads the Expo config internally, which runs our
+  // plugin's order assertion. If `npx expo install` auto-added us before
+  // `@bacons/apple-targets`, that assertion throws and create-target exits 1
+  // before we ever get to patchAppJson. Strip our entry first; patchAppJson
+  // reinserts it in the correct position after create-target succeeds.
+  stripOurPluginFromAppJson(cwd);
+
   console.log('› Running `npx create-target watch`…');
   await spawnInherit('npx', ['--yes', 'create-target', 'watch']);
 
@@ -59,6 +66,7 @@ async function main() {
   console.log('  • Next:          npx expo prebuild -p ios --clean');
 }
 
+/** @param {string} targetsRoot */
 function listWatchTargets(targetsRoot) {
   if (!fs.existsSync(targetsRoot)) return [];
   const out = [];
@@ -70,6 +78,7 @@ function listWatchTargets(targetsRoot) {
   return out;
 }
 
+/** @param {string} dir */
 function isWatchTargetConfig(dir) {
   for (const f of ['expo-target.config.json', 'expo-target.config.js']) {
     const p = path.join(dir, f);
@@ -80,6 +89,7 @@ function isWatchTargetConfig(dir) {
   return false;
 }
 
+/** @param {string} targetDir */
 function writeContentView(targetDir) {
   const dest = path.join(targetDir, 'ContentView.swift');
   const src = path.join(TEMPLATES, 'ContentView.swift');
@@ -87,6 +97,7 @@ function writeContentView(targetDir) {
   console.log(`› Wrote ${path.relative(process.cwd(), dest)}`);
 }
 
+/** @param {string} cwd */
 function writeEntryFile(cwd) {
   for (const name of ENTRY_NAMES) {
     if (fs.existsSync(path.join(cwd, name))) {
@@ -99,6 +110,47 @@ function writeEntryFile(cwd) {
   console.log(`› Wrote ${path.relative(cwd, dest)}`);
 }
 
+/**
+ * @param {unknown} entry
+ * @param {string} name
+ */
+const isEntry = (entry, name) =>
+  Array.isArray(entry) ? entry[0] === name : entry === name;
+
+/**
+ * @param {string} cwd
+ */
+function stripOurPluginFromAppJson(cwd) {
+  const p = path.join(cwd, 'app.json');
+  if (!fs.existsSync(p)) return;
+
+  /** @type {{ expo?: { plugins?: Array<unknown> } }} */
+  const json = JSON.parse(fs.readFileSync(p, 'utf8'));
+  const plugins =
+    json && json.expo && Array.isArray(json.expo.plugins)
+      ? json.expo.plugins
+      : null;
+  if (!plugins) return;
+
+  let removed = 0;
+  for (let i = plugins.length - 1; i >= 0; i--) {
+    if (isEntry(plugins[i], '@appsent-co/react-native-watchos')) {
+      plugins.splice(i, 1);
+      removed++;
+    }
+  }
+  if (removed) {
+    fs.writeFileSync(p, JSON.stringify(json, null, 2) + '\n');
+    console.log(
+      `› Removed pre-existing @appsent-co/react-native-watchos entry from ${path.relative(cwd, p)} (will reinsert in correct position).`
+    );
+  }
+}
+
+/**
+ * @param {string} cwd
+ * @param {string} targetName
+ */
 function patchAppJson(cwd, targetName) {
   const p = path.join(cwd, 'app.json');
   if (!fs.existsSync(p)) {
@@ -112,31 +164,44 @@ function patchAppJson(cwd, targetName) {
   }
 
   const raw = fs.readFileSync(p, 'utf8');
+  /** @type {{ expo?: { plugins?: Array<unknown> } }} */
   const json = JSON.parse(raw);
   const expo = (json.expo = json.expo || {});
   const plugins = (expo.plugins = expo.plugins || []);
 
-  const isEntry = (entry, name) =>
-    Array.isArray(entry) ? entry[0] === name : entry === name;
-
-  if (plugins.some((e) => isEntry(e, '@appsent-co/react-native-watchos'))) {
-    console.log(
-      '› @appsent-co/react-native-watchos plugin already present in app.json.'
-    );
-    return;
+  // `npx expo install` auto-adds the plugin as a bare string in the wrong
+  // position (before @bacons/apple-targets) and with no targetName. Strip
+  // any existing entry so we can reinsert it in the correct position.
+  const removed = [];
+  for (let i = plugins.length - 1; i >= 0; i--) {
+    if (isEntry(plugins[i], '@appsent-co/react-native-watchos')) {
+      removed.push(plugins[i]);
+      plugins.splice(i, 1);
+    }
   }
 
   const entry = ['@appsent-co/react-native-watchos', { targetName }];
-  const baconIdx = plugins.findIndex((e) =>
-    isEntry(e, '@bacons/apple-targets')
+  const baconIdx = plugins.findIndex(
+    /** @param {unknown} e */ (e) => isEntry(e, '@bacons/apple-targets')
   );
   if (baconIdx >= 0) plugins.splice(baconIdx + 1, 0, entry);
   else plugins.push(entry);
 
   fs.writeFileSync(p, JSON.stringify(json, null, 2) + '\n');
-  console.log(`› Patched ${path.relative(cwd, p)}`);
+  if (removed.length) {
+    console.log(
+      `› Replaced existing @appsent-co/react-native-watchos entry in ${path.relative(cwd, p)}`
+    );
+  } else {
+    console.log(`› Patched ${path.relative(cwd, p)}`);
+  }
 }
 
+/**
+ * @param {string} cmd
+ * @param {string[]} args
+ * @returns {Promise<void>}
+ */
 function spawnInherit(cmd, args) {
   return new Promise((resolve, reject) => {
     const child = spawn(cmd, args, { stdio: 'inherit' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsent-co/react-native-watchos",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Build WatchOS apps in react-native",
   "main": "./plugin/src/index.js",
   "bin": {
@@ -37,6 +37,15 @@
     "build/xcframework",
     "!**/.*"
   ],
+  "scripts": {
+    "build:xcframework": "./scripts/build-xcframework.sh",
+    "lint": "eslint .",
+    "clean": "del-cli build/xcframework example/ios",
+    "docs": "pnpm --filter react-native-watchos-docs start",
+    "docs:build": "pnpm --filter react-native-watchos-docs build",
+    "release": "release-it --only-version",
+    "prepublishOnly": "pnpm build:xcframework"
+  },
   "keywords": [
     "react-native",
     "watchos",
@@ -74,21 +83,21 @@
     "globals": "^15.14.0",
     "prettier": "^3.6.2",
     "react": "19.1.0",
-    "react-reconciler": "0.32.0",
     "release-it": "^19.0.4",
     "typescript": "^5.9.2"
   },
   "dependencies": {
     "@expo/config-plugins": "^54.0.0",
+    "react-reconciler": "0.32.0",
     "whatwg-fetch": "^3.6.20"
   },
   "peerDependencies": {
     "@bacons/apple-targets": ">=4.0.0",
     "expo": ">=54.0.0",
     "react": "*",
-    "react-native": "*",
-    "react-reconciler": "*"
+    "react-native": "*"
   },
+  "packageManager": "pnpm@10.10.0",
   "commitlint": {
     "extends": [
       "@commitlint/config-conventional"
@@ -107,6 +116,7 @@
     },
     "plugins": {
       "@release-it/conventional-changelog": {
+        "ignoreRecommendedBump": true,
         "preset": {
           "name": "angular"
         }
@@ -119,13 +129,5 @@
     "tabWidth": 2,
     "trailingComma": "es5",
     "useTabs": false
-  },
-  "scripts": {
-    "build:xcframework": "./scripts/build-xcframework.sh",
-    "lint": "eslint .",
-    "clean": "del-cli build/xcframework example/ios",
-    "docs": "pnpm --filter react-native-watchos-docs start",
-    "docs:build": "pnpm --filter react-native-watchos-docs build",
-    "release": "release-it --only-version"
   }
-}
+}

package/plugin/src/index.js

@@ -49,6 +49,7 @@ const withWatchTurboModuleCodegen = require('./withWatchTurboModuleCodegen');
  * @type {import('@expo/config-plugins').ConfigPlugin<ReactNativeWatchOSPluginOpts | void>}
  */
 const withReactNativeWatchOS = (config, opts) => {
+  assertPluginOrder(config);
   const targetName = (opts && opts.targetName) || 'watch';
   const bundleName = (opts && opts.bundleName) || 'main';
   const entryFile = opts && opts.entryFile;
@@ -65,5 +66,42 @@ const withReactNativeWatchOS = (config, opts) => {
   ]);
 };
 
+/**
+ * @param {{ plugins?: Array<string | [string, unknown] | unknown> }} config
+ */
+function assertPluginOrder(config) {
+  const plugins = Array.isArray(config && config.plugins)
+    ? config.plugins
+    : null;
+  if (!plugins) return;
+
+  /** @param {unknown} e */
+  const nameOf = (e) =>
+    typeof e === 'string' ? e : Array.isArray(e) ? e[0] : null;
+  const ourIdx = plugins.findIndex(
+    (e) => nameOf(e) === '@appsent-co/react-native-watchos'
+  );
+  const baconsIdx = plugins.findIndex(
+    (e) => nameOf(e) === '@bacons/apple-targets'
+  );
+  if (ourIdx < 0) return;
+
+  if (baconsIdx < 0) {
+    throw new Error(
+      '[@appsent-co/react-native-watchos] requires "@bacons/apple-targets" ' +
+        'to be present in your Expo plugins array (before this plugin). ' +
+        'Run `npx react-native-watchos init` to wire it up.'
+    );
+  }
+  if (baconsIdx > ourIdx) {
+    throw new Error(
+      '[@appsent-co/react-native-watchos] must come AFTER ' +
+        '"@bacons/apple-targets" in your Expo plugins array, so the watch ' +
+        'target exists when this plugin patches the pbxproj. ' +
+        'Run `npx react-native-watchos init` to fix the order.'
+    );
+  }
+}
+
 module.exports = withReactNativeWatchOS;
 module.exports.default = withReactNativeWatchOS;