expo-desktop 0.1.32 → 0.1.33

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 });
@@ -101,6 +104,29 @@ export async function createExpoDesktopApp({ localDev, name, packageManager, tem
     title("Adding Expo support to the Babel config…", { spacing: 1 });
     await writeBabelConfig({ projectPath });
 }
+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
     // `nodeLinker: hoisted`, which sucks when creating sample projects inside
@@ -118,7 +144,9 @@ 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;
     const args = [
         ...(packageManager === "npm" ? ["--yes", "create-expo-app"] : ["create", "expo-app"]),
@@ -138,8 +166,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,
             }),
@@ -558,6 +593,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 +608,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "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.30",
+    "expo-desktop-prebuild-config": "^1.0.16",
     "glob": "^10.5.0",
     "kleur": "^4.1.5",
     "mustache": "^4.2.0",