@unrulysystems/rn-playwright-driver-runner 0.1.0 → 0.1.1

package/dist/cli.mjs

@@ -209,9 +209,10 @@ function planAndroid(input) {
       }
     }
   });
-  const launchCommand = launchCommandFor(android, serial);
-  push(launchStep("android.launch-1", android, serial));
-  push(hermesStep("android.hermes-1", android, metro, resolved, hermesDeviceName, launchCommand));
+  const launch1Command = launchCommandFor(android, resolved, serial, { forceStopBefore: true });
+  const launch2Command = launchCommandFor(android, resolved, serial, { forceStopBefore: false });
+  push(launchStep("android.launch-1", android, launch1Command));
+  push(hermesStep("android.hermes-1", android, metro, resolved, hermesDeviceName, launch1Command));
   push({
     id: "android.forward-clean",
     stage: "companion",
@@ -268,8 +269,8 @@ function planAndroid(input) {
       }
     }
   });
-  push(launchStep("android.launch-2", android, serial));
-  push(hermesStep("android.hermes-2", android, metro, resolved, hermesDeviceName, launchCommand));
+  push(launchStep("android.launch-2", android, launch2Command));
+  push(hermesStep("android.hermes-2", android, metro, resolved, hermesDeviceName, launch2Command));
   const cleanup = [
     {
       type: "kill-process",
@@ -324,22 +325,34 @@ function planAndroid(input) {
     playwright: playwrightCommand(playwright, specs, passthrough)
   };
 }
-function launchCommandFor(android, serial) {
-  return adb(serial, [
-    "shell",
-    "am",
-    "start",
-    "-W",
-    "-n",
-    `${android.packageName}/${android.activity}`
-  ]);
-}
-function launchStep(id, android, serial) {
+function launchCommandFor(android, resolved, serial, opts) {
+  if (android.launch.kind === "plain") {
+    return adb(serial, [
+      "shell",
+      "am",
+      "start",
+      "-W",
+      "-n",
+      `${android.packageName}/${android.activity}`
+    ]);
+  }
+  if (!android.scheme) {
+    throw new Error('android.scheme is required when android.launch.kind is "expo-dev-client"');
+  }
+  const launchScript = `am start -a android.intent.action.VIEW -d ${shellSingleQuote(
+    devClientUrl(android.scheme, resolved.initialUrl)
+  )}`;
+  return adbShellScript(
+    serial,
+    opts.forceStopBefore ? `am force-stop ${android.packageName} && ${launchScript}` : launchScript
+  );
+}
+function launchStep(id, android, command) {
   return {
     id,
     stage: "app-launch",
     description: `Launch ${android.packageName}/${android.activity}`,
-    action: { type: "command", command: launchCommandFor(android, serial) }
+    action: { type: "command", command }
   };
 }
 function hermesStep(id, android, metro, resolved, deviceNameMatch, launchCommand) {
@@ -373,6 +386,12 @@ function debugHostXml(host) {
 function adb(serial, args) {
   return { command: "adb", args: ["-s", serial, ...args] };
 }
+function devClientUrl(scheme, initialUrl) {
+  return `${scheme}://expo-development-client/?url=${initialUrl}`;
+}
+function shellSingleQuote(value) {
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
 function adbShellScript(serial, remote) {
   return { command: "adb", args: ["-s", serial, "shell", remote] };
 }
@@ -418,8 +437,7 @@ function planIos(input) {
       // Pass the resolved UI-test scheme so a custom `ios.uitestScheme` scaffolds
       // the SAME target that companion startup later builds (default is
       // `${appScheme}UITests`).
-      command: npx([
-        "rn-driver-xctest-scaffold",
+      command: cmd("node_modules/.bin/rn-driver-xctest-scaffold", [
         "--ios-dir",
         "ios",
         "--project-name",
@@ -713,7 +731,7 @@ function placeholderIos(ios, metro) {
     initialUrl: ios.launch.initialUrl ?? metro.url
   };
 }
-function placeholderAndroid(android, _metro) {
+function placeholderAndroid(android, metro) {
   return {
     serial: "<android-serial>",
     touchPort: android.companion?.port ?? DEFAULTS.companionPort,
@@ -721,7 +739,8 @@ function placeholderAndroid(android, _metro) {
     hermesTimeoutMs: DEFAULTS.hermesTargetTimeoutMs,
     tokenFile: SECRET_PLACEHOLDER,
     deviceTokenFileName: DEFAULTS.androidTokenFileName,
-    instrumentationTarget: instrumentationTarget(android)
+    instrumentationTarget: instrumentationTarget(android),
+    initialUrl: android.launch.initialUrl ?? metro.url
   };
 }
 
@@ -748,7 +767,7 @@ function buildDryRunPlan(config, platform, opts = {}) {
   return planAndroid({
     android,
     metro,
-    resolved: placeholderAndroid(android),
+    resolved: placeholderAndroid(android, metro),
     playwright: config.playwright,
     timeoutMs: config.timeoutMs,
     specs,
@@ -1288,7 +1307,7 @@ async function resolveIosTarget(ios, metro, opts) {
     initialUrl: ios.launch.initialUrl ?? metro.url
   };
 }
-async function resolveAndroidTarget(android, _metro, opts) {
+async function resolveAndroidTarget(android, metro, opts) {
   const serial = await selectSerial(opts.device);
   await requireBooted(serial);
   const deviceName = (await capture("adb", ["-s", serial, "shell", "getprop", "ro.product.model"])).trim();
@@ -1301,7 +1320,8 @@ async function resolveAndroidTarget(android, _metro, opts) {
       hermesTimeoutMs: DEFAULTS.hermesTargetTimeoutMs,
       tokenFile,
       deviceTokenFileName: DEFAULTS.androidTokenFileName,
-      instrumentationTarget: instrumentationTarget(android)
+      instrumentationTarget: instrumentationTarget(android),
+      initialUrl: android.launch.initialUrl ?? metro.url
     },
     deviceName
   };
@@ -1406,6 +1426,7 @@ var IOS_KEYS = /* @__PURE__ */ new Set([
 var ANDROID_KEYS = /* @__PURE__ */ new Set([
   "packageName",
   "activity",
+  "scheme",
   "gradleTasks",
   "appApkPath",
   "testApkPath",
@@ -1507,6 +1528,8 @@ function validateAndroid(android, errors) {
   reportUnknownKeys("config.android", android, ANDROID_KEYS, errors);
   requireAndroidPackage("config.android.packageName", android.packageName, errors);
   requireAndroidActivity("config.android.activity", android.activity, errors);
+  if (android.scheme !== void 0)
+    requireAppScheme("config.android.scheme", android.scheme, errors);
   optionalString("config.android.appApkPath", android.appApkPath, errors);
   optionalString("config.android.testApkPath", android.testApkPath, errors);
   if (android.instrumentationTarget !== void 0)
@@ -1519,7 +1542,10 @@ function validateAndroid(android, errors) {
     errors.push("config.android.gradleTasks: expected an array of strings");
   }
   validateCompanion("config.android.companion", android.companion, errors);
-  validateLaunch("config.android.launch", android.launch, errors);
+  const launch = validateLaunch("config.android.launch", android.launch, errors);
+  if (launch?.kind === "expo-dev-client" && android.scheme === void 0) {
+    errors.push('config.android.scheme: required when android.launch.kind is "expo-dev-client"');
+  }
 }
 function validateCompanion(path4, companion, errors) {
   if (companion === void 0) return;
@@ -1565,6 +1591,7 @@ function requireString(path4, value, errors) {
 }
 var ANDROID_PACKAGE_RE = /^[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)+$/;
 var ANDROID_ACTIVITY_RE = /^\.?[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)*$/;
+var APP_SCHEME_RE = /^[a-z][a-z0-9+.-]*$/;
 function requireAndroidPackage(path4, value, errors) {
   if (typeof value !== "string" || value.trim() === "") {
     errors.push(`${path4}: required non-empty string`);
@@ -1581,6 +1608,17 @@ function requireAndroidActivity(path4, value, errors) {
   if (!ANDROID_ACTIVITY_RE.test(value))
     errors.push(`${path4}: expected an activity name (e.g. .MainActivity)`);
 }
+function requireAppScheme(path4, value, errors) {
+  if (typeof value !== "string" || value.trim() === "") {
+    errors.push(`${path4}: required non-empty string`);
+    return;
+  }
+  if (!APP_SCHEME_RE.test(value)) {
+    errors.push(
+      `${path4}: expected a valid URL scheme (lowercase letter, then lowercase letters, digits, +, ., or -)`
+    );
+  }
+}
 var ANDROID_INSTRUMENTATION_RE = /^[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)*\/[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)*$/;
 function requireInstrumentationTarget(path4, value, errors) {
   if (typeof value !== "string" || value.trim() === "") {