expo-desktop 1.0.0-beta.0 → 1.0.0-beta.2

package/build/common/expo/template.js

@@ -27,6 +27,7 @@ const require = createRequire(import.meta.url);
 const JsonFile = require("@expo/json-file").default;
 const debug = Debug("expo-desktop:create-app:template");
 const isMacOS = process.platform === "darwin";
+const isWindows = process.platform === "win32";
 // keep this list in sync with the validation helper in WWW: src/utils/experienceParser.ts
 const FORBIDDEN_NAMES = [
     "react-native",
@@ -435,7 +436,6 @@ export async function sanitizeTemplateAsync({ displayName: displayNameArg, rdns:
         android: {
             package: androidPackage,
         },
-        // @ts-expect-error macos and windows missing from types
         windows: {
             displayName,
             namespace: windowsNamespace,
@@ -448,6 +448,10 @@ export async function sanitizeTemplateAsync({ displayName: displayNameArg, rdns:
                 CFBundleName: displayName,
             },
         },
+        experiments: {
+            // @ts-expect-error Earlier Expo SDKs don't provide typings for this.
+            outOfTreePlatforms: true,
+        },
     };
     const appFile = new JsonFile(path.join(projectRoot, "app.json"), { default: {} });
     const appContent = (await appFile.readAsync());
@@ -613,13 +617,13 @@ export function logProjectReady({ cdPath, packageManager, }) {
         console.log();
     }
     console.log(`- ${chalk.bold(formatRunCommand(packageManager, "android"))}`);
-    let macOSComment = "";
-    if (!isMacOS) {
-        macOSComment =
-            " # you need to use macOS to build the iOS or macOS projects - use the Expo app if you need to do Apple development without a Mac";
-    }
+    const macOSComment = isMacOS
+        ? ""
+        : " # you need to use macOS to build the iOS or macOS projects - use the Expo app if you need to do Apple development without a Mac";
     console.log(`- ${chalk.bold(formatRunCommand(packageManager, "ios"))}${macOSComment}`);
     console.log(`- ${chalk.bold(formatRunCommand(packageManager, "macos"))}${macOSComment}`);
+    const windowsComment = isWindows ? "" : " # you need to use Windows to build the Windows project";
+    console.log(`- ${chalk.bold(formatRunCommand(packageManager, "windows"))}${windowsComment}`);
     console.log(`- ${chalk.bold(formatRunCommand(packageManager, "web"))}`);
 }
 export async function installPodsAsync(projectRoot, platform) {

package/build/prebuild/expo/update-package-json.js

@@ -132,6 +132,16 @@ export function updatePkgScripts({ pkg }) {
         pkg.scripts.ios = "expo run:ios";
         hasChanged = true;
     }
+    if (pkg.scripts.macos ===
+        "node -e \"console.log('Please run \\`npx expo-desktop prebuild\\` to set up the React Native macOS project.'); process.exit(1);\"") {
+        pkg.scripts.macos = "rnc-cli run-macos";
+        hasChanged = true;
+    }
+    if (pkg.scripts.windows ===
+        "node -e \"console.log('Please run \\`npx expo-desktop prebuild\\` to set up the React Native Windows project.'); process.exit(1);\"") {
+        pkg.scripts.windows = "rnc-cli run-windows";
+        hasChanged = true;
+    }
     return hasChanged;
 }
 function normalizeDependencyMap(deps) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.2",
   "description": "Best-effort desktop support for Expo",
   "keywords": [
     "android",
@@ -45,7 +45,7 @@
     "citty": "^0.2.2",
     "debug": "^4.4.3",
     "expo-desktop-config-plugins": "^1.2.0-beta.0",
-    "expo-desktop-prebuild-config": "^1.1.0-beta.0",
+    "expo-desktop-prebuild-config": "^1.1.0-beta.1",
     "getenv": "^2.0.0",
     "glob": "^10.5.0",
     "kleur": "^4.1.5",

package/build/prebuild/update-package-json-async.js

@@ -1,166 +0,0 @@
-import { tasks } from "@clack/prompts";
-import { getPackageJson } from "@expo/config";
-import crypto from "crypto";
-import fs from "fs";
-import path from "path";
-/** Modifies the `package.json` with `modifyPackageJson` and format/displays the results. */
-export async function updatePackageJSONAsync(projectRoot, { templateDirectory, templatePkg = getPackageJson(templateDirectory), pkg, skipDependencyUpdate, }) {
-    let hasChanges;
-    let results;
-    await tasks([
-        {
-            title: "Updating package.json",
-            task: async (_message) => {
-                results = modifyPackageJson(projectRoot, {
-                    templatePkg,
-                    pkg,
-                    skipDependencyUpdate,
-                });
-                hasChanges = !!results.changedDependencies.length || results.scriptsChanged;
-                // NOTE: This is effectively bundler caching and subject to breakage if the inputs don't match the mutations.
-                if (hasChanges) {
-                    await fs.promises.writeFile(path.resolve(projectRoot, "package.json"), 
-                    // Add new line to match the format of running yarn.
-                    // This prevents the `package.json` from changing when running `prebuild --no-install` multiple times.
-                    JSON.stringify(pkg, null, 2) + "\n");
-                }
-            },
-        },
-    ]);
-    return results;
-}
-/**
- * Make required modifications to the `package.json` file as a JSON object.
- *
- * 1. Update `package.json` `scripts`.
- * 2. Update `package.json` `dependencies` (not `devDependencies`).
- * 3. Update `package.json` `main`.
- *
- * @param projectRoot The root directory of the project.
- * @param templatePkg Template project package.json as JSON.
- * @param pkg Current package.json as JSON.
- * @param skipDependencyUpdate Array of dependencies to skip updating.
- * @returns
- */
-function modifyPackageJson(projectRoot, { templatePkg, pkg, skipDependencyUpdate, }) {
-    const scriptsChanged = updatePkgScripts({ pkg });
-    // TODO: Move to `npx expo-doctor`
-    return {
-        scriptsChanged,
-        ...updatePkgDependencies(projectRoot, {
-            pkg,
-            templatePkg,
-            skipDependencyUpdate,
-        }),
-    };
-}
-/**
- * Update `package.json` dependencies by combining the `dependencies` in the
- * project we are creating with the dependencies in the template project.
- *
- * > Exposed for testing.
- */
-export function updatePkgDependencies(projectRoot, { pkg, templatePkg, skipDependencyUpdate = [], }) {
-    const { dependencies } = templatePkg;
-    // The default values come from the bare-minimum template's package.json.
-    // Users can change this by using different templates with the `--template` flag.
-    // The main reason for allowing the changing of dependencies would be to include
-    // dependencies that are required for the native project to build. For example,
-    // it does not need to include dependencies that are used in the JS-code only.
-    const defaultDependencies = createDependenciesMap(dependencies);
-    // NOTE: This is a hack to ensure this doesn't trigger an extraneous change in the `package.json`
-    // it isn't required for anything in the `ios` and `android` folders.
-    delete defaultDependencies["expo-status-bar"];
-    // NOTE: Expo splash screen is installed by default in the template but the config plugin also lives in prebuild-config
-    // so we can delete it to prevent an extraneous change in the `package.json`.
-    delete defaultDependencies["expo-splash-screen"];
-    const combinedDependencies = createDependenciesMap({
-        ...defaultDependencies,
-        ...pkg.dependencies,
-    });
-    // Only change the dependencies if the normalized hash changes, this helps to
-    // reduce meaningless changes.
-    const hasNewDependencies = hashForDependencyMap(pkg.dependencies) !== hashForDependencyMap(combinedDependencies);
-    // Save the dependencies
-    let changedDependencies = [];
-    if (hasNewDependencies) {
-        changedDependencies = diffKeys(combinedDependencies, pkg.dependencies ?? {}).sort();
-        // Use Object.assign to preserve the original order of dependencies, this
-        // makes it easier to see what changed in the git diff.
-        pkg.dependencies = Object.assign(pkg.dependencies ?? {}, combinedDependencies);
-    }
-    return {
-        changedDependencies,
-    };
-}
-function diffKeys(a, b) {
-    return Object.keys(a).filter((key) => a[key] !== b[key]);
-}
-/**
- * Create an object of type DependenciesMap a dependencies object or throw if not valid.
- *
- * @param dependencies - ideally an object of type {[key]: string} - if not then this will error.
- */
-export function createDependenciesMap(dependencies) {
-    if (typeof dependencies !== "object") {
-        throw new Error(`Dependency map is invalid, expected object but got ${typeof dependencies}`);
-    }
-    else if (!dependencies) {
-        return {};
-    }
-    const outputMap = {};
-    for (const key of Object.keys(dependencies)) {
-        const value = dependencies[key];
-        if (typeof value === "string") {
-            outputMap[key] = value;
-        }
-        else {
-            throw new Error(`Dependency for key \`${key}\` should be a \`string\`, instead got: \`{ ${key}: ${JSON.stringify(value)} }\``);
-        }
-    }
-    return outputMap;
-}
-/**
- * Updates the package.json scripts for prebuild if the scripts match
- * the default values used in project templates.
- */
-export function updatePkgScripts({ pkg }) {
-    let hasChanged = false;
-    if (!pkg.scripts) {
-        pkg.scripts = {};
-    }
-    if (pkg.scripts.android === "expo start --android" ||
-        pkg.scripts.android === "react-native run-android") {
-        pkg.scripts.android = "expo run:android";
-        hasChanged = true;
-    }
-    if (pkg.scripts.ios === "expo start --ios" || pkg.scripts.ios === "react-native run-ios") {
-        pkg.scripts.ios = "expo run:ios";
-        hasChanged = true;
-    }
-    if (pkg.scripts.macos ===
-        "node -e \"console.log('Please run \\`npx expo-desktop prebuild\\` to set up the React Native macOS project.'); process.exit(1);\"") {
-        pkg.scripts.macos = "rnc-cli run-macos";
-        hasChanged = true;
-    }
-    if (pkg.scripts.windows ===
-        "node -e \"console.log('Please run \\`npx expo-desktop prebuild\\` to set up the React Native Windows project.'); process.exit(1);\"") {
-        pkg.scripts.windows = "rnc-cli run-windows";
-        hasChanged = true;
-    }
-    return hasChanged;
-}
-function normalizeDependencyMap(deps) {
-    return Object.keys(deps)
-        .map((dependency) => `${dependency}@${deps[dependency]}`)
-        .sort();
-}
-export function hashForDependencyMap(deps = {}) {
-    const depsList = normalizeDependencyMap(deps);
-    const depsString = depsList.join("\n");
-    return createFileHash(depsString);
-}
-export function createFileHash(contents) {
-    // this doesn't need to be secure, the shorter the better.
-    return crypto.createHash("sha1").update(contents).digest("hex");
-}