expo-desktop 0.1.23 → 0.1.25

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

@@ -30,7 +30,7 @@ export async function applyWindowsCppAppTemplateAsync(projectRoot, name) {
     const replacements = await buildReplacementsRecord(projectRoot, name);
     await renameCppAppPathsAsync(windowsRoot, name.filesafeName);
     await renderMustacheUnderWindowsAsync(windowsRoot, replacements);
-    await finalizeWindowsCppTemplateArtifacts(projectRoot, windowsRoot);
+    await finalizeWindowsCppTemplateArtifacts(projectRoot);
 }
 async function looksLikeCppAppTemplateAsync(windowsRoot) {
     try {
@@ -128,19 +128,33 @@ async function buildReplacementsRecord(projectRoot, name) {
         autolinkCppPackageProviders: "\n UNREFERENCED_PARAMETER(packageProviders);",
     };
 }
-function cppAppRelativePathTransform(relativeToWindows, filesafeName) {
-    const parts = relativeToWindows.split(/[/\\]/);
-    const base = parts.at(-1) ?? "";
-    if (base === "_gitignore") {
-        parts[parts.length - 1] = ".gitignore";
-    }
-    else if (base === "NuGet_Config") {
-        parts[parts.length - 1] = "NuGet.config";
+/** Placeholder app name baked into the react-native-windows cpp-app template. */
+const TEMPLATE_APP_NAME_PLACEHOLDER = "MyApp";
+/**
+ * Basenames in the cpp-app template that need a one-shot literal rename
+ * (independent of any `MyApp` substitution).
+ */
+const SPECIAL_BASENAME_RENAMES = {
+    _gitignore: ".gitignore",
+    NuGet_Config: "NuGet.config",
+};
+/**
+ * Returns the renamed basename for one entry in the cpp-app template, applying
+ * (in order):
+ *
+ * 1. {@link SPECIAL_BASENAME_RENAMES} (e.g. `_gitignore` → `.gitignore`).
+ * 2. `MyApp` → {@link filesafeName}, anywhere in the basename.
+ *
+ * If the user's `filesafeName` happens to equal `"MyApp"`, step (2) is a no-op
+ * (avoids degenerate self-renames that previously hung
+ * `renameCppAppPathsAsync`).
+ */
+function renameTemplateBasename(basename, filesafeName) {
+    const renamed = SPECIAL_BASENAME_RENAMES[basename] ?? basename;
+    if (filesafeName === TEMPLATE_APP_NAME_PLACEHOLDER) {
+        return renamed;
     }
-    return parts.join(path.sep).split("MyApp").join(filesafeName);
-}
-function pathDepth(p) {
-    return p.split(path.sep).filter(Boolean).length;
+    return renamed.split(TEMPLATE_APP_NAME_PLACEHOLDER).join(filesafeName);
 }
 async function collectWindowsPathsAsync(windowsRoot) {
     const out = [];
@@ -173,72 +187,46 @@ async function collectWindowsPathsAsync(windowsRoot) {
     return out;
 }
 /**
- * Renames cpp-app paths containing `MyApp` → filesafeName. Uses iterative
- * shallow-first ordering (directories before files at the same depth). Deeper
- * fixes caused ENOTEMPTY: files were renamed into `*.Package/Images` before the
- * directory `MyApp.Package/Images` moved, leaving a non-empty destination.
+ * Walks `windowsRoot` pre-order (parents before children), renaming each entry
+ * by its basename via {@link renameTemplateBasename}:
+ *
+ * - `MyApp` (anywhere in the basename) → `filesafeName`
+ * - `_gitignore` → `.gitignore`
+ * - `NuGet_Config` → `NuGet.config`
+ *
+ * Pre-order is essential. `fs.rename()` atomically moves an entire directory
+ * subtree, so renaming a parent like `MyApp.Package` → `YourApp.Package`
+ * already relocates everything beneath it. A bottom-up order would risk
+ * `ENOTEMPTY` when the parent later tries to overwrite a non-empty
+ * destination.
+ *
+ * Symlinks are skipped to avoid escaping the template tree. Empty directories
+ * are handled naturally — `readdir` simply returns no children.
  */
 async function renameCppAppPathsAsync(windowsRoot, filesafeName) {
-    for (;;) {
-        const allPaths = await collectWindowsPathsAsync(windowsRoot);
-        const candidates = [];
-        for (const abs of allPaths) {
-            const rel = path.relative(windowsRoot, abs);
-            if (!rel || rel.includes("..")) {
+    async function walk(dir) {
+        const entries = await fs.readdir(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.isSymbolicLink()) {
                 continue;
             }
-            if (!rel.includes("MyApp")) {
-                continue;
-            }
-            let stat;
-            try {
-                stat = await fs.lstat(abs);
-            }
-            catch (error) {
-                if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") {
-                    throw error;
+            const sourcePath = path.join(dir, entry.name);
+            const newBasename = renameTemplateBasename(entry.name, filesafeName);
+            const targetPath = newBasename === entry.name ? sourcePath : path.join(dir, newBasename);
+            if (targetPath !== sourcePath) {
+                try {
+                    await fs.rename(sourcePath, targetPath);
+                }
+                catch (cause) {
+                    throw new Error(`Failed to rename "${sourcePath}" → "${targetPath}"`, { cause });
                 }
-                continue;
-            }
-            if (stat.isSymbolicLink()) {
-                continue;
-            }
-            candidates.push({
-                abs,
-                rel,
-                depth: pathDepth(rel),
-                isDir: stat.isDirectory(),
-            });
-        }
-        if (!candidates.length) {
-            break;
-        }
-        candidates.sort((a, b) => {
-            if (a.depth !== b.depth) {
-                return a.depth - b.depth;
             }
-            if (a.isDir !== b.isDir) {
-                return a.isDir ? -1 : 1;
+            if (entry.isDirectory()) {
+                await walk(targetPath);
             }
-            return a.rel.localeCompare(b.rel);
-        });
-        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;
-        }
-        await fs.mkdir(path.dirname(newAbs), { recursive: true });
-        try {
-            await fs.rename(chosen.abs, newAbs);
-        }
-        catch (cause) {
-            throw new Error(`Failed to rename "${chosen.abs}" -> "${newAbs}"`, { cause });
         }
     }
+    await walk(windowsRoot);
 }
 const BINARY_EXTENSIONS = new Set([
     ".png",
@@ -311,17 +299,7 @@ async function renderMustacheUnderWindowsAsync(windowsRoot, view) {
         }
     }));
 }
-async function finalizeWindowsCppTemplateArtifacts(projectRoot, windowsRoot) {
-    const gitignoreRelPaths = await glob("**/_gitignore", {
-        cwd: windowsRoot,
-        nodir: true,
-        dot: true,
-    });
-    for (const rel of gitignoreRelPaths.sort().reverse()) {
-        const fromAbs = path.join(windowsRoot, rel);
-        const toAbs = path.join(windowsRoot, path.dirname(rel), ".gitignore");
-        await renameIfExistsPreferDest(fromAbs, toAbs);
-    }
+async function finalizeWindowsCppTemplateArtifacts(projectRoot) {
     await renameIfExistsPreferDest(path.join(projectRoot, "NuGet_Config"), path.join(projectRoot, "NuGet.config"));
     const version = packageJson.version;
     const banner = `<!-- This project was created with expo-desktop ${version} -->`;

package/build/common/child-process.js

@@ -39,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) => {

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 },
                 }),
             ]);
@@ -149,7 +155,11 @@ async function prepareTemplateSourceAsync(taskTitle, source) {
     await tasks([
         promisifiedSpawnTask({
             title: taskTitle,
-            command: "tar",
+            // The paths are Windows-style paths rather than POSIX, so make sure to
+            // select Windows tar rather than GNU tar (which may be on path, even when
+            // invoking from cmd.exe, due to having git bash installed).
+            // tar C:\Users\Jamie\AppData\Local\Temp\expo-desktop-template-Uf1F1B\template.tgz -C C:\Users\Jamie\AppData\Local\Temp\expo-desktop-template-Uf1F1B
+            command: process.platform === "win32" ? "C:\\Windows\\System32\\tar.exe" : "tar",
             args: ["-xzf", archivePath, "-C", tempRoot],
         }),
     ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Best-effort desktop support for Expo",
   "keywords": [
     "android",
@@ -42,6 +42,7 @@
     "glob": "^10.5.0",
     "kleur": "^4.1.5",
     "mustache": "^4.2.0",
+    "shescape": "^2.1.12",
     "toml": "^4.1.1"
   },
   "devDependencies": {