expo-desktop 0.1.28 → 0.1.30

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);
+    await finalizeWindowsCppTemplateArtifacts(projectRoot, replacements);
 }
 async function looksLikeCppAppTemplateAsync(windowsRoot) {
     try {
@@ -278,29 +278,49 @@ async function renderMustacheUnderWindowsAsync(windowsRoot, view) {
         if (isProbablyBinaryFile(absoluteFilePath)) {
             return;
         }
-        let content;
-        try {
-            content = await fs.readFile(absoluteFilePath, "utf8");
-        }
-        catch (error) {
-            if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") {
-                throw error;
-            }
-            return;
-        }
-        if (!content.includes("{{")) {
-            return;
-        }
-        const useCRLF = content.includes("\r\n");
-        const adjustedView = adjustReplacementStringsForLineEndings(view, useCRLF);
-        const rendered = mustache.render(content, adjustedView);
-        if (rendered !== content) {
-            await fs.writeFile(absoluteFilePath, rendered, "utf8");
-        }
+        await renderMustacheInFileIfNeeded(absoluteFilePath, view);
     }));
 }
-async function finalizeWindowsCppTemplateArtifacts(projectRoot) {
+/**
+ * Render mustache tags inside `filePath` in place, mirroring the behaviour of
+ * react-native-windows' generator-common `resolveContents()`. Skips files that
+ * don't exist, files that don't contain any `{{` (no-op fast path), and
+ * preserves the file's existing line endings (LF vs CRLF).
+ *
+ * @see https://github.com/microsoft/react-native-windows/blob/main/packages/%40react-native-windows/cli/src/generator-common/index.ts
+ */
+async function renderMustacheInFileIfNeeded(filePath, view) {
+    let content;
+    try {
+        content = await fs.readFile(filePath, "utf8");
+    }
+    catch (error) {
+        if (!(error instanceof Error) || !("code" in error) || error.code !== "ENOENT") {
+            throw error;
+        }
+        return;
+    }
+    if (!content.includes("{{")) {
+        return;
+    }
+    const useCRLF = content.includes("\r\n");
+    const adjustedView = adjustReplacementStringsForLineEndings(view, useCRLF);
+    const rendered = mustache.render(content, adjustedView);
+    if (rendered !== content) {
+        await fs.writeFile(filePath, rendered, "utf8");
+    }
+}
+async function finalizeWindowsCppTemplateArtifacts(projectRoot, view) {
     await renameIfExistsPreferDest(path.join(projectRoot, "NuGet_Config"), path.join(projectRoot, "NuGet.config"));
+    // The cpp-app template places NuGet_Config (renamed to NuGet.config above) at
+    // the project root rather than under windows/, so renderMustacheUnderWindowsAsync
+    // skips it. Render its mustache tags here so that sections like
+    // {{#addReactNativePublicAdoFeed}}…{{/addReactNativePublicAdoFeed}} don't leak
+    // into the final config and trip up NuGet restore (which manifests downstream
+    // as MIDL2025 "syntax error near 'namespace'" in libraries' .idl files,
+    // missing `CppWinRTIncludes.h`, and `EntryPointExe '<App>.exe' was not found`
+    // packaging errors).
+    await renderMustacheInFileIfNeeded(path.join(projectRoot, "NuGet.config"), view);
     const version = packageJson.version;
     const banner = `<!-- This project was created with expo-desktop ${version} -->`;
     const reactNativeWindowsBanner = /<!--\s*This project was created with react-native-windows[^\n\r]*-->/g;

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

@@ -475,9 +475,9 @@ const config = makeMetroConfig(getDefaultConfig(__dirname));
 
 const getPolyfills = config.serializer.getPolyfills;
 const windowsExpoPolyfill = require.resolve("./expo-polyfill.windows.js");
-config.serializer.getPolyfills = ({ platform }) => {
-  const polyfills = getPolyfills(platform);
-  if (platform === "windows") {
+config.serializer.getPolyfills = (...args) => {
+  const polyfills = getPolyfills(...args);
+  if (args[0].platform === "windows") {
     polyfills.push(windowsExpoPolyfill);
   }
   return polyfills;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "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.25",
-    "expo-desktop-prebuild-config": "^1.0.12",
+    "expo-desktop-config-plugins": "^1.1.27",
+    "expo-desktop-prebuild-config": "^1.0.13",
     "glob": "^10.5.0",
     "kleur": "^4.1.5",
     "mustache": "^4.2.0",