expo-desktop 0.1.19 → 0.1.23

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 } : {}),
         }),
@@ -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/create-app/create-expo-desktop-app.js

@@ -87,11 +87,20 @@ export async function createExpoDesktopApp({ localDev, name, packageManager, tem
         title("Installing Cocoapods for the macOS app…", { spacing: 1 });
         await podInstall({ projectPath, type: "macos" });
     }
+    // react-native config seems to return `windows: null` on non-Windows
+    // platforms (while returning a populated object for Windows). If you force it
+    // to non-null for development on macOS, macOS runs the autolinking command
+    // successfully but writes out erroneous output, so
+    // there's no point.
+    if (platform === "win32") {
+        title("Autolinking the Windows app…", { spacing: 1 });
+        await autolinkWindows({ projectPath });
+    }
     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 });
-    // TODO: Set up Windows app.cpp entrypoint
 }
 async function createExpoApp({ localDev, name, packageManager, versions, }) {
     // `create-expo-app` aggravatingly reconfigures your workspace to use
@@ -249,19 +258,24 @@ async function updatePackageJson({ localDev, name, projectPath, task, versions,
         }
         packageJson.scripts.macos = "rnc-cli run-macos";
         packageJson.scripts.windows = "rnc-cli run-windows";
+        packageJson.scripts["autolink-windows"] = "react-native autolink-windows";
     }
     else {
         if (!packageJson.dependencies) {
             packageJson.dependencies = {};
         }
-        // expo-desktop-prebuild-config itself depends on
-        // expo-desktop-config-plugins.
-        if (localDev) {
-            packageJson.dependencies["expo-desktop-prebuild-config"] =
-                "file:../../expo-desktop-prebuild-config";
-        }
-        else {
-            packageJson.dependencies["expo-desktop-prebuild-config"] = "^1.0.0";
+        const monorepoDeps = {
+            // expo-desktop-prebuild-config itself depends on
+            // expo-desktop-config-plugins.
+            ["expo-desktop-prebuild-config"]: "^1.0.0",
+            ["expo-desktop-modules-core"]: `^${versions.expoMajor}.0.0`,
+            ["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;
         packageJson.dependencies["react-native-windows"] = versions.windows;
@@ -428,6 +442,27 @@ async function podInstall({ projectPath, type }) {
     }
     console.log(`\n${green("◆")}  Installed Cocoapods for the ${type === "ios" ? "iOS" : "macOS"} app.\n`);
 }
+async function autolinkWindows({ projectPath }) {
+    const command = "node";
+    const args = ["--run", "autolink-windows"];
+    const printedCommand = `${command} ${args.join(" ")}`;
+    console.log(`${cyan("◆")}  Running: ${yellow(printedCommand)}\n`);
+    try {
+        await tasks([
+            promisifiedSpawnTask({
+                title: "react-native autolink-windows",
+                command,
+                args,
+                options: { cwd: projectPath, stdio: "inherit" },
+            }),
+        ]);
+    }
+    catch (error) {
+        log.error(`Error running ${yellow(printedCommand)}${error instanceof Error ? `: ${error.message}` : "."}`);
+        process.exit(1);
+    }
+    console.log(`\n${green("◆")}  Autolinked the Windows app.\n`);
+}
 async function improveMetroConfig({ projectPath }) {
     const metroConfigPath = path.resolve(projectPath, "metro.config.js");
     console.log(`${cyan("◆")}  Overwriting metro.config.js…\n`);
@@ -437,6 +472,17 @@ 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 = (platform) => {
+  const polyfills = getPolyfills(platform);
+  if (platform === "windows") {
+    polyfills.push(windowsExpoPolyfill);
+  }
+  return polyfills;
+};
+
 module.exports = config;
     `.trim() + "\n", "utf-8");
     }
@@ -446,6 +492,69 @@ 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.19",
+  "version": "0.1.23",
   "description": "Best-effort desktop support for Expo",
   "keywords": [
     "android",
@@ -37,12 +37,12 @@
     "@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.19",
-    "expo-desktop-prebuild-config": "1.0.8"
+    "toml": "^4.1.1"
   },
   "devDependencies": {
     "@expo/config": "^12.0.13",