expo-desktop 0.1.18 → 0.1.19

package/build/cli.js

@@ -23,6 +23,11 @@ const main = defineCommand({
                     description: `The ${kleur.bold("display name")} for the app ${grey("(Examples: 'My App 123', '俺のアプリ')")}`,
                     valueHint: "name",
                 },
+                "local-dev": {
+                    type: "boolean",
+                    description: "An undocumented switch for use during development to skip the questionnaire.",
+                    hidden: true,
+                },
                 rdns: {
                     type: "string",
                     description: `The ${kleur.bold("reverse DNS")} for the app ${grey("(Example: 'com.example.my-app-123')")}`,

package/build/common/preserve-file.js

@@ -0,0 +1,13 @@
+import fs from "node:fs/promises";
+/**
+ * Read the state of a file on first call of the generator, then run the
+ * generator again to restore it back to that value that was read.
+ */
+export async function* preserveFile({ filePath, enable, }) {
+    if (!enable) {
+        return;
+    }
+    const fileBefore = await fs.readFile(filePath, "utf-8");
+    yield;
+    await fs.writeFile(filePath, fileBefore, "utf-8");
+}

package/build/create-app/command.js

@@ -3,20 +3,21 @@ import { default as kleur } from "kleur";
 import { green, grey } from "kleur/colors";
 import { platform } from "node:process";
 import { title } from "../common/clack.js";
-import { createExpoDesktopApp, localDev } from "./create-expo-desktop-app.js";
+import { createExpoDesktopApp } from "./create-expo-desktop-app.js";
 import { previewFileTree } from "./preview-file-tree.js";
 import { promptForVersion } from "./prompt-for-version.js";
 export async function newExpoDesktopProject(args) {
-    // A dev-time switch for skipping the questions
-    const skip = localDev;
-    if (skip) {
+    // A switch for skipping the questions
+    const localDev = args["local-dev"];
+    if (localDev) {
         await createExpoDesktopApp({
+            localDev,
             name: {
                 displayName: "Your App Display Name",
                 filesafeName: "YourApp456",
                 rdns: "uk.co.birchlabs.your-app-456",
             },
-            packageManager: "bun",
+            packageManager: "pnpm",
             templates: {
                 template: args.template,
                 "template-ios": args["template-ios"],
@@ -57,6 +58,7 @@ export async function newExpoDesktopProject(args) {
         process.exit(0);
     }
     await createExpoDesktopApp({
+        localDev,
         name,
         packageManager,
         versions,

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

@@ -11,18 +11,10 @@ import { makePrettySummary } from "../common/arktype.js";
 import { promisifiedSpawnTask, SPAWN_DEBUG_LOG_GLOB } from "../common/child-process.js";
 import { title } from "../common/clack.js";
 import { packageManagerExec } from "../common/npm.js";
+import { preserveFile } from "../common/preserve-file.js";
 import { applySelectedTemplatesAsync } from "../common/template.js";
-/**
- * A crude switch to use to help with local development.
- *
- * - Skips the questionnaire at the start.
- * - Installs the local copy of expo-desktop-config-plugins rather than pinning
- *   to a published release.
- * - Adds the apply-config-plugins.mjs script.
- */
-export const localDev = false;
-export async function createExpoDesktopApp({ name, packageManager, templates, versions, }) {
-    const { projectPath } = await createExpoApp({ name, packageManager, versions });
+export async function createExpoDesktopApp({ localDev, name, packageManager, templates, versions, }) {
+    const { projectPath } = await createExpoApp({ localDev, name, packageManager, versions });
     await appendRootGitignoreSpawnDebugLogs(projectPath);
     const templateSelection = {
         // https://github.com/expo/expo/blob/sdk-54/templates/expo-template-blank-typescript
@@ -54,13 +46,14 @@ export async function createExpoDesktopApp({ name, packageManager, templates, ve
     await updateAppJson({ name, projectPath });
     title("Altering package.json…", { spacing: 1 });
     const { name: packageJsonName } = await updatePackageJson({
+        localDev,
         name,
         projectPath,
         versions,
         task: { type: "create" },
     });
     title("Installing dependencies…", { spacing: 1 });
-    await npmInstall({ cwd: projectPath, packageManager });
+    await npmInstall({ asNewWorkspace: true, cwd: projectPath, packageManager });
     await updatePackageJson({
         name,
         projectPath,
@@ -100,7 +93,22 @@ export async function createExpoDesktopApp({ name, packageManager, templates, ve
     await writeBabelConfig({ projectPath });
     // TODO: Set up Windows app.cpp entrypoint
 }
-async function createExpoApp({ name, packageManager, versions, }) {
+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
+    // this monorepo during local dev (even with `--no-install`). So we fight
+    // back.
+    //
+    // For non-local dev, it sounds like we can use `nodeLinker: isolated` as of
+    // Expo SDK 54, so I'm tempted to enforce that in created templates, too. But
+    // one thing at a time.
+    // - https://docs.expo.dev/more/create-expo/#pnpm
+    // - https://github.com/expo/expo/blob/222b3b12610d69784bab6c5a188a46ea388f866a/packages/create-expo/src/resolvePackageManager.ts#L109
+    const gen = preserveFile({
+        enable: localDev,
+        filePath: localDev ? path.resolve(import.meta.dirname, "../../../../pnpm-workspace.yaml") : "",
+    });
+    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.
     const command = packageManager === "npm" ? "npx" : packageManager;
@@ -133,6 +141,9 @@ async function createExpoApp({ name, packageManager, versions, }) {
         log.error(`Error running ${yellow("create expo-app")}${error instanceof Error ? `: ${error.message}` : "."}`);
         process.exit(1);
     }
+    finally {
+        await gen.next();
+    }
     return { projectPath };
 }
 async function appendRootGitignoreSpawnDebugLogs(projectPath) {
@@ -209,7 +220,7 @@ async function updateAppJson({ name, projectPath, }) {
     }
     console.log(`${green("◆")}  Altered app.json.\n`);
 }
-async function updatePackageJson({ name, projectPath, task, versions, }) {
+async function updatePackageJson({ localDev, name, projectPath, task, versions, }) {
     const packageJsonPath = path.resolve(projectPath, "package.json");
     let packageJson;
     try {
@@ -281,10 +292,41 @@ async function updatePackageJson({ name, projectPath, task, versions, }) {
     console.log(`${green("◆")}  Altered package.json.\n`);
     return { name: nameBefore };
 }
-async function npmInstall({ cwd, packageManager, }) {
+async function npmInstall({ asNewWorkspace, cwd, packageManager, }) {
     const command = packageManager;
     const args = ["install"];
     console.log(`${cyan("◆")}  Running: ${yellow(`${command} ${args.join(" ")}`)}\n`);
+    // Unlike npm and bun, pnpm climbs up to install dependencies in the closest
+    // ancestor directory if there is one. This is particularly inconvenient
+    // during local dev when we're creating samples inside the monorepo.
+    if (asNewWorkspace && packageManager === "pnpm") {
+        // (1) Ensure a file name pnpm-workspace.yaml exists.
+        //
+        // (2) Also ensure that it uses nodeLinker: hoisted, as otherwise
+        // `:path => "#{config[:reactNativePath]}-macos"` predicts that there will
+        // be a react-native-macos directory right beside the react-native
+        // directory by just optimistically appending "-macos" on the end, like so:
+        // "../node_modules/.pnpm/react-native@0.81.5_@babel+core@7.29.0_@react-native-community+cli@20.1.3_typescript@5._941d99d35895d1a3626e14fd9f3b3666/node_modules/react-native" + "-macos"
+        //
+        //     As this is not true with pnpm's default `nodeLinker: isolated`, we
+        //     need to stick to `nodeLinker: hoisted` until we can rewrite the
+        //     Podfile script to resolve it properly.
+        //
+        //     This is consistent with what the Expo team do for pnpm and yarn:
+        //     - https://docs.expo.dev/more/create-expo/#pnpm
+        //     - https://github.com/expo/expo/blob/222b3b12610d69784bab6c5a188a46ea388f866a/packages/create-expo/src/resolvePackageManager.ts#L109
+        try {
+            await fs.writeFile(path.resolve(cwd, "pnpm-workspace.yaml"), "nodeLinker: hoisted\n", {
+                flag: "wx",
+                encoding: "utf-8",
+            });
+        }
+        catch (error) {
+            if (!(error instanceof Error) || !("code" in error) || error.code !== "EEXIST") {
+                throw error;
+            }
+        }
+    }
     try {
         await tasks([
             promisifiedSpawnTask({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "Best-effort desktop support for Expo",
   "keywords": [
     "android",
@@ -41,8 +41,8 @@
     "kleur": "^4.1.5",
     "mustache": "^4.2.0",
     "toml": "^4.1.1",
-    "expo-desktop-config-plugins": "1.1.18",
-    "expo-desktop-prebuild-config": "1.0.7"
+    "expo-desktop-config-plugins": "1.1.19",
+    "expo-desktop-prebuild-config": "1.0.8"
   },
   "devDependencies": {
     "@expo/config": "^12.0.13",