@appsent-co/react-native-watchos 0.1.1 → 0.1.3

package/apple/Sources/ReactNativeWatchOS/ReactNativeWatchOS.swift

@@ -152,8 +152,16 @@ public final class ReactNativeWatchOSHost: ObservableObject {
         Bundle.main.url(forResource: name, withExtension: "jsbundle")
     }
 
+    /// - Parameter entry: Metro entry path (no extension). Defaults to
+    ///   `"index.watchos"` so the request becomes `/index.watchos.bundle`,
+    ///   which Metro resolves to the literal `index.watchos.{tsx,ts,jsx,js}`
+    ///   on disk. A bare `"index"` would resolve to `index.ts` (the
+    ///   iOS/Android entry from package.json `main`) — Metro applies the
+    ///   `.watchos.*` extension to in-graph `require`s, not to the entry
+    ///   path itself. Monorepo callers can override with e.g.
+    ///   `entry: "my-app/index.watchos"`.
     public static func defaultBundleURL(
-        entry: String = "index",
+        entry: String = "index.watchos",
         host: String = "127.0.0.1",
         port: Int = 8081,
         name: String = "main"

package/build/xcframework/ReactNativeWatchOSCxx.xcframework/Info.plist

@@ -10,7 +10,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>watchos-arm64</string>
+			<string>watchos-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libReactNativeWatchOSCxx.a</string>
 			<key>SupportedArchitectures</key>
@@ -19,6 +19,8 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>watchos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -26,7 +28,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>watchos-arm64-simulator</string>
+			<string>watchos-arm64</string>
 			<key>LibraryPath</key>
 			<string>libReactNativeWatchOSCxx.a</string>
 			<key>SupportedArchitectures</key>
@@ -35,8 +37,6 @@
 			</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,13 +89,31 @@ function isWatchTargetConfig(dir) {
   return false;
 }
 
+/** @param {string} targetDir */
 function writeContentView(targetDir) {
+  // `create-target watch` drops its own `content.swift` placeholder that
+  // declares `struct ContentView: View`. Ours does too, so leaving both in
+  // the target compiles to "Invalid redeclaration of 'ContentView'". Wipe
+  // the placeholder (root + preview/) before writing ours.
+  for (const dir of [targetDir, path.join(targetDir, 'preview')]) {
+    if (!fs.existsSync(dir)) continue;
+    for (const name of fs.readdirSync(dir)) {
+      if (name.toLowerCase() !== 'content.swift') continue;
+      const p = path.join(dir, name);
+      fs.rmSync(p);
+      console.log(
+        `› Removed ${path.relative(process.cwd(), p)} (create-target placeholder; conflicts with ContentView.swift).`
+      );
+    }
+  }
+
   const dest = path.join(targetDir, 'ContentView.swift');
   const src = path.join(TEMPLATES, 'ContentView.swift');
   fs.copyFileSync(src, dest);
   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 +126,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,13 +180,11 @@ 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;
-
   // `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.
@@ -131,8 +197,8 @@ function patchAppJson(cwd, targetName) {
   }
 
   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);
@@ -147,6 +213,11 @@ function patchAppJson(cwd, targetName) {
   }
 }
 
+/**
+ * @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.1",
+  "version": "0.1.3",
   "description": "Build WatchOS apps in react-native",
   "main": "./plugin/src/index.js",
   "bin": {

package/plugin/templates/ContentView.swift

@@ -20,7 +20,7 @@ struct ContentView: View {
     // For real-device testing, pass the Mac's LAN IP:
     //   ReactNativeWatchOSHost.defaultBundleURL(host: "192.168.1.42")
     // pnpm/monorepo setups serve bundles under `/<package>/index.bundle`:
-    //   ReactNativeWatchOSHost.defaultBundleURL(entry: "my-app/index")
+    //   ReactNativeWatchOSHost.defaultBundleURL(entry: "my-app/index.watchos")
     private let bundleURL = ReactNativeWatchOSHost.defaultBundleURL()
 
     var body: some View {