eoas 3.1.0 → 3.1.2-beta

package/dist/commands/init.js

@@ -105,9 +105,22 @@ class Init extends core_1.Command {
                 .replace(/\\/g, '\\\\')
                 .replace(/'/g, "\\'")}'`,
             enabled: true,
+            // Branch surfing: a build on a channel that allows it can be pointed at
+            // another branch at runtime, and expo-updates only accepts an override for
+            // header keys that already existed at build time — so these have to be
+            // declared here even when the value is empty. Dropping one of them does not
+            // disable the feature, it strips that header from every poll for the rest of
+            // the install; the picker refuses to appear rather than let that happen.
             requestHeaders: {
-                'expo-channel-name': 'process.env.RELEASE_CHANNEL',
+                'expo-channel-name': {
+                    __comment: 'Declare as a literal if you surf branches: see xprem-branch below.',
+                    value: 'process.env.RELEASE_CHANNEL',
+                },
                 'expo-app-id': appId,
+                'xprem-branch': {
+                    __comment: 'Branch surfing — the branch to serve; empty means the channel decides.',
+                    value: '',
+                },
             },
         };
         const updateConfigSpinner = (0, ora_1.ora)('Updating Expo config').start();

package/dist/commands/publish.d.ts

@@ -8,6 +8,7 @@ export default class Publish extends Command {
         channel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         disableRepositoryCheck: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        serverUrl: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         nonInteractive: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         outputDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         packageRunner: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;

package/dist/commands/publish.js

@@ -49,6 +49,10 @@ class Publish extends core_1.Command {
             description: 'Name of the branch to point to',
             required: true,
         }),
+        serverUrl: core_1.Flags.string({
+            description: 'URL of the self-hosted update server to publish to. Defaults to the origin of updates.url from your Expo config',
+            required: false,
+        }),
         nonInteractive: core_1.Flags.boolean({
             description: 'Run command in non-interactive mode',
             default: false,
@@ -81,6 +85,7 @@ class Publish extends core_1.Command {
             disableRepositoryCheck: flags.disableRepositoryCheck,
             platform: flags.platform,
             branch: flags.branch,
+            customServerUrl: flags.serverUrl,
             nonInteractive: flags.nonInteractive,
             outputDir: flags.outputDir,
             packageRunner: (0, packageRunner_1.resolvePackageRunner)(flags.packageRunner, process.cwd()),
@@ -97,7 +102,7 @@ class Publish extends core_1.Command {
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
-        const { platform, nonInteractive, branch, outputDir, packageRunner, providedDeprecatedChannel, disableRepositoryCheck, message, dumpSourcemap, rolloutPercentage, } = this.sanitizeFlags(flags);
+        const { platform, nonInteractive, branch, customServerUrl, outputDir, packageRunner, providedDeprecatedChannel, disableRepositoryCheck, message, dumpSourcemap, rolloutPercentage, } = this.sanitizeFlags(flags);
         if (!branch) {
             log_1.default.error('Branch name is required');
             process.exit(1);
@@ -119,12 +124,14 @@ class Publish extends core_1.Command {
             },
             packageRunner,
         });
-        const serverUrl = await (0, expoConfig_1.resolveServerUrl)(config).catch(e => {
+        const serverUrl = await (0, expoConfig_1.resolveServerUrl)(config, customServerUrl).catch(e => {
             log_1.default.error(e.message);
             process.exit(1);
         });
         const appId = (0, expoConfig_1.requireExpoAppId)(config);
-        if (!nonInteractive) {
+        // A URL passed on the command line needs no confirmation, and `eoas init`
+        // would not fix it anyway.
+        if (!nonInteractive && !customServerUrl) {
             const confirmed = await (0, prompts_1.confirmAsync)({
                 message: `Is this the correct URL of your self-hosted update server? ${serverUrl}`,
                 name: 'export',

package/dist/commands/republish.d.ts

@@ -6,6 +6,7 @@ export default class Publish extends Command {
     static flags: {
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        serverUrl: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     private sanitizeFlags;
     run(): Promise<void>;

package/dist/commands/republish.js

@@ -26,11 +26,16 @@ class Publish extends core_1.Command {
             default: 'all',
             required: true,
         }),
+        serverUrl: core_1.Flags.string({
+            description: 'URL of the self-hosted update server to republish on. Defaults to the origin of updates.url from your Expo config',
+            required: false,
+        }),
     };
     sanitizeFlags(flags) {
         return {
             branch: flags.branch,
             platform: flags.platform,
+            customServerUrl: flags.serverUrl,
         };
     }
     async run() {
@@ -40,7 +45,7 @@ class Publish extends core_1.Command {
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
-        const { branch, platform } = this.sanitizeFlags(flags);
+        const { branch, platform, customServerUrl } = this.sanitizeFlags(flags);
         if (!branch) {
             log_1.default.error('Branch name is required');
             process.exit(1);
@@ -60,21 +65,11 @@ class Publish extends core_1.Command {
         const privateConfig = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir, {
             env: process.env,
         });
-        const updateUrl = (0, expoConfig_1.getExpoConfigUpdateUrl)(privateConfig);
-        if (!updateUrl) {
-            log_1.default.error("Update url is not setup in your config. Please run 'eoas init' to setup the update url");
+        const baseUrl = await (0, expoConfig_1.resolveServerUrl)(privateConfig, customServerUrl).catch(e => {
+            log_1.default.error(e.message);
             process.exit(1);
-        }
+        });
         const appId = (0, expoConfig_1.requireExpoAppId)(privateConfig);
-        let baseUrl;
-        try {
-            const parsedUrl = new URL(updateUrl);
-            baseUrl = parsedUrl.origin;
-        }
-        catch (e) {
-            log_1.default.error('Invalid URL', e);
-            process.exit(1);
-        }
         let runtimeVersions;
         try {
             runtimeVersions = await (0, serverUpdates_1.fetchRuntimeVersions)({ baseUrl, appId, branch, credentials });

package/dist/commands/rollback.d.ts

@@ -6,6 +6,7 @@ export default class Publish extends Command {
     static flags: {
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        serverUrl: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         nonInteractive: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     private sanitizeFlags;

package/dist/commands/rollback.js

@@ -28,6 +28,10 @@ class Publish extends core_1.Command {
             description: 'Name of the branch to point to',
             required: true,
         }),
+        serverUrl: core_1.Flags.string({
+            description: 'URL of the self-hosted update server to roll back on. Defaults to the origin of updates.url from your Expo config',
+            required: false,
+        }),
         nonInteractive: core_1.Flags.boolean({
             description: 'Run command in non-interactive mode',
             default: false,
@@ -37,6 +41,7 @@ class Publish extends core_1.Command {
         return {
             platform: flags.platform,
             branch: flags.branch,
+            customServerUrl: flags.serverUrl,
             nonInteractive: flags.nonInteractive,
         };
     }
@@ -47,7 +52,7 @@ class Publish extends core_1.Command {
             process.exit(1);
         }
         const { flags } = await this.parse(Publish);
-        const { platform, branch, nonInteractive } = this.sanitizeFlags(flags);
+        const { platform, branch, customServerUrl, nonInteractive } = this.sanitizeFlags(flags);
         if (!branch) {
             log_1.default.error('Branch name is required');
             process.exit(1);
@@ -79,21 +84,11 @@ class Publish extends core_1.Command {
             log_1.default.error('When using disableAntiBrickingMeasures, expo-updates is ignoring the embeded update of the app, please use republish command instead');
             process.exit(1);
         }
-        const updateUrl = (0, expoConfig_1.getExpoConfigUpdateUrl)(privateConfig);
-        if (!updateUrl) {
-            log_1.default.error("Update url is not setup in your config. Please run 'eoas init' to setup the update url");
+        const baseUrl = await (0, expoConfig_1.resolveServerUrl)(privateConfig, customServerUrl).catch(e => {
+            log_1.default.error(e.message);
             process.exit(1);
-        }
+        });
         const appId = (0, expoConfig_1.requireExpoAppId)(privateConfig);
-        let baseUrl;
-        try {
-            const parsedUrl = new URL(updateUrl);
-            baseUrl = parsedUrl.origin;
-        }
-        catch (e) {
-            log_1.default.error('Invalid URL', e);
-            process.exit(1);
-        }
         const runtimeSpinner = (0, ora_1.ora)('🔄 Resolving runtime version...').start();
         const runtimeVersions = [
             ...(!platform || platform === expoConfig_1.RequestedPlatform.All || platform === expoConfig_1.RequestedPlatform.Ios

package/dist/lib/expoConfig.d.ts

@@ -24,4 +24,10 @@ export declare function getExpoConfigUpdateUrl(config: ExpoConfig): string | und
 export declare function getExpoAppId(config: ExpoConfig): string | undefined;
 export declare function requireExpoAppId(config: ExpoConfig): string;
 export declare function createOrModifyExpoConfigAsync(projectDir: string, exp: Record<string, any>): Promise<void>;
-export declare function resolveServerUrl(config: ExpoConfig): Promise<string>;
+export type CommentedValue = {
+    __comment: string;
+    value: any;
+};
+/** Strips the comment wrappers, for the JSON path and for reading values back. */
+export declare function unwrapValue(value: any): any;
+export declare function resolveServerUrl(config: ExpoConfig, customServerUrl?: string): Promise<string>;

package/dist/lib/expoConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveServerUrl = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
+exports.resolveServerUrl = exports.unwrapValue = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
 const tslib_1 = require("tslib");
 // This file is copied from eas-cli[https://github.com/expo/eas-cli] to ensure consistent user experience across the CLI.
 const config_1 = require("@expo/config");
@@ -254,7 +254,33 @@ function updateObjectExpression(j, configObject, updates) {
         configObject.properties.push(newProperty);
     });
 }
+// The key is deliberately underscored: it is a sentinel this module reads and
+// strips, and it must not be mistakable for a real Expo config field.
+function isCommented(value) {
+    if (typeof value !== 'object' || value === null || !('value' in value)) {
+        return false;
+    }
+    // eslint-disable-next-line no-underscore-dangle
+    return typeof value.__comment === 'string';
+}
+/** Strips the comment wrappers, for the JSON path and for reading values back. */
+function unwrapValue(value) {
+    if (isCommented(value)) {
+        return unwrapValue(value.value);
+    }
+    if (Array.isArray(value)) {
+        return value.map(unwrapValue);
+    }
+    if (typeof value === 'object' && value !== null) {
+        return Object.fromEntries(Object.entries(value).map(([key, val]) => [key, unwrapValue(val)]));
+    }
+    return value;
+}
+exports.unwrapValue = unwrapValue;
 function createValueNode(j, value) {
+    if (isCommented(value)) {
+        return createValueNode(j, value.value);
+    }
     if (typeof value === 'string' && value.startsWith('process.env.')) {
         if (/^process\.env\.\w+$/.test(value)) {
             return j.memberExpression(j.memberExpression(j.identifier('process'), j.identifier('env')), j.identifier(value.split('.')[2]));
@@ -262,8 +288,15 @@ function createValueNode(j, value) {
         return parseExpressionNode(j, value);
     }
     if (typeof value === 'object' && value !== null) {
-        return j.objectExpression(Object.entries(value).map(([key, val]) => j.objectProperty(j.stringLiteral(key), createValueNode(j, val)) // Force stringLiteral pour garder les guillemets
-        ));
+        return j.objectExpression(Object.entries(value).map(([key, val]) => {
+            // Force stringLiteral pour garder les guillemets
+            const property = j.objectProperty(j.stringLiteral(key), createValueNode(j, val));
+            if (isCommented(val)) {
+                // eslint-disable-next-line no-underscore-dangle -- see isCommented
+                property.comments = [j.commentLine(` ${val.__comment}`, true, false)];
+            }
+            return property;
+        }));
     }
     return j.literal(value);
 }
@@ -276,24 +309,24 @@ function parseExpressionNode(j, code) {
 // contents (backslashes in Windows paths, quotes, ...).
 function stringifyWithEnv(obj) {
     const rawExpressions = [];
-    const json = JSON.stringify(obj, (_key, value) => typeof value === 'string' && value.startsWith('process.env.')
+    const json = JSON.stringify(unwrapValue(obj), (_key, value) => typeof value === 'string' && value.startsWith('process.env.')
         ? `__RAW_EXPR_${rawExpressions.push(value) - 1}__`
         : value, 2);
     return json.replace(/"__RAW_EXPR_(\d+)__"/g, (_match, index) => rawExpressions[Number(index)]);
 }
-async function resolveServerUrl(config) {
-    const updateUrl = config.updates?.url;
+// customServerUrl wins over the Expo config, so a project serving updates and
+// receiving publishes on two different origins can point the CLI at the second
+// one without touching its config.
+async function resolveServerUrl(config, customServerUrl) {
+    const updateUrl = customServerUrl ?? getExpoConfigUpdateUrl(config);
     if (!updateUrl) {
-        throw new Error('No update URL found in the Expo config.');
+        throw new Error("Update url is not setup in your config. Please run 'eoas init' to setup the update url, or pass --serverUrl");
     }
-    let baseUrl;
     try {
-        const parsedUrl = new URL(updateUrl);
-        baseUrl = parsedUrl.origin;
+        return new URL(updateUrl).origin;
     }
     catch {
-        throw new Error('Invalid update URL.');
+        throw new Error(customServerUrl ? 'Invalid --serverUrl value.' : 'Invalid update URL.');
     }
-    return baseUrl;
 }
 exports.resolveServerUrl = resolveServerUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoas",
-  "version": "3.1.0",
+  "version": "3.1.2-beta",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",