expo-desktop 0.1.29 → 0.1.31

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

@@ -98,7 +98,6 @@ export async function createExpoDesktopApp({ localDev, name, packageManager, tem
     }
     title("Adding Expo support to the Metro config…", { spacing: 1 });
     await improveMetroConfig({ projectPath });
-    await addWindowsExpoPolyfill({ projectPath });
     title("Adding Expo support to the Babel config…", { spacing: 1 });
     await writeBabelConfig({ projectPath });
 }
@@ -472,17 +471,6 @@ const { getDefaultConfig } = require("@expo/metro-config");
 const { makeMetroConfig } = require("@rnx-kit/metro-config");
 
 const config = makeMetroConfig(getDefaultConfig(__dirname));
-
-const getPolyfills = config.serializer.getPolyfills;
-const windowsExpoPolyfill = require.resolve("./expo-polyfill.windows.js");
-config.serializer.getPolyfills = (...args) => {
-  const polyfills = getPolyfills(...args);
-  if (args[0].platform === "windows") {
-    polyfills.push(windowsExpoPolyfill);
-  }
-  return polyfills;
-};
-
 module.exports = config;
     `.trim() + "\n", "utf-8");
     }
@@ -492,69 +480,6 @@ module.exports = config;
     }
     console.log(`\n${green("◆")}  Overwrote metro.config.js.\n`);
 }
-/**
- */
-async function addWindowsExpoPolyfill({ projectPath }) {
-    await fs.writeFile(path.resolve(projectPath, "expo-polyfill.windows.js"), `
-try {
-  // Until we can configure TurboModules for eager initialisation (which is
-  // waiting on https://github.com/microsoft/react-native-windows/pull/16093), we
-  // need to trigger the lazy-init of our TurboModule by accessing it for the
-  // first time, which causes the TurboModuleManager to call its REACT_INIT
-  // method.
-  //
-  // We can't do any imports inside getPolyfills(), but can use the global proxy:
-  globalThis.nativeModuleProxy.ExpoMainRuntimeInstaller;
-
-  // TODO: Implement Expo's NativeModulesProxy and make all of this
-  //       lazy-initialised (and actually populate \`exportedMethods\`, etc.).
-
-  // Below are temporary stubs to suppress these warnings:
-  //  WARN  The "EXNativeModulesProxy" native module is not exported through NativeModules; verify that expo-modules-core's native code is linked properly
-  //  WARN  No native ExponentConstants module found, are you sure the expo-constants's module is linked properly?
-  //  WARN  No native ExponentConstants module found, are you sure the expo-constants's module is linked properly?
-
-  // Funnily enough, although expo-modules-core prefers to access
-  // global.expo?.modules?.NativeModulesProxy over the deprecated
-  // NativeModules?.NativeUnimoduleProxy, we still need the latter to exist in
-  // order for it to check the former. And it's only
-  globalThis.nativeModuleProxy.NativeUnimoduleProxy;
-  const { ExpoAsset } = globalThis.nativeModuleProxy;
-
-  const ExponentConstants = {};
-
-  globalThis.expo.modules = {
-    ExpoAsset,
-    ExponentConstants,
-    // - JS: apps/demo/node_modules/expo-modules-core/src/NativeModulesProxy.native.ts
-    // - iOS:
-    //   - NativeUnimoduleProxy: apps/demo/node_modules/expo-modules-core/ios/Legacy/NativeModulesProxy/NativeModulesProxyModule.swift
-    //   - NativeModulesProxy: apps/demo/node_modules/expo-modules-core/ios/Legacy/NativeModulesProxy/EXNativeModulesProxy.mm
-    // - Android:
-    //   - NativeUnimoduleProxy: apps/demo/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java
-    //   - NativeModulesProxy: apps/demo/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/defaultmodules/NativeModulesProxyModule.kt
-    NativeModulesProxy: {
-      exportedMethods: {
-        ExpoAsset: [],
-        ExponentConstants: [],
-      },
-      modulesConstants: {
-        ExpoAsset: [],
-        ExponentConstants: [],
-      },
-    },
-  };
-
-  // Now expo-modules-core can populate its fileprivate
-  // \`const NativeModulesProxy: Record<string, ProxyNativeModule = {}\` from our
-  // global.expo?.modules?.NativeModulesProxy. This avoids the warning about
-  // EXNativeModulesProxy being missing.
-} catch (error) {
-  console.error("Polyfill failed", error);
-  throw error;
-}
-    `.trim() + "\n", "utf-8");
-}
 async function updatePodfile({ projectPath }) {
     const appJsonPath = path.resolve(projectPath, "macos/Podfile");
     let contents;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "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.27",
-    "expo-desktop-prebuild-config": "^1.0.13",
+    "expo-desktop-config-plugins": "^1.1.28",
+    "expo-desktop-prebuild-config": "^1.0.14",
     "glob": "^10.5.0",
     "kleur": "^4.1.5",
     "mustache": "^4.2.0",