@radhya/mach 2.6.6 → 2.6.8

package/docs/deep-links.md

@@ -179,6 +179,27 @@ export default {
 }
 ```
 
+### Multi-app Expo workspaces
+
+When several separately shipped apps share one Expo `app.config.ts`, keep a **single workspace wrapper** and let it select the Mach config for the active build. Do not add one fixed plugin entry per product: every config plugin runs for every build, so a fixed Pocket entry could otherwise add Pocket links to another app.
+
+`mach deeplink setup` still writes each product’s association files and configuration when run from that product directory. It intentionally does not inject a fixed plugin into the shared Expo root. The wrapper chooses the config using the same environment variable that chooses the product:
+
+```js
+const withMach = require('@radhya/mach/expo-plugin')
+
+module.exports = (config) => {
+  const appKey = process.env.EXPO_PUBLIC_APP_KEY || 'main'
+  return withMach(config, {
+    machConfigPath: appKey === 'main'
+      ? 'mach.config.json'
+      : `apps/${appKey}/mach.config.json`,
+  })
+}
+```
+
+Put that wrapper once in the root `plugins` array. Each product’s build profile must set its own selector environment value. Mach resolves the parent Expo root and that profile environment during `mach deeplink verify`, so verification checks the same app configuration that the focused build uses.
+
 ## Flutter Projects
 
 For Flutter applications, setup makes conservative, idempotent native changes:

package/expo-plugin/index.js

@@ -4,6 +4,10 @@ const path = require('path')
 const unique = values => Array.from(new Set(values.filter(Boolean)))
 const nonEmpty = value => typeof value === 'string' && value.trim().length > 0 ? value.trim() : undefined
 const first = (...values) => values.map(nonEmpty).find(Boolean)
+const mergeScheme = (current, machScheme) => {
+  const values = unique([machScheme, ...(Array.isArray(current) ? current : [current])])
+  return values.length === 1 ? values[0] : values
+}
 
 const withoutRuntimeVersion = platformConfig => {
   if (!platformConfig || typeof platformConfig !== 'object' || !Object.prototype.hasOwnProperty.call(platformConfig, 'runtimeVersion')) {
@@ -40,11 +44,14 @@ const domainFromBaseUrl = value => {
   }
 }
 
-const readMachConfig = config => {
+const readMachConfig = (config, options = {}) => {
   const projectRoot = config && config._internal && config._internal.projectRoot
     ? config._internal.projectRoot
     : process.cwd()
-  const configPath = path.join(projectRoot, 'mach.config.json')
+  const configuredPath = nonEmpty(options && options.machConfigPath)
+  const configPath = configuredPath
+    ? path.resolve(projectRoot, configuredPath)
+    : path.join(projectRoot, 'mach.config.json')
   if (!fs.existsSync(configPath)) return {}
   return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
 }
@@ -98,8 +105,8 @@ const hasDomainFilter = (filter, domain) => {
   return data.some(item => item && item.scheme === 'https' && item.host === domain)
 }
 
-const resolveDeepLinks = config => {
-  const machConfig = readMachConfig(config)
+const resolveDeepLinks = (config, options) => {
+  const machConfig = readMachConfig(config, options)
   const deepLinks = machConfig.deepLinks || {}
   const profileName = deepLinks.profile || process.env.MACH_PROFILE || process.env.EAS_BUILD_PROFILE || 'production'
   const profile = resolveBuildProfile(machConfig, profileName)
@@ -120,8 +127,8 @@ const resolveDeepLinks = config => {
   return { ...deepLinks, baseUrl, domain, scheme }
 }
 
-const resolveOta = config => {
-  const machConfig = readMachConfig(config)
+const resolveOta = (config, options) => {
+  const machConfig = readMachConfig(config, options)
   const ota = machConfig.ota || machConfig.update || {}
   if (ota.enabled === false) return { enabled: false }
   const projectId = nonEmpty(machConfig.projectId)
@@ -138,8 +145,8 @@ const resolveOta = config => {
   return { ...ota, enabled: Boolean(url), projectId, engine, url, runtimeVersion, runtimeVersionPolicy, channel }
 }
 
-const resolvePush = config => {
-  const machConfig = readMachConfig(config)
+const resolvePush = (config, options) => {
+  const machConfig = readMachConfig(config, options)
   const push = machConfig.push || {}
   const projectRoot = projectRootForConfig(config)
   return {
@@ -154,10 +161,10 @@ const resolvePush = config => {
   }
 }
 
-module.exports = function withMachDeepLinks(config) {
-  const deepLinks = resolveDeepLinks(config)
-  const ota = resolveOta(config)
-  const push = resolvePush(config)
+module.exports = function withMachDeepLinks(config, options) {
+  const deepLinks = resolveDeepLinks(config, options)
+  const ota = resolveOta(config, options)
+  const push = resolvePush(config, options)
 
   config.extra = { ...(config.extra || {}) }
 
@@ -213,7 +220,7 @@ module.exports = function withMachDeepLinks(config) {
 
   if (!deepLinks.baseUrl || !deepLinks.domain) return config
 
-  config.scheme = deepLinks.scheme
+  config.scheme = mergeScheme(config.scheme, deepLinks.scheme)
   config.extra.deepLinkBaseUrl = deepLinks.baseUrl
 
   config.ios = config.ios || {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radhya/mach",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "Mach CLI: cloud build and delivery for Flutter, React Native, and Expo",
   "main": "dist/index.js",
   "type": "module",