expo-desktop 1.0.0-beta.8 → 1.0.0

package/build/cli.js

@@ -141,9 +141,10 @@ const main = defineCommand({
                             type: "boolean",
                             description: "Skip starting the Metro bundler",
                         },
-                        "no-background": {
+                        background: {
                             type: "boolean",
-                            description: "Launch the macOS app in the foreground",
+                            description: "Launch the macOS app in the background instead of the foreground",
+                            default: false,
                         },
                         "no-single-instance": {
                             type: "boolean",
@@ -180,7 +181,6 @@ const main = defineCommand({
                         parseNoArg(args, "no-build-cache");
                         parseNoArg(args, "no-install");
                         parseNoArg(args, "no-bundler");
-                        parseNoArg(args, "no-background");
                         parseNoArg(args, "no-single-instance");
                         (await import("./run/macos/command.js")).run(args);
                     },

package/build/common/expo/template.js

@@ -21,7 +21,7 @@ import { env } from "./env.js";
 import { downloadAndExtractGitHubRepositoryAsync } from "./github.js";
 import { Log } from "./log.js";
 import { applyBetaTag, applyKnownNpmPackageNameRules, downloadAndExtractNpmModuleAsync, getResolvedTemplateName, } from "./npm.js";
-import { formatRunCommand, formatSelfCommand } from "./resolve-package-manager.js";
+import { formatRunCommand } from "./resolve-package-manager.js";
 import * as Template from "./template.js";
 const require = createRequire(import.meta.url);
 const JsonFile = require("@expo/json-file").default;
@@ -637,7 +637,7 @@ export function logProjectReady({ cdPath, packageManager, }) {
         console.log(`Before you can run desktop platforms (with ${exampleMacos} or ${exampleWindows}), you need to generate a ${chalk.bold("development build")} as follows:`);
         console.log();
     }
-    console.log(`${cdPath ? "- " : ""}${chalk.bold(`${formatSelfCommand(packageManager)} prebuild`)} `);
+    console.log(`${cdPath ? "- " : ""}${chalk.bold(`node --run prebuild`)} `);
     // console.log(`- ${chalk.bold(formatRunCommand(packageManager, "android"))}`);
     // const iOSComment = isMacOS
     //   ? ""

package/build/prebuild/update-from-template-async.js

@@ -80,7 +80,7 @@ export async function cloneTemplateAndCopyToProjectAsync({ projectRoot, template
         // On subsequent prebuilds, the same properties get updated via config
         // plugins (by modifying the XML trees of the wapproj, vcxproj,
         // appxManifest, sln, etc.) in withExpoDesktop().
-        // packages/expo-desktop-config-plugins/src/plugins/with-expo-desktop.js
+        // packages/expo-desktop-config-plugins/src/plugins/with-expo/with-expo-desktop.js
         const windowsTemplateStrings = getWindowsTemplateStrings({
             name,
             packageGuid,

package/build/run/macos/command.js

@@ -14,7 +14,7 @@ export async function run(args) {
         install: !args["no-install"],
         buildCache: !args["no-build-cache"],
         bundler: !args["no-bundler"],
-        background: !args["no-background"],
+        background: args.background ?? false,
         singleInstance: !args["no-single-instance"],
         ...(args.scheme !== undefined ? { scheme: args.scheme } : {}),
         ...(args.binary !== undefined ? { binary: args.binary } : {}),

package/build/run/macos/launchApp.js

@@ -12,9 +12,6 @@ export async function launchAppAsync(binaryPath, _manager, props) {
     if (props.device.osType !== "macOS") {
         throw new Error("Unexpected non-macOS device while launching a macOS app.");
     }
-    if (props.singleInstance) {
-        await waitForExistingInstancesToTerminateAsync(props.bundleId);
-    }
     const args = [
         ...(props.background ? ["--background"] : []),
         ...(!props.singleInstance ? ["--new"] : []),
@@ -33,7 +30,7 @@ export async function launchAppAsync(binaryPath, _manager, props) {
         throw error;
     }
 }
-async function waitForExistingInstancesToTerminateAsync(bundleId) {
+export async function waitForExistingInstancesToTerminateAsync(bundleId) {
     const scriptPath = fileURLToPath(new URL("../../../scripts/terminateApp.jxa.js", import.meta.url));
     const spinner = ora(`waiting for app ${bundleId} to terminate...`).start();
     try {

package/build/run/macos/runMacosAsync.js

@@ -15,7 +15,7 @@ import { ensureNativeProjectAsync } from "./ensureNativeProject.js";
 import { resolveBuildCache, uploadBuildCache, } from "./expo/build-cache-providers/build-cache-providers.js";
 import { exportEagerAsync } from "./expo/exportEager.js";
 import { getSchemesForMacosAsync } from "./expo/scheme.js";
-import { getLaunchInfoForBinaryAsync, launchAppAsync } from "./launchApp.js";
+import { getLaunchInfoForBinaryAsync, launchAppAsync, waitForExistingInstancesToTerminateAsync, } from "./launchApp.js";
 import { resolveOptionsAsync } from "./options/resolveOptions.js";
 import * as XcodeBuild from "./XcodeBuild.js";
 export async function runMacosAsync(projectRoot, options) {
@@ -119,6 +119,11 @@ export async function runMacosAsync(projectRoot, options) {
     }
     const launchInfo = await getLaunchInfoForBinaryAsync(binaryPath);
     const isCustomBinary = !!options.binary;
+    const singleInstance = options.singleInstance ?? true;
+    // Finish the termination spinner before Metro takes over terminal output.
+    if (singleInstance) {
+        await waitForExistingInstancesToTerminateAsync(launchInfo.bundleId);
+    }
     // Start the dev server which creates all of the required info for launching
     // the app on the host device.
     const manager = await startBundlerAsync(projectRoot, {
@@ -137,9 +142,8 @@ export async function runMacosAsync(projectRoot, options) {
         isSimulator: false,
         device: props.device,
         shouldStartBundler: props.shouldStartBundler,
-        background: options.background ?? true,
-        singleInstance: options.singleInstance ?? true,
-        bundleId: launchInfo.bundleId,
+        background: options.background ?? false,
+        singleInstance,
     });
     // Log the location of the JS logs for the host device.
     if (props.shouldStartBundler) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0",
   "description": "Best-effort desktop support for Expo",
   "keywords": [
     "android",
@@ -52,8 +52,8 @@
     "chalk": "^4.1.2",
     "citty": "^0.2.2",
     "debug": "^4.4.3",
-    "expo-desktop-config-plugins": "^1.2.0-beta.1",
-    "expo-desktop-prebuild-config": "^1.1.0-beta.2",
+    "expo-desktop-config-plugins": "^1.2.0",
+    "expo-desktop-prebuild-config": "^1.1.0",
     "getenv": "^2.0.0",
     "glob": "^10.5.0",
     "kleur": "^4.1.5",