expo-desktop 0.1.32 → 0.1.34

package/build/common/npm.js

@@ -135,6 +135,9 @@ export function packageManagerExec(packageManager) {
             command = "npx";
             args.push("--yes");
             break;
+        case "yarn":
+            command = "yarn";
+            break;
         case "pnpm":
             command = "pnpm";
             args.push("exec");

package/build/create-app/command.js

@@ -51,6 +51,7 @@ export async function newExpoDesktopProject(args) {
             },
             { value: "bun", label: `Bun${platform === "darwin" ? " (recommended)" : ""}` },
             { value: "pnpm", label: `pnpm${platform === "win32" ? " (recommended)" : ""}` },
+            { value: "yarn", label: "yarn" },
         ],
         initialValue: platform === "darwin" ? "bun" : platform === "win32" ? "pnpm" : "npm",
     });

package/build/create-app/create-expo-desktop-app.js

@@ -1,5 +1,6 @@
 import { log, tasks } from "@clack/prompts";
 import { type } from "arktype";
+import { glob } from "glob";
 import { cyan, green, yellow } from "kleur/colors";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -66,11 +67,13 @@ export async function createExpoDesktopApp({ localDev, name, packageManager, tem
     if (localDev) {
         await addApplyConfigPluginsScript({ projectPath });
     }
+    const bundleEntryFileCandidates = await getBundleEntryFileCandidates({ projectPath });
     await applyConfigPlugins({
         projectRoot: projectPath,
         displayName: name.displayName,
         bundleIdentifier: name.rdns.replaceAll("_", "-"),
         platforms: ["macos", "windows"],
+        bundleEntryFileCandidates,
     });
     console.log(`${green("◆")}  Applied config plugins.\n`);
     title("Improving the macOS app's gitignore file…", { spacing: 1 });
@@ -100,6 +103,30 @@ export async function createExpoDesktopApp({ localDev, name, packageManager, tem
     await improveMetroConfig({ projectPath });
     title("Adding Expo support to the Babel config…", { spacing: 1 });
     await writeBabelConfig({ projectPath });
+    logProjectReady({ cdPath: name.filesafeName, packageManager });
+}
+async function getBundleEntryFileCandidates({ projectPath }) {
+    try {
+        // Seems to order candidates as:
+        // [
+        //   "index.windows.tsx",
+        //   "index.windows.ts",
+        //   "index.windows.jsx",
+        //   "index.windows.js",
+        //   "index.tsx",
+        //   "index.ts",
+        //   "index.jsx",
+        //   "index.js",
+        // ]
+        const candidates = await glob("index?(.windows|.macos|.ios|.android|.native).{ts,tsx,js,jsx}", {
+            cwd: projectPath,
+        });
+        return candidates;
+    }
+    catch (error) {
+        console.warn("Unable to detect an index?(.windows).{ts,tsx,js,jsx} file in the root of the project, so will fall back to a <BundleEntryFile> value to 'index.ts'.", error);
+        return ["index.ts"];
+    }
 }
 async function createExpoApp({ localDev, name, packageManager, versions, }) {
     // `create-expo-app` aggravatingly reconfigures your workspace to use
@@ -118,10 +145,17 @@ async function createExpoApp({ localDev, name, packageManager, versions, }) {
     });
     await gen.next();
     // `npm create` drops flags meant for create-expo-app unless you add `--`; use
-    // `npx --yes` instead to forward args correctly and skip prompts.
+    // `npx --yes` instead to forward args correctly. Pass `--yes` to
+    // create-expo-app for non-interactive template selection; set `CI=true` in the
+    // child env so git-init inside an existing repo is skipped too.
     const command = packageManager === "npm" ? "npx" : packageManager;
+    let packageManagerArgs = ["create", "expo-app@latest"];
+    if (packageManager === "npm")
+        packageManagerArgs = ["--yes", "create-expo-app@latest"];
+    if (packageManager === "yarn")
+        packageManagerArgs = ["create", "expo-app"];
     const args = [
-        ...(packageManager === "npm" ? ["--yes", "create-expo-app"] : ["create", "expo-app"]),
+        ...packageManagerArgs,
         name.filesafeName,
         "--yes",
         "--template",
@@ -138,8 +172,15 @@ async function createExpoApp({ localDev, name, packageManager, versions, }) {
                 args,
                 options: {
                     stdio: "inherit",
-                    // Suppresses npx/npm exec "Ok to proceed?" and similar yes/no prompts.
-                    env: { npm_config_yes: "true" },
+                    env: {
+                        // Suppresses npx/npm exec "Ok to proceed?" and similar yes/no prompts.
+                        npm_config_yes: "true",
+                        // create-expo-app's `--yes` skips template/SDK prompts but not the
+                        // "Skip initializing a new git repository?" confirm when cwd is
+                        // inside an existing repo; that path only auto-skips when CI is set.
+                        // https://github.com/expo/expo/blob/main/packages/create-expo/src/utils/git.ts
+                        CI: "true",
+                    },
                 },
                 debugLogDir: projectPath,
             }),
@@ -287,13 +328,40 @@ async function updatePackageJson({ localDev, name, projectPath, task, versions,
         if (!packageJson.overrides) {
             packageJson.overrides = {};
         }
-        // react-native-macos and react-native-windows may declare conflicting peer
-        // dependency ranges to what the Expo template provides.
-        if (packageJson.dependencies.react) {
-            packageJson.overrides.react = packageJson.dependencies.react;
+        // The "react" version in expo-template-blank-typescript for SDK 54 is
+        // 19.1.0, but it needs to be 19.1.4 to satisfy react-native-macos and
+        // react-native-windows. We find that the React Native HelloWorld template
+        // is more reliable as a source of truth for the best "react" and
+        // "react-native" versions to satisfy them, but it's still a best of a bad
+        // job.
+        let facebookDeps;
+        try {
+            const packageJson = (await getReactNativePackageJson(versions.minor));
+            facebookDeps = {
+                react: packageJson.dependencies.react,
+                "react-native": packageJson.dependencies["react-native"],
+            };
+        }
+        catch (error) {
+            // It's totally possible to get rate-limited by the GitHub API, so we'll
+            // avoid failing the entire command just for a bad fetch here.
+            console.warn(`Unable to get the ideal dependency versions for "react" and "react-native" from the official React Native HelloWorld template, so will use the ones from the Expo template as-is.`, error);
+        }
+        if (facebookDeps) {
+            packageJson.dependencies.react = facebookDeps.react;
+            packageJson.overrides.react = facebookDeps.react;
+            packageJson.dependencies["react-native"] = facebookDeps["react-native"];
+            packageJson.overrides["react-native"] = facebookDeps["react-native"];
         }
-        if (packageJson.dependencies["react-native"]) {
-            packageJson.overrides["react-native"] = packageJson.dependencies["react-native"];
+        else {
+            // react-native-macos and react-native-windows may declare conflicting
+            // peer dependency ranges to what the Expo template provides.
+            if (packageJson.dependencies.react) {
+                packageJson.overrides.react = packageJson.dependencies.react;
+            }
+            if (packageJson.dependencies["react-native"]) {
+                packageJson.overrides["react-native"] = packageJson.dependencies["react-native"];
+            }
         }
     }
     try {
@@ -305,6 +373,10 @@ async function updatePackageJson({ localDev, name, projectPath, task, versions,
     console.log(`${green("◆")}  Altered package.json.\n`);
     return { name: nameBefore };
 }
+async function getReactNativePackageJson(minor) {
+    const response = await fetch(`https://raw.githubusercontent.com/facebook/react-native/refs/heads/0.${minor}-stable/private/helloworld/package.json`);
+    return await response.json();
+}
 async function npmInstall({ asNewWorkspace, cwd, packageManager, }) {
     const command = packageManager;
     const args = ["install"];
@@ -558,6 +630,7 @@ module.exports = function (api) {
  */
 async function addApplyConfigPluginsScript({ projectPath }) {
     await fs.writeFile(path.resolve(projectPath, "apply-config-plugins.mjs"), `
+import { globSync } from "node:fs";
 import { createRequire } from "node:module";
 
 const require = createRequire(import.meta.url);
@@ -572,8 +645,24 @@ const info = {
   bundleIdentifier: "com.example.my-app-123",
   // @ts-expect-error Normally only accepts ios and android
   platforms: ["macos", "windows"],
+  bundleEntryFileCandidates: getBundleEntryFileCandidates({ projectPath: projectRoot }),
 };
 
+function getBundleEntryFileCandidates({ projectPath }) {
+  try {
+    const candidates = globSync("index{.windows,.macos,.ios,.android,.native,}.{ts,tsx,js,jsx}", {
+      cwd: projectPath,
+    });
+    return candidates;
+  } catch (error) {
+    console.warn(
+      "Unable to detect an index?(.windows).{ts,tsx,js,jsx} file in the root of the project, so will fall back to a <BundleEntryFile> value to 'index.ts'.",
+      error,
+    );
+    return ["index.ts"];
+  }
+}
+
 const withInternal = (config, internals) => {
   config._internal = {
     isDebug: false,
@@ -644,3 +733,36 @@ async function applyConfigPlugins(options) {
 await applyConfigPlugins(info);
     `.trim() + "\n", "utf-8");
 }
+function logProjectReady({ cdPath, packageManager, }) {
+    const lines = [
+        "✅ Your project is ready!",
+        "",
+        "To run your project, first navigate to the directory and start up the packager:",
+        "",
+        `- cd ${cdPath}`,
+        `- ${formatRunCommand(packageManager, "start")}`,
+        "",
+        "… and then run the target platform of your choice:",
+        "",
+        `- ${formatRunCommand(packageManager, "android")}`,
+        `- ${formatRunCommand(packageManager, "ios")}`,
+        `- ${formatRunCommand(packageManager, "web")}`,
+        `- ${formatRunCommand(packageManager, "macos")}`,
+        `- ${formatRunCommand(packageManager, "windows")}`,
+        "",
+    ];
+    log.success(lines.join("\n"), { withGuide: false });
+}
+export function formatRunCommand(packageManager, cmd) {
+    switch (packageManager) {
+        case "pnpm":
+            return `pnpm run ${cmd}`;
+        case "yarn":
+            return `yarn ${cmd}`;
+        case "bun":
+            return `bun run ${cmd}`;
+        case "npm":
+        default:
+            return `npm run ${cmd}`;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "Best-effort desktop support for Expo",
   "keywords": [
     "android",
@@ -37,8 +37,8 @@
     "@clack/prompts": "^1.2.0",
     "arktype": "^2.2.0",
     "citty": "^0.2.2",
-    "expo-desktop-config-plugins": "^1.1.29",
-    "expo-desktop-prebuild-config": "^1.0.15",
+    "expo-desktop-config-plugins": "^1.1.31",
+    "expo-desktop-prebuild-config": "^1.0.17",
     "glob": "^10.5.0",
     "kleur": "^4.1.5",
     "mustache": "^4.2.0",