expo-desktop 0.1.20 → 0.1.24

package/build/common/apply-windows-cpp-app-template.js

@@ -224,9 +224,6 @@ async function renameCppAppPathsAsync(windowsRoot, filesafeName) {
         });
         const chosen = candidates[0];
         const newRelWin = cppAppRelativePathTransform(chosen.rel, filesafeName);
-        if (newRelWin === chosen.rel) {
-            throw new Error(`Windows cpp-app rename: expected path containing MyApp to change: "${chosen.rel}"`);
-        }
         const newAbs = path.join(windowsRoot, newRelWin);
         if (newAbs === chosen.abs) {
             continue;

package/build/common/child-process.js

@@ -1,14 +1,15 @@
 import { spawn } from "node:child_process";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { env } from "node:process";
+import process from "node:process";
 import readline from "node:readline";
 import { stripVTControlCharacters } from "node:util";
 /**
  * Clack {@link Task} that runs a subprocess; piped stdout/stderr lines are sent
- * through the task `message` callback (not `log.message`). Lines are also kept in
- * an interleaved buffer; on failure they are written under {@link debugLogDir} or
- * {@link SpawnOptions.cwd} or the current working directory.
+ * through the task `message` callback (not `log.message`). Lines are also kept
+ * in an interleaved buffer; on failure they are written under
+ * {@link debugLogDir} or {@link SpawnOptions.cwd} or the current working
+ * directory.
  */
 export function promisifiedSpawnTask({ title, command, args, options = {}, debugLogDir, }) {
     return {
@@ -16,7 +17,16 @@ export function promisifiedSpawnTask({ title, command, args, options = {}, debug
         task: (message) => runPromisifiedSpawn({
             command,
             args,
-            options,
+            options: {
+                // On Windows, Volta-managed package managers are spawned via .cmd
+                // shims which require shell interpretation. Although I've been having
+                // luck with `shell: false` with Volta-managed package managers on
+                // macOS, I'd rather just go with one consistent approach across all
+                // platforms, and `shell: true` will tend to reduce surprises.
+                // https://github.com/shirakaba/expo-desktop/issues/4
+                shell: true,
+                ...options,
+            },
             logLine: message,
             ...(debugLogDir !== undefined ? { debugLogDir } : {}),
         }),
@@ -29,7 +39,7 @@ function runPromisifiedSpawn({ command, args, options, logLine, debugLogDir, })
         stdio: stdioEffective,
         env: envWithForcedColorIfPiped({ ...options, stdio: stdioEffective }),
     };
-    const cp = spawn(command, args, spawnOptions);
+    const cp = spawn(`${command} ${args.join(" ")}`, spawnOptions);
     /** Interleaved stdout/stderr lines in arrival order (tagged for readability). */
     const lineBuffer = [];
     const pushLine = (stream, line) => {
@@ -129,7 +139,7 @@ function envWithForcedColorIfPiped(options) {
     const stdoutMode = Array.isArray(stdio) ? stdio.at(1) : stdio;
     const stderrMode = Array.isArray(stdio) ? stdio.at(2) : stdio;
     const capturesOutput = stdoutMode !== "inherit" || stderrMode !== "inherit";
-    const base = { ...env, ...options?.env };
+    const base = { ...process.env, ...options?.env };
     if (!capturesOutput || base.NO_COLOR !== undefined) {
         return base;
     }

package/build/common/shescape.js

@@ -0,0 +1,34 @@
+import { Shescape } from "shescape";
+const defaultShell = Symbol("Default shell");
+const shescapes = {};
+export function getShescape(shell) {
+    const resolvedShell = shell ?? defaultShell;
+    if (shescapes[resolvedShell]) {
+        return shescapes[resolvedShell];
+    }
+    const shescapeOptions = {};
+    if (typeof resolvedShell === "string") {
+        shescapeOptions.shell = resolvedShell;
+    }
+    let shescape;
+    try {
+        shescape = new Shescape(shescapeOptions);
+    }
+    catch (cause) {
+        if (!(cause instanceof Error) || cause.message !== "Shescape does not support the shell sh") {
+            throw new Error("Unable to spawn child process due to error being thrown when constructing Shescape instance", { cause });
+        }
+        // Can't escape for the meta-shell `/bin/sh`. Let's try falling back to a
+        // typical Unix shell and hoping for the best.
+        // https://github.com/ericcornelissen/shescape/issues/2009
+        try {
+            shescapeOptions.shell = process.platform === "darwin" ? "zsh" : "bash";
+            shescape = new Shescape(shescapeOptions);
+        }
+        catch (cause) {
+            throw new Error("Unable to spawn child process due to error being thrown when constructing fallback Shescape instance", { cause });
+        }
+    }
+    shescapes[resolvedShell] = shescape;
+    return shescape;
+}

package/build/common/template.js

@@ -14,6 +14,7 @@ import { pathToFileURL } from "node:url";
 import { applyWindowsCppAppTemplateAsync } from "./apply-windows-cpp-app-template.js";
 import { promisifiedSpawnTask } from "./child-process.js";
 import { getTemplateFilesToRenameAsync, renameTemplateAppNameAsync, } from "./rename-template-app-name.js";
+import { getShescape } from "./shescape.js";
 export async function applySelectedTemplatesAsync({ projectRoot, selection, enabledPlatforms, name, respectTemplateConfig, }) {
     const descriptors = getOrderedTemplateDescriptors(selection, enabledPlatforms);
     if (!descriptors.length) {
@@ -112,6 +113,8 @@ function parseTemplateSource(template) {
     return { type: "npm", spec: template };
 }
 async function prepareTemplateSourceAsync(taskTitle, source) {
+    // We make sure there are no spaces in the path so that we don't need to
+    // quote/escape the shell command.
     const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), "expo-desktop-template-"));
     const archivePath = path.join(tempRoot, "template.tgz");
     switch (source.type) {
@@ -119,6 +122,8 @@ async function prepareTemplateSourceAsync(taskTitle, source) {
             await fs.copyFile(source.path, archivePath);
             break;
         case "github": {
+            // Don't think it's possible to have spaces in the owner/repo/ref, so no
+            // percent-encoding or quoting needed.
             const tarballUrl = `https://codeload.github.com/${source.owner}/${source.repo}/tar.gz/${source.ref}`;
             const response = await fetch(tarballUrl);
             if (!response.ok || !response.body) {
@@ -129,11 +134,12 @@ async function prepareTemplateSourceAsync(taskTitle, source) {
             break;
         }
         case "npm": {
+            const shescape = getShescape();
             await tasks([
                 promisifiedSpawnTask({
                     title: `npm pack (${source.spec})`,
                     command: "npm",
-                    args: ["pack", source.spec, "--silent"],
+                    args: ["pack", shescape.quote(source.spec), "--silent"],
                     options: { cwd: tempRoot },
                 }),
             ]);

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

@@ -272,6 +272,9 @@ async function updatePackageJson({ localDev, name, projectPath, task, versions,
             ["expo-desktop-stubs"]: `^${versions.expoMajor}.0.0`,
         };
         for (const [key, value] of Object.entries(monorepoDeps)) {
+            // TODO: Try replacing this `localDev` logic with `linkWorkspacePackages`:
+            // - https://pnpm.io/workspaces#linkworkspacepackages
+            // - https://pnpm.io/workspaces#workspace-protocol-workspace
             packageJson.dependencies[key] = localDev ? `file:../../${key}` : value;
         }
         packageJson.dependencies["react-native-macos"] = versions.macos;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "0.1.20",
+  "version": "0.1.24",
   "description": "Best-effort desktop support for Expo",
   "keywords": [
     "android",
@@ -37,12 +37,13 @@
     "@clack/prompts": "^1.2.0",
     "arktype": "^2.2.0",
     "citty": "^0.2.2",
+    "expo-desktop-config-plugins": "^1.1.22",
+    "expo-desktop-prebuild-config": "^1.0.11",
     "glob": "^10.5.0",
     "kleur": "^4.1.5",
     "mustache": "^4.2.0",
-    "toml": "^4.1.1",
-    "expo-desktop-config-plugins": "1.1.20",
-    "expo-desktop-prebuild-config": "1.0.9"
+    "shescape": "^2.1.12",
+    "toml": "^4.1.1"
   },
   "devDependencies": {
     "@expo/config": "^12.0.13",