expo-updates 58.0.12 → 58.0.13

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 58.0.13
+
+### Patch Changes
+
+- Resolve Android resource names and `drawable-*` folders with `@react-native/asset-utils`, matching how React Native resolves embedded assets at runtime. Scales outside the standard set map to a `drawable-<n>dpi` folder instead of failing the export, and assets referenced through `?unstable_path=` drop that prefix from their resource name. ([#50861](https://github.com/expo/expo/pull/50861) by [@huntie](https://github.com/huntie))
+- Load app config and `.env` files in the native build's mode when generating Updates resources. ([#49452](https://github.com/expo/expo/pull/49452) by [@ramonclaudio](https://github.com/ramonclaudio))
+- Load `.env` files in `runtimeversion:resolve` and `configuration:syncnative` before reading app config. ([#49508](https://github.com/expo/expo/pull/49508) by [@ramonclaudio](https://github.com/ramonclaudio))
+
 ## 58.0.12
 
 ### Patch Changes

package/android/build.gradle

@@ -42,7 +42,7 @@ expoModule {
 }
 
 group = 'host.exp.exponent'
-version = '58.0.12'
+version = '58.0.13'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -103,7 +103,7 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '58.0.12'
+    versionName '58.0.13'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

package/cli/build/resolveRuntimeVersion.js

@@ -9,6 +9,13 @@ Object.defineProperty(exports, "resolveRuntimeVersion", {
         return resolveRuntimeVersion;
     }
 });
+function _env() {
+    const data = require("@expo/env");
+    _env = function() {
+        return data;
+    };
+    return data;
+}
 function _chalk() {
     const data = /*#__PURE__*/ _interop_require_default(require("chalk"));
     _chalk = function() {
@@ -109,7 +116,11 @@ Resolve expo-updates runtime version
     const debug = args['--debug'];
     const runtimeVersionInfo = await (0, _withConsoleDisabledAsync.withConsoleDisabledAsync)(async ()=>{
         try {
-            return await resolveRuntimeVersionAsync((0, _args.getProjectRoot)(args), platform, {
+            const projectRoot = (0, _args.getProjectRoot)(args);
+            (0, _env().loadProjectEnv)(projectRoot, {
+                mode: (0, _env().consumeConfigEnvMode)() ?? 'production'
+            });
+            return await resolveRuntimeVersionAsync(projectRoot, platform, {
                 silent: true,
                 debug
             }, {

package/cli/build/resolveRuntimeVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["resolveRuntimeVersion.ts"],"sourcesContent":[null],"names":["resolveRuntimeVersion","argv","args","assertArgs","Boolean","String","Log","exit","chalk","resolveRuntimeVersionAsync","platform","requireArg","includes","CommandError","workflow","debug","runtimeVersionInfo","withConsoleDisabledAsync","getProjectRoot","silent","workflowOverride","e","message","console","log","JSON","stringify"],"mappings":";;;;;+BASaA;;;eAAAA;;;;gEARK;;;;;;sBAGqC;wBAC1B;6DACR;0CACoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,MAAMA,wBAAiC,OAAOC;IACnD,MAAMC,OAAOC,IAAAA,gBAAU,EACrB;QACE,QAAQ;QACR,UAAUC;QACV,cAAcC;QACd,cAAcA;QACd,WAAWD;QACX,UAAU;QACV,MAAM;IACR,GACAH,QAAQ,EAAE;IAGZ,IAAIC,IAAI,CAAC,SAAS,EAAE;QAClBI,KAAIC,IAAI,CACNC,IAAAA,gBAAK,CAAA,CAAC;;;;;;;;;;;;IAYR,CAAC,EACC;IAEJ;IAEA,MAAM,EAAEC,0BAA0B,EAAE,GAClC,MAAM,MAAM,CAAC;IAEf,MAAMC,WAAWC,IAAAA,gBAAU,EAACT,MAAM;IAClC,IAAI,CAAC;QAAC;QAAO;KAAU,CAACU,QAAQ,CAACF,WAAW;QAC1C,MAAM,IAAIG,oBAAY,CAAC,CAAC,2BAA2B,EAAEH,UAAU;IACjE;IAEA,MAAMI,WAAWZ,IAAI,CAAC,aAAa;IACnC,IAAIY,YAAY,CAAC;QAAC;QAAW;KAAU,CAACF,QAAQ,CAACE,WAAW;QAC1D,MAAM,IAAID,oBAAY,CACpB,CAAC,2BAA2B,EAAEC,SAAS,uCAAuC,CAAC;IAEnF;IAEA,MAAMC,QAAQb,IAAI,CAAC,UAAU;IAE7B,MAAMc,qBAAqB,MAAMC,IAAAA,kDAAwB,EAAC;QACxD,IAAI;YACF,OAAO,MAAMR,2BACXS,IAAAA,oBAAc,EAAChB,OACfQ,UACA;gBACES,QAAQ;gBACRJ;YACF,GACA;gBACEK,kBAAkBN;YACpB;QAEJ,EAAE,OAAOO,GAAQ;YACf,MAAM,IAAIR,oBAAY,CAACQ,EAAEC,OAAO;QAClC;IACF;IAEAC,QAAQC,GAAG,CAACC,KAAKC,SAAS,CAACV;AAC7B"}
+{"version":3,"sources":["resolveRuntimeVersion.ts"],"sourcesContent":[null],"names":["resolveRuntimeVersion","argv","args","assertArgs","Boolean","String","Log","exit","chalk","resolveRuntimeVersionAsync","platform","requireArg","includes","CommandError","workflow","debug","runtimeVersionInfo","withConsoleDisabledAsync","projectRoot","getProjectRoot","loadProjectEnv","mode","consumeConfigEnvMode","silent","workflowOverride","e","message","console","log","JSON","stringify"],"mappings":";;;;;+BAUaA;;;eAAAA;;;;yBATwC;;;;;;;gEACnC;;;;;;sBAGqC;wBAC1B;6DACR;0CACoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,MAAMA,wBAAiC,OAAOC;IACnD,MAAMC,OAAOC,IAAAA,gBAAU,EACrB;QACE,QAAQ;QACR,UAAUC;QACV,cAAcC;QACd,cAAcA;QACd,WAAWD;QACX,UAAU;QACV,MAAM;IACR,GACAH,QAAQ,EAAE;IAGZ,IAAIC,IAAI,CAAC,SAAS,EAAE;QAClBI,KAAIC,IAAI,CACNC,IAAAA,gBAAK,CAAA,CAAC;;;;;;;;;;;;IAYR,CAAC,EACC;IAEJ;IAEA,MAAM,EAAEC,0BAA0B,EAAE,GAClC,MAAM,MAAM,CAAC;IAEf,MAAMC,WAAWC,IAAAA,gBAAU,EAACT,MAAM;IAClC,IAAI,CAAC;QAAC;QAAO;KAAU,CAACU,QAAQ,CAACF,WAAW;QAC1C,MAAM,IAAIG,oBAAY,CAAC,CAAC,2BAA2B,EAAEH,UAAU;IACjE;IAEA,MAAMI,WAAWZ,IAAI,CAAC,aAAa;IACnC,IAAIY,YAAY,CAAC;QAAC;QAAW;KAAU,CAACF,QAAQ,CAACE,WAAW;QAC1D,MAAM,IAAID,oBAAY,CACpB,CAAC,2BAA2B,EAAEC,SAAS,uCAAuC,CAAC;IAEnF;IAEA,MAAMC,QAAQb,IAAI,CAAC,UAAU;IAE7B,MAAMc,qBAAqB,MAAMC,IAAAA,kDAAwB,EAAC;QACxD,IAAI;YACF,MAAMC,cAAcC,IAAAA,oBAAc,EAACjB;YACnCkB,IAAAA,qBAAc,EAACF,aAAa;gBAAEG,MAAMC,IAAAA,2BAAoB,OAAM;YAAa;YAC3E,OAAO,MAAMb,2BACXS,aACAR,UACA;gBACEa,QAAQ;gBACRR;YACF,GACA;gBACES,kBAAkBV;YACpB;QAEJ,EAAE,OAAOW,GAAQ;YACf,MAAM,IAAIZ,oBAAY,CAACY,EAAEC,OAAO;QAClC;IACF;IAEAC,QAAQC,GAAG,CAACC,KAAKC,SAAS,CAACd;AAC7B"}

package/cli/build/syncConfigurationToNative.js

@@ -9,6 +9,13 @@ Object.defineProperty(exports, "syncConfigurationToNative", {
         return syncConfigurationToNative;
     }
 });
+function _env() {
+    const data = require("@expo/env");
+    _env = function() {
+        return data;
+    };
+    return data;
+}
 function _chalk() {
     const data = /*#__PURE__*/ _interop_require_default(require("chalk"));
     _chalk = function() {
@@ -104,8 +111,12 @@ only needs to be used by the EAS CLI for generic projects that don't use continu
     ].includes(workflow)) {
         throw new _errors.CommandError(`Invalid workflow argument: ${workflow}. Must be either 'managed' or 'generic'`);
     }
+    const projectRoot = (0, _args.getProjectRoot)(args);
+    (0, _env().loadProjectEnv)(projectRoot, {
+        mode: (0, _env().consumeConfigEnvMode)() ?? 'production'
+    });
     await (0, _syncConfigurationToNativeAsync.syncConfigurationToNativeAsync)({
-        projectRoot: (0, _args.getProjectRoot)(args),
+        projectRoot,
         platform,
         workflow
     });

package/cli/build/syncConfigurationToNative.js.map

@@ -1 +1 @@
-{"version":3,"sources":["syncConfigurationToNative.ts"],"sourcesContent":[null],"names":["syncConfigurationToNative","argv","args","assertArgs","Boolean","String","Log","exit","chalk","platform","requireArg","includes","CommandError","workflow","syncConfigurationToNativeAsync","projectRoot","getProjectRoot"],"mappings":";;;;;+BASaA;;;eAAAA;;;;gEARK;;;;;;gDAG6B;sBACQ;wBAC1B;6DACR;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,MAAMA,4BAAqC,OAAOC;IACvD,MAAMC,OAAOC,IAAAA,gBAAU,EACrB;QACE,QAAQ;QACR,UAAUC;QACV,cAAcC;QACd,cAAcA;QACd,UAAU;QACV,MAAM;IACR,GACAJ,QAAQ,EAAE;IAGZ,IAAIC,IAAI,CAAC,SAAS,EAAE;QAClBI,KAAIC,IAAI,CACNC,IAAAA,gBAAK,CAAA,CAAC;;;;;;;;;;;;IAYR,CAAC,EACC;IAEJ;IAEA,MAAMC,WAAWC,IAAAA,gBAAU,EAACR,MAAM;IAClC,IAAI,CAAC;QAAC;QAAO;KAAU,CAACS,QAAQ,CAACF,WAAW;QAC1C,MAAM,IAAIG,oBAAY,CAAC,CAAC,2BAA2B,EAAEH,UAAU;IACjE;IAEA,MAAMI,WAAWH,IAAAA,gBAAU,EAACR,MAAM;IAClC,IAAI,CAAC;QAAC;QAAW;KAAU,CAACS,QAAQ,CAACE,WAAW;QAC9C,MAAM,IAAID,oBAAY,CACpB,CAAC,2BAA2B,EAAEC,SAAS,uCAAuC,CAAC;IAEnF;IAEA,MAAMC,IAAAA,8DAA8B,EAAC;QACnCC,aAAaC,IAAAA,oBAAc,EAACd;QAC5BO;QACAI;IACF;AACF"}
+{"version":3,"sources":["syncConfigurationToNative.ts"],"sourcesContent":[null],"names":["syncConfigurationToNative","argv","args","assertArgs","Boolean","String","Log","exit","chalk","platform","requireArg","includes","CommandError","workflow","projectRoot","getProjectRoot","loadProjectEnv","mode","consumeConfigEnvMode","syncConfigurationToNativeAsync"],"mappings":";;;;;+BAUaA;;;eAAAA;;;;yBATwC;;;;;;;gEACnC;;;;;;gDAG6B;sBACQ;wBAC1B;6DACR;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,MAAMA,4BAAqC,OAAOC;IACvD,MAAMC,OAAOC,IAAAA,gBAAU,EACrB;QACE,QAAQ;QACR,UAAUC;QACV,cAAcC;QACd,cAAcA;QACd,UAAU;QACV,MAAM;IACR,GACAJ,QAAQ,EAAE;IAGZ,IAAIC,IAAI,CAAC,SAAS,EAAE;QAClBI,KAAIC,IAAI,CACNC,IAAAA,gBAAK,CAAA,CAAC;;;;;;;;;;;;IAYR,CAAC,EACC;IAEJ;IAEA,MAAMC,WAAWC,IAAAA,gBAAU,EAACR,MAAM;IAClC,IAAI,CAAC;QAAC;QAAO;KAAU,CAACS,QAAQ,CAACF,WAAW;QAC1C,MAAM,IAAIG,oBAAY,CAAC,CAAC,2BAA2B,EAAEH,UAAU;IACjE;IAEA,MAAMI,WAAWH,IAAAA,gBAAU,EAACR,MAAM;IAClC,IAAI,CAAC;QAAC;QAAW;KAAU,CAACS,QAAQ,CAACE,WAAW;QAC9C,MAAM,IAAID,oBAAY,CACpB,CAAC,2BAA2B,EAAEC,SAAS,uCAAuC,CAAC;IAEnF;IAEA,MAAMC,cAAcC,IAAAA,oBAAc,EAACb;IACnCc,IAAAA,qBAAc,EAACF,aAAa;QAAEG,MAAMC,IAAAA,2BAAoB,OAAM;IAAa;IAE3E,MAAMC,IAAAA,8DAA8B,EAAC;QACnCL;QACAL;QACAI;IACF;AACF"}

package/cli/src/resolveRuntimeVersion.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { consumeConfigEnvMode, loadProjectEnv } from '@expo/env';
 import chalk from 'chalk';
 
 import { Command } from './cli';
@@ -59,8 +60,10 @@ Resolve expo-updates runtime version
 
   const runtimeVersionInfo = await withConsoleDisabledAsync(async () => {
     try {
+      const projectRoot = getProjectRoot(args);
+      loadProjectEnv(projectRoot, { mode: consumeConfigEnvMode() ?? 'production' });
       return await resolveRuntimeVersionAsync(
-        getProjectRoot(args),
+        projectRoot,
         platform,
         {
           silent: true,

package/cli/src/syncConfigurationToNative.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { consumeConfigEnvMode, loadProjectEnv } from '@expo/env';
 import chalk from 'chalk';
 
 import { Command } from './cli';
@@ -51,8 +52,11 @@ only needs to be used by the EAS CLI for generic projects that don't use continu
     );
   }
 
+  const projectRoot = getProjectRoot(args);
+  loadProjectEnv(projectRoot, { mode: consumeConfigEnvMode() ?? 'production' });
+
   await syncConfigurationToNativeAsync({
-    projectRoot: getProjectRoot(args),
+    projectRoot,
     platform,
     workflow,
   });

package/expo-updates-gradle-plugin/src/main/kotlin/expo/modules/updates/ExpoUpdatesPlugin.kt

@@ -83,6 +83,7 @@ abstract class ExpoUpdatesPlugin : Plugin<Project> {
           add(assetDir.get().toString())
           add(if (debuggableVariant.get()) "only-fingerprint" else "all")
           add(entryFile.get())
+          add(if (debuggableVariant.get()) "development" else "production")
         }
 
         if (Os.isFamily(Os.FAMILY_WINDOWS)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "58.0.12",
+  "version": "58.0.13",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "keywords": [
     "expo",
@@ -45,8 +45,10 @@
   },
   "dependencies": {
     "@expo/code-signing-certificates": "^0.0.6",
+    "@expo/env": "^2.5.1",
     "@expo/plist": "^0.10.1",
     "@expo/spawn-async": "^1.8.0",
+    "@react-native/asset-utils": "0.88.0-rc.3",
     "arg": "^4.1.0",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
@@ -61,8 +63,8 @@
     "resolve-from": "^5.0.0"
   },
   "devDependencies": {
-    "@expo/metro-config": "58.0.6",
-    "@testing-library/react-native": "^13.3.0",
+    "@expo/metro-config": "58.0.7",
+    "@testing-library/react-native": "^14.0.1",
     "@types/debug": "^4.1.7",
     "@types/getenv": "^1.0.0",
     "@types/jest": "^29.2.1",
@@ -71,8 +73,8 @@
     "@types/picomatch": "^4.0.0",
     "@types/react": "~19.3.0",
     "@vercel/ncc": "^0.38.3",
-    "expo-dev-client": "58.0.9",
-    "expo-module-scripts": "56.0.4",
+    "expo-dev-client": "58.0.10",
+    "expo-module-scripts": "56.0.5",
     "express": "^5.1.0",
     "form-data": "^4.0.4",
     "memfs": "^3.2.0",

package/scripts/create-updates-resources-ios.sh

@@ -50,5 +50,7 @@ else
   exit 1
 fi
 
-"${EXPO_UPDATES_PACKAGE_DIR}/scripts/with-node.sh" "${EXPO_UPDATES_PACKAGE_DIR}/utils/build/createUpdatesResources.js" ios "$PROJECT_ROOT" "$RESOURCE_DEST" "$CREATE_UPDATES_RESOURCES_MODE" "$ENTRY_FILE"
+CONFIG_MODE=$([[ "$CONFIGURATION" == *Debug* ]] && echo development || echo production)
+
+"${EXPO_UPDATES_PACKAGE_DIR}/scripts/with-node.sh" "${EXPO_UPDATES_PACKAGE_DIR}/utils/build/createUpdatesResources.js" ios "$PROJECT_ROOT" "$RESOURCE_DEST" "$CREATE_UPDATES_RESOURCES_MODE" "$ENTRY_FILE" "$CONFIG_MODE"
 

package/utils/build/createManifestForBuildAsync.js

@@ -8,6 +8,13 @@ Object.defineProperty(exports, "createManifestForBuildAsync", {
         return createManifestForBuildAsync;
     }
 });
+function _assetutils() {
+    const data = require("@react-native/asset-utils");
+    _assetutils = function() {
+        return data;
+    };
+    return data;
+}
 function _crypto() {
     const data = /*#__PURE__*/ _interop_require_default(require("crypto"));
     _crypto = function() {
@@ -102,7 +109,7 @@ async function createManifestForBuildAsync(platform, projectRoot, destinationDir
                 manifest.assets.push({
                     ...baseAssetInfoForManifest,
                     scales: asset.scales,
-                    resourcesFilename: getAndroidResourceIdentifier(asset),
+                    resourcesFilename: (0, _assetutils().getAndroidResourceIdentifier)(asset),
                     resourcesFolder: getAndroidResourceFolderName(asset)
                 });
             }
@@ -111,27 +118,16 @@ async function createManifestForBuildAsync(platform, projectRoot, destinationDir
     _fs().default.writeFileSync(_path().default.join(destinationDir, 'app.manifest'), JSON.stringify(manifest));
 }
 function getAndroidResourceFolderName(asset) {
-    return _unstableexpoupdatescliexports().drawableFileTypes.has(asset.type) ? 'drawable' : 'raw';
-}
-// copied from react-native/Libraries/Image/assetPathUtils.js
-function getAndroidResourceIdentifier(asset) {
-    const folderPath = getBasePath(asset);
-    return (folderPath + '/' + asset.name).toLowerCase().replace(/\//g, '_') // Encode folder structure in file name
-    .replace(/([^a-z0-9_])/g, '') // Remove illegal chars
-    .replace(/^assets_/, ''); // Remove "assets_" prefix
+    return _assetutils().drawableFileTypes.has(asset.type) ? 'drawable' : 'raw';
 }
 function getIosDestinationDir(asset) {
     // react-native-cli replaces `..` with `_` when embedding assets in the iOS app bundle
     // https://github.com/react-native-community/cli/blob/0a93be1a42ed1fb05bb0ebf3b82d58b2dd920614/packages/cli/src/commands/bundle/getAssetDestPathIOS.ts
     return getBasePath(asset).replace(/\.\.\//g, '_');
 }
-// copied from react-native/Libraries/Image/assetPathUtils.js
 function getBasePath(asset) {
-    let basePath = asset.httpServerLocation;
-    if (basePath[0] === '/') {
-        basePath = basePath.substr(1);
-    }
-    return basePath;
+    const basePath = asset.httpServerLocation;
+    return basePath.startsWith('/') ? basePath.slice(1) : basePath;
 }
 
 //# sourceMappingURL=createManifestForBuildAsync.js.map

package/utils/build/createManifestForBuildAsync.js.map

@@ -1 +1 @@
-{"version":3,"sources":["createManifestForBuildAsync.ts"],"sourcesContent":[null],"names":["createManifestForBuildAsync","platform","projectRoot","destinationDir","entryFileArg","entryFile","process","env","ENTRY_FILE","resolveEntryPoint","chdir","options","minify","dev","CONFIGURATION","sourcemapUseAbsolutePath","resetCache","server","bundleRequest","createMetroServerAndBundleRequestAsync","assets","exportEmbedAssetsAsync","e","Error","message","end","manifest","id","crypto","randomUUID","commitTime","Date","getTime","forEach","asset","fileHashes","platformScales","Set","filterPlatformAssetScales","scales","scale","index","has","baseAssetInfoForManifest","name","type","packagerHash","subdirectory","httpServerLocation","push","nsBundleDir","getIosDestinationDir","nsBundleFilename","resourcesFilename","getAndroidResourceIdentifier","resourcesFolder","getAndroidResourceFolderName","fs","writeFileSync","path","join","JSON","stringify","drawableFileTypes","folderPath","getBasePath","toLowerCase","replace","basePath","substr"],"mappings":"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"}
+{"version":3,"sources":["createManifestForBuildAsync.ts"],"sourcesContent":[null],"names":["createManifestForBuildAsync","platform","projectRoot","destinationDir","entryFileArg","entryFile","process","env","ENTRY_FILE","resolveEntryPoint","chdir","options","minify","dev","CONFIGURATION","sourcemapUseAbsolutePath","resetCache","server","bundleRequest","createMetroServerAndBundleRequestAsync","assets","exportEmbedAssetsAsync","e","Error","message","end","manifest","id","crypto","randomUUID","commitTime","Date","getTime","forEach","asset","fileHashes","platformScales","Set","filterPlatformAssetScales","scales","scale","index","has","baseAssetInfoForManifest","name","type","packagerHash","subdirectory","httpServerLocation","push","nsBundleDir","getIosDestinationDir","nsBundleFilename","resourcesFilename","getAndroidResourceIdentifier","resourcesFolder","getAndroidResourceFolderName","fs","writeFileSync","path","join","JSON","stringify","drawableFileTypes","getBasePath","replace","basePath","startsWith","slice"],"mappings":";;;;+BAcsBA;;;eAAAA;;;;yBAb0C;;;;;;;gEAC7C;;;;;;;yBAEe;;;;;;;yBAI3B;;;;;;;gEACQ;;;;;;;gEACE;;;;;;2CAEyB;;;;;;AAEnC,eAAeA,4BACpBC,QAA2B,EAC3BC,WAAmB,EACnBC,cAAsB,EACtBC,YAAqB;IAErB,MAAMC,YACJD,gBACAE,QAAQC,GAAG,CAACC,UAAU,IACtBC,IAAAA,0BAAiB,EAACP,aAAa;QAAED;IAAS,MAC1C;IAEFK,QAAQI,KAAK,CAACR;IAEd,MAAMS,UAAU;QACdV;QACAI;QACAO,QAAQ;QACRC,KAAKP,QAAQC,GAAG,CAACO,aAAa,KAAK;QACnCC,0BAA0B;QAC1BC,YAAY;IACd;IAEA,MAAM,EAAEC,MAAM,EAAEC,aAAa,EAAE,GAAG,MAAMC,IAAAA,uEAAsC,EAC5EjB,aACAS;IAGF,IAAIS;IACJ,IAAI;QACFA,SAAS,MAAMC,IAAAA,uDAAsB,EAACJ,QAAQC,eAAehB,aAAaS;IAC5E,EAAE,OAAOW,GAAQ;QACf,MAAM,IAAIC,MACR,iHACED,EAAEE,OAAO;IAEf,SAAU;QACRP,OAAOQ,GAAG;IACZ;IAEA,MAAMC,WAA6B;QACjCC,IAAIC,iBAAM,CAACC,UAAU;QACrBC,YAAY,IAAIC,OAAOC,OAAO;QAC9BZ,QAAQ,EAAE;IACZ;IAEAA,OAAOa,OAAO,CAAC,SAAUC,KAAK;QAC5B,IAAI,CAACA,MAAMC,UAAU,EAAE;YACrB,MAAM,IAAIZ,MACR;QAEJ;QACA,MAAMa,iBAAiB,IAAIC,IAAIC,IAAAA,oDAAyB,EAACrC,UAAUiC,MAAMK,MAAM;QAC/EL,MAAMK,MAAM,CAACN,OAAO,CAAC,SAAUO,KAAK,EAAEC,KAAK;YACzC,IAAI,CAACL,eAAeM,GAAG,CAACF,QAAQ;gBAC9B;YACF;YACA,MAAMG,2BAA2B;gBAC/BC,MAAMV,MAAMU,IAAI;gBAChBC,MAAMX,MAAMW,IAAI;gBAChBL;gBACAM,cAAcZ,MAAMC,UAAU,CAACM,MAAM;gBACrCM,cAAcb,MAAMc,kBAAkB;YACxC;YACA,IAAI/C,aAAa,OAAO;gBACtByB,SAASN,MAAM,CAAC6B,IAAI,CAAC;oBACnB,GAAGN,wBAAwB;oBAC3BO,aAAaC,qBAAqBjB;oBAClCkB,kBAAkBZ,UAAU,IAAIN,MAAMU,IAAI,GAAGV,MAAMU,IAAI,GAAG,MAAMJ,QAAQ;gBAC1E;YACF,OAAO,IAAIvC,aAAa,WAAW;gBACjCyB,SAASN,MAAM,CAAC6B,IAAI,CAAC;oBACnB,GAAGN,wBAAwB;oBAC3BJ,QAAQL,MAAMK,MAAM;oBACpBc,mBAAmBC,IAAAA,0CAA4B,EAACpB;oBAChDqB,iBAAiBC,6BAA6BtB;gBAChD;YACF;QACF;IACF;IAEAuB,aAAE,CAACC,aAAa,CAACC,eAAI,CAACC,IAAI,CAACzD,gBAAgB,iBAAiB0D,KAAKC,SAAS,CAACpC;AAC7E;AAEA,SAAS8B,6BAA6BtB,KAAsB;IAC1D,OAAO6B,+BAAiB,CAACrB,GAAG,CAACR,MAAMW,IAAI,IAAI,aAAa;AAC1D;AAEA,SAASM,qBAAqBjB,KAAsB;IAClD,sFAAsF;IACtF,sJAAsJ;IACtJ,OAAO8B,YAAY9B,OAAO+B,OAAO,CAAC,WAAW;AAC/C;AAEA,SAASD,YAAY9B,KAAsB;IACzC,MAAMgC,WAAWhC,MAAMc,kBAAkB;IACzC,OAAOkB,SAASC,UAAU,CAAC,OAAOD,SAASE,KAAK,CAAC,KAAKF;AACxD"}

package/utils/build/createUpdatesResources.js

@@ -2,6 +2,13 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
+function _env() {
+    const data = require("@expo/env");
+    _env = function() {
+        return data;
+    };
+    return data;
+}
 function _assert() {
     const data = /*#__PURE__*/ _interop_require_default(require("assert"));
     _assert = function() {
@@ -39,6 +46,11 @@ function _interop_require_default(obj) {
         throw new Error(`Unsupported createUpdatesResourcesMode: ${createUpdatesResourcesMode}`);
     }
     const entryFileArg = process.argv[6];
+    const mode = process.argv[7];
+    process.env = (0, _env().getOriginalEnv)();
+    (0, _env().logLoadedEnv)((0, _env().loadProjectEnv)(possibleProjectRoot, {
+        mode
+    }));
     await Promise.all([
         createUpdatesResourcesMode === 'all' ? (0, _createManifestForBuildAsync.createManifestForBuildAsync)(platform, possibleProjectRoot, destinationDir, entryFileArg) : null,
         (0, _createFingerprintForBuildAsync.createFingerprintForBuildAsync)(platform, possibleProjectRoot, destinationDir)

package/utils/build/createUpdatesResources.js.map

@@ -1 +1 @@
-{"version":3,"sources":["createUpdatesResources.ts"],"sourcesContent":[null],"names":["platform","process","argv","includes","Error","projectRootArg","assert","possibleProjectRoot","findUpProjectRoot","destinationDir","createUpdatesResourcesMode","entryFileArg","Promise","all","createManifestForBuildAsync","createFingerprintForBuildAsync","catch","e","message","console","error","exit"],"mappings":";;;;;gEAAmB;;;;;;gDAE4B;6CACH;mCACV;;;;;;AAEjC,CAAA;IACC,MAAMA,WAAWC,QAAQC,IAAI,CAAC,EAAE;IAChC,IAAI,CAAC;QAAC;QAAO;KAAU,CAACC,QAAQ,CAACH,WAAW;QAC1C,MAAM,IAAII,MAAM,CAAC,sBAAsB,EAAEJ,UAAU;IACrD;IAEA,MAAMK,iBAAiBJ,QAAQC,IAAI,CAAC,EAAE;IACtCI,IAAAA,iBAAM,EAACD,gBAAgB;IAEvB,MAAME,sBAAsBC,IAAAA,oCAAiB,EAACH;IAC9CC,IAAAA,iBAAM,EAACC,qBAAqB;IAE5B,MAAME,iBAAiBR,QAAQC,IAAI,CAAC,EAAE;IACtCI,IAAAA,iBAAM,EAACG,gBAAgB;IAEvB,MAAMC,6BAA6BT,QAAQC,IAAI,CAAC,EAAE;IAElD,IACEQ,8BAA8B,QAC9B,CAAC;QAAC;QAAO;KAAmB,CAACP,QAAQ,CAACO,6BACtC;QACA,MAAM,IAAIN,MAAM,CAAC,wCAAwC,EAAEM,4BAA4B;IACzF;IAEA,MAAMC,eAAeV,QAAQC,IAAI,CAAC,EAAE;IAEpC,MAAMU,QAAQC,GAAG,CAAC;QAChBH,+BAA+B,QAC3BI,IAAAA,wDAA2B,EAACd,UAAUO,qBAAqBE,gBAAgBE,gBAC3E;QACJI,IAAAA,8DAA8B,EAACf,UAAUO,qBAAqBE;KAC/D;AACH,CAAA,IAAKO,KAAK,CAAC,CAACC;IACV,8FAA8F;IAC9FA,EAAEC,OAAO,GAAG,CAAC,2BAA2B,EAAED,EAAEC,OAAO,CAAC,2BAA2B,CAAC;IAChFC,QAAQC,KAAK,CAACH;IACdhB,QAAQoB,IAAI,CAAC;AACf"}
+{"version":3,"sources":["createUpdatesResources.ts"],"sourcesContent":[null],"names":["platform","process","argv","includes","Error","projectRootArg","assert","possibleProjectRoot","findUpProjectRoot","destinationDir","createUpdatesResourcesMode","entryFileArg","mode","env","getOriginalEnv","logLoadedEnv","loadProjectEnv","Promise","all","createManifestForBuildAsync","createFingerprintForBuildAsync","catch","e","message","console","error","exit"],"mappings":";;;;;yBAA6D;;;;;;;gEAC1C;;;;;;gDAE4B;6CACH;mCACV;;;;;;AAEjC,CAAA;IACC,MAAMA,WAAWC,QAAQC,IAAI,CAAC,EAAE;IAChC,IAAI,CAAC;QAAC;QAAO;KAAU,CAACC,QAAQ,CAACH,WAAW;QAC1C,MAAM,IAAII,MAAM,CAAC,sBAAsB,EAAEJ,UAAU;IACrD;IAEA,MAAMK,iBAAiBJ,QAAQC,IAAI,CAAC,EAAE;IACtCI,IAAAA,iBAAM,EAACD,gBAAgB;IAEvB,MAAME,sBAAsBC,IAAAA,oCAAiB,EAACH;IAC9CC,IAAAA,iBAAM,EAACC,qBAAqB;IAE5B,MAAME,iBAAiBR,QAAQC,IAAI,CAAC,EAAE;IACtCI,IAAAA,iBAAM,EAACG,gBAAgB;IAEvB,MAAMC,6BAA6BT,QAAQC,IAAI,CAAC,EAAE;IAElD,IACEQ,8BAA8B,QAC9B,CAAC;QAAC;QAAO;KAAmB,CAACP,QAAQ,CAACO,6BACtC;QACA,MAAM,IAAIN,MAAM,CAAC,wCAAwC,EAAEM,4BAA4B;IACzF;IAEA,MAAMC,eAAeV,QAAQC,IAAI,CAAC,EAAE;IACpC,MAAMU,OAAOX,QAAQC,IAAI,CAAC,EAAE;IAE5BD,QAAQY,GAAG,GAAGC,IAAAA,qBAAc;IAC5BC,IAAAA,mBAAY,EAACC,IAAAA,qBAAc,EAACT,qBAAqB;QAAEK;IAAK;IAExD,MAAMK,QAAQC,GAAG,CAAC;QAChBR,+BAA+B,QAC3BS,IAAAA,wDAA2B,EAACnB,UAAUO,qBAAqBE,gBAAgBE,gBAC3E;QACJS,IAAAA,8DAA8B,EAACpB,UAAUO,qBAAqBE;KAC/D;AACH,CAAA,IAAKY,KAAK,CAAC,CAACC;IACV,8FAA8F;IAC9FA,EAAEC,OAAO,GAAG,CAAC,2BAA2B,EAAED,EAAEC,OAAO,CAAC,2BAA2B,CAAC;IAChFC,QAAQC,KAAK,CAACH;IACdrB,QAAQyB,IAAI,CAAC;AACf"}

package/utils/src/createManifestForBuildAsync.ts

@@ -1,9 +1,9 @@
 import type { HashedAssetData } from '@expo/metro-config/build/transform-worker/getAssets';
+import { drawableFileTypes, getAndroidResourceIdentifier } from '@react-native/asset-utils';
 import crypto from 'crypto';
 import type { EmbeddedManifest } from 'expo-manifests';
 import { resolveEntryPoint } from 'expo/config/paths';
 import {
-  drawableFileTypes,
   createMetroServerAndBundleRequestAsync,
   exportEmbedAssetsAsync,
 } from 'expo/internal/unstable-expo-updates-cli-exports';
@@ -97,17 +97,7 @@ export async function createManifestForBuildAsync(
 }
 
 function getAndroidResourceFolderName(asset: HashedAssetData) {
-  return (drawableFileTypes as Set<string>).has(asset.type) ? 'drawable' : 'raw';
-}
-
-// copied from react-native/Libraries/Image/assetPathUtils.js
-function getAndroidResourceIdentifier(asset: HashedAssetData) {
-  const folderPath = getBasePath(asset);
-  return (folderPath + '/' + asset.name)
-    .toLowerCase()
-    .replace(/\//g, '_') // Encode folder structure in file name
-    .replace(/([^a-z0-9_])/g, '') // Remove illegal chars
-    .replace(/^assets_/, ''); // Remove "assets_" prefix
+  return drawableFileTypes.has(asset.type) ? 'drawable' : 'raw';
 }
 
 function getIosDestinationDir(asset: HashedAssetData) {
@@ -116,11 +106,7 @@ function getIosDestinationDir(asset: HashedAssetData) {
   return getBasePath(asset).replace(/\.\.\//g, '_');
 }
 
-// copied from react-native/Libraries/Image/assetPathUtils.js
 function getBasePath(asset: HashedAssetData) {
-  let basePath = asset.httpServerLocation;
-  if (basePath[0] === '/') {
-    basePath = basePath.substr(1);
-  }
-  return basePath;
+  const basePath = asset.httpServerLocation;
+  return basePath.startsWith('/') ? basePath.slice(1) : basePath;
 }

package/utils/src/createUpdatesResources.ts

@@ -1,3 +1,4 @@
+import { getOriginalEnv, loadProjectEnv, logLoadedEnv } from '@expo/env';
 import assert from 'assert';
 
 import { createFingerprintForBuildAsync } from './createFingerprintForBuildAsync';
@@ -29,6 +30,10 @@ import { findUpProjectRoot } from './findUpProjectRoot';
   }
 
   const entryFileArg = process.argv[6];
+  const mode = process.argv[7];
+
+  process.env = getOriginalEnv();
+  logLoadedEnv(loadProjectEnv(possibleProjectRoot, { mode }));
 
   await Promise.all([
     createUpdatesResourcesMode === 'all'