expo-updates 0.13.0 → 0.13.3

package/CHANGELOG.md

@@ -10,6 +10,25 @@
 
 ### 💡 Others
 
+## 0.13.3 — 2022-07-07
+
+### 🐛 Bug fixes
+
+- Fix proguard support in Android builds. ([#18035](https://github.com/expo/expo/pull/18035) by [@esamelson](https://github.com/esamelson))
+
+## 0.13.2 — 2022-06-03
+
+### 🐛 Bug fixes
+
+- Android: Allow null asset hash in new manifests. ([#17466](https://github.com/expo/expo/pull/17466) by [@wschurman](https://github.com/wschurman))
+- Android: Fix asset hash storage. ([#17732](https://github.com/expo/expo/pull/17732) by [@wschurman](https://github.com/wschurman))
+
+## 0.13.1 — 2022-05-05
+
+### 🐛 Bug fixes
+
+- Improved support of nvm sourcing in iOS shell scripts. ([#17109](https://github.com/expo/expo/pull/17109) by [@liamronancb](https://github.com/liamronancb))
+
 ## 0.13.0 — 2022-04-21
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.13.0'
+version = '0.13.3'
 
 apply from: "../scripts/create-manifest-android.gradle"
 
@@ -77,7 +77,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 31
-    versionName '0.13.0'
+    versionName '0.13.3'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     // uncomment below to export the database schema when making changes

package/android/proguard-rules.pro

@@ -1,3 +1,7 @@
 -keepclassmembers class com.facebook.react.ReactInstanceManager {
   private final com.facebook.react.bridge.JSBundleLoader mBundleLoader;
 }
+
+-keepclassmembers class com.facebook.react.devsupport.DisabledDevSupportManager {
+  private final com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler mDefaultNativeModuleCallExceptionHandler;
+}

package/android/src/main/java/expo/modules/updates/db/UpdatesDatabase.kt

@@ -19,7 +19,7 @@ import java.util.*
 @Database(
   entities = [UpdateEntity::class, UpdateAssetEntity::class, AssetEntity::class, JSONDataEntity::class],
   exportSchema = false,
-  version = 10
+  version = 11
 )
 @TypeConverters(Converters::class)
 abstract class UpdatesDatabase : RoomDatabase() {
@@ -43,6 +43,7 @@ abstract class UpdatesDatabase : RoomDatabase() {
           .addMigrations(MIGRATION_7_8)
           .addMigrations(MIGRATION_8_9)
           .addMigrations(MIGRATION_9_10)
+          .addMigrations(MIGRATION_10_11)
           .fallbackToDestructiveMigration()
           .allowMainThreadQueries()
           .build()
@@ -50,6 +51,16 @@ abstract class UpdatesDatabase : RoomDatabase() {
       return instance!!
     }
 
+    private fun SupportSQLiteDatabase.runInTransaction(block: SupportSQLiteDatabase.() -> Unit) {
+      beginTransaction()
+      try {
+        block()
+        setTransactionSuccessful()
+      } finally {
+        endTransaction()
+      }
+    }
+
     private fun SupportSQLiteDatabase.runInTransactionWithForeignKeysOff(block: SupportSQLiteDatabase.() -> Unit) {
       // https://www.sqlite.org/lang_altertable.html#otheralter
       try {
@@ -150,18 +161,16 @@ abstract class UpdatesDatabase : RoomDatabase() {
 
     val MIGRATION_9_10: Migration = object : Migration(9, 10) {
       override fun migrate(database: SupportSQLiteDatabase) {
-        // https://www.sqlite.org/lang_altertable.html#otheralter
-        try {
-          database.execSQL("PRAGMA foreign_keys=OFF")
-          database.beginTransaction()
-          try {
-            database.execSQL("ALTER TABLE `assets` ADD COLUMN `expected_hash` TEXT")
-            database.setTransactionSuccessful()
-          } finally {
-            database.endTransaction()
-          }
-        } finally {
-          database.execSQL("PRAGMA foreign_keys=ON")
+        database.runInTransactionWithForeignKeysOff {
+          execSQL("ALTER TABLE `assets` ADD COLUMN `expected_hash` TEXT")
+        }
+      }
+    }
+
+    val MIGRATION_10_11: Migration = object : Migration(10, 11) {
+      override fun migrate(database: SupportSQLiteDatabase) {
+        database.runInTransaction {
+          execSQL("UPDATE `assets` SET `expected_hash` = NULL")
         }
       }
     }

package/android/src/main/java/expo/modules/updates/manifest/NewUpdateManifest.kt

@@ -68,7 +68,7 @@ class NewUpdateManifest private constructor(
           extraRequestHeaders = assetHeaders[mLaunchAsset.getString("key")]
           isLaunchAsset = true
           embeddedAssetFilename = EmbeddedLoader.BUNDLE_FILENAME
-          expectedHash = mLaunchAsset.getString("hash")
+          expectedHash = mLaunchAsset.getNullable("hash")
         }
       )
     } catch (e: JSONException) {
@@ -86,7 +86,7 @@ class NewUpdateManifest private constructor(
               url = Uri.parse(assetObject.getString("url"))
               extraRequestHeaders = assetHeaders[assetObject.getString("key")]
               embeddedAssetFilename = assetObject.getNullable("embeddedAssetFilename")
-              expectedHash = mLaunchAsset.getString("hash")
+              expectedHash = assetObject.getNullable("hash")
             }
           )
         } catch (e: JSONException) {

package/build-cli/cli.js

@@ -9,7 +9,7 @@ const commands = {
     'codesigning:generate': () => Promise.resolve().then(() => tslib_1.__importStar(require('./generateCodeSigning'))).then((i) => i.generateCodeSigning),
     'codesigning:configure': () => Promise.resolve().then(() => tslib_1.__importStar(require('./configureCodeSigning'))).then((i) => i.configureCodeSigning),
 };
-const args = arg_1.default({
+const args = (0, arg_1.default)({
     // Types
     '--help': Boolean,
     // Aliases
@@ -21,7 +21,7 @@ const command = args._[0];
 const commandArgs = args._.slice(1);
 // Handle `--help` flag
 if (args['--help'] || !command) {
-    console.log(chalk_1.default `
+    console.log((0, chalk_1.default) `
     {bold Usage}
       {bold $} expo-updates <command>
 

package/build-cli/configureCodeSigning.js

@@ -7,7 +7,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const args_1 = require("./utils/args");
 const Log = tslib_1.__importStar(require("./utils/log"));
 const configureCodeSigning = async (argv) => {
-    const args = args_1.assertArgs({
+    const args = (0, args_1.assertArgs)({
         // Types
         '--help': Boolean,
         '--certificate-input-directory': String,
@@ -16,7 +16,7 @@ const configureCodeSigning = async (argv) => {
         '-h': '--help',
     }, argv !== null && argv !== void 0 ? argv : []);
     if (args['--help']) {
-        Log.exit(chalk_1.default `
+        Log.exit((0, chalk_1.default) `
       {bold Description}
       Configure and validate expo-updates code signing for this project
 
@@ -30,9 +30,9 @@ const configureCodeSigning = async (argv) => {
     `, 0);
     }
     const { configureCodeSigningAsync } = await Promise.resolve().then(() => tslib_1.__importStar(require('./configureCodeSigningAsync')));
-    const certificateInput = args_1.requireArg(args, '--certificate-input-directory');
-    const keyInput = args_1.requireArg(args, '--key-input-directory');
-    return await configureCodeSigningAsync(args_1.getProjectRoot(args), {
+    const certificateInput = (0, args_1.requireArg)(args, '--certificate-input-directory');
+    const keyInput = (0, args_1.requireArg)(args, '--key-input-directory');
+    return await configureCodeSigningAsync((0, args_1.getProjectRoot)(args), {
         certificateInput,
         keyInput,
     });

package/build-cli/configureCodeSigningAsync.js

@@ -16,10 +16,10 @@ async function configureCodeSigningAsync(projectRoot, { certificateInput, keyInp
         fs_1.promises.readFile(path_1.default.join(keyInputDir, 'private-key.pem'), 'utf8'),
         fs_1.promises.readFile(path_1.default.join(keyInputDir, 'public-key.pem'), 'utf8'),
     ]);
-    const certificate = code_signing_certificates_1.convertCertificatePEMToCertificate(certificatePEM);
-    const keyPair = code_signing_certificates_1.convertKeyPairPEMToKeyPair({ privateKeyPEM, publicKeyPEM });
-    code_signing_certificates_1.validateSelfSignedCertificate(certificate, keyPair);
-    const { exp } = config_1.getConfig(projectRoot, { skipSDKVersionRequirement: true });
+    const certificate = (0, code_signing_certificates_1.convertCertificatePEMToCertificate)(certificatePEM);
+    const keyPair = (0, code_signing_certificates_1.convertKeyPairPEMToKeyPair)({ privateKeyPEM, publicKeyPEM });
+    (0, code_signing_certificates_1.validateSelfSignedCertificate)(certificate, keyPair);
+    const { exp } = (0, config_1.getConfig)(projectRoot, { skipSDKVersionRequirement: true });
     const fields = {
         codeSigningCertificate: `./${path_1.default.relative(projectRoot, certificateInputDir)}/certificate.pem`,
         codeSigningMetadata: {
@@ -27,7 +27,7 @@ async function configureCodeSigningAsync(projectRoot, { certificateInput, keyInp
             alg: 'rsa-v1_5-sha256',
         },
     };
-    await modifyConfigAsync_1.attemptModification(projectRoot, {
+    await (0, modifyConfigAsync_1.attemptModification)(projectRoot, {
         updates: {
             ...exp.updates,
             ...fields,
@@ -37,6 +37,6 @@ async function configureCodeSigningAsync(projectRoot, { certificateInput, keyInp
             ...fields,
         },
     });
-    log_1.log(`Code signing configuration written to app.json.`);
+    (0, log_1.log)(`Code signing configuration written to app.json.`);
 }
 exports.configureCodeSigningAsync = configureCodeSigningAsync;

package/build-cli/generateCodeSigning.js

@@ -7,7 +7,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const args_1 = require("./utils/args");
 const Log = tslib_1.__importStar(require("./utils/log"));
 const generateCodeSigning = async (argv) => {
-    const args = args_1.assertArgs({
+    const args = (0, args_1.assertArgs)({
         // Types
         '--help': Boolean,
         '--key-output-directory': String,
@@ -18,7 +18,7 @@ const generateCodeSigning = async (argv) => {
         '-h': '--help',
     }, argv !== null && argv !== void 0 ? argv : []);
     if (args['--help']) {
-        Log.exit(chalk_1.default `
+        Log.exit((0, chalk_1.default) `
       {bold Description}
       Generate expo-updates private key, public key, and code signing certificate using that public key (self-signed by the private key)
 
@@ -34,11 +34,11 @@ const generateCodeSigning = async (argv) => {
     `, 0);
     }
     const { generateCodeSigningAsync } = await Promise.resolve().then(() => tslib_1.__importStar(require('./generateCodeSigningAsync')));
-    const keyOutput = args_1.requireArg(args, '--key-output-directory');
-    const certificateOutput = args_1.requireArg(args, '--certificate-output-directory');
-    const certificateValidityDurationYears = args_1.requireArg(args, '--certificate-validity-duration-years');
-    const certificateCommonName = args_1.requireArg(args, '--certificate-common-name');
-    return await generateCodeSigningAsync(args_1.getProjectRoot(args), {
+    const keyOutput = (0, args_1.requireArg)(args, '--key-output-directory');
+    const certificateOutput = (0, args_1.requireArg)(args, '--certificate-output-directory');
+    const certificateValidityDurationYears = (0, args_1.requireArg)(args, '--certificate-validity-duration-years');
+    const certificateCommonName = (0, args_1.requireArg)(args, '--certificate-common-name');
+    return await generateCodeSigningAsync((0, args_1.getProjectRoot)(args), {
         certificateValidityDurationYears,
         keyOutput,
         certificateOutput,

package/build-cli/generateCodeSigningAsync.js

@@ -12,32 +12,32 @@ async function generateCodeSigningAsync(projectRoot, { certificateValidityDurati
     const validityDurationYears = Math.floor(certificateValidityDurationYears);
     const certificateOutputDir = path_1.default.resolve(projectRoot, certificateOutput);
     const keyOutputDir = path_1.default.resolve(projectRoot, keyOutput);
-    await Promise.all([fs_extra_1.ensureDir(certificateOutputDir), fs_extra_1.ensureDir(keyOutputDir)]);
+    await Promise.all([(0, fs_extra_1.ensureDir)(certificateOutputDir), (0, fs_extra_1.ensureDir)(keyOutputDir)]);
     const [certificateOutputDirContents, keyOutputDirContents] = await Promise.all([
         fs_1.promises.readdir(certificateOutputDir),
         fs_1.promises.readdir(keyOutputDir),
     ]);
-    assert_1.default(certificateOutputDirContents.length === 0, 'Certificate output directory must be empty');
-    assert_1.default(keyOutputDirContents.length === 0, 'Key output directory must be empty');
-    const keyPair = code_signing_certificates_1.generateKeyPair();
+    (0, assert_1.default)(certificateOutputDirContents.length === 0, 'Certificate output directory must be empty');
+    (0, assert_1.default)(keyOutputDirContents.length === 0, 'Key output directory must be empty');
+    const keyPair = (0, code_signing_certificates_1.generateKeyPair)();
     const validityNotBefore = new Date();
     const validityNotAfter = new Date();
     validityNotAfter.setFullYear(validityNotAfter.getFullYear() + validityDurationYears);
-    const certificate = code_signing_certificates_1.generateSelfSignedCodeSigningCertificate({
+    const certificate = (0, code_signing_certificates_1.generateSelfSignedCodeSigningCertificate)({
         keyPair,
         validityNotBefore,
         validityNotAfter,
         commonName: certificateCommonName,
     });
-    const keyPairPEM = code_signing_certificates_1.convertKeyPairToPEM(keyPair);
-    const certificatePEM = code_signing_certificates_1.convertCertificateToCertificatePEM(certificate);
+    const keyPairPEM = (0, code_signing_certificates_1.convertKeyPairToPEM)(keyPair);
+    const certificatePEM = (0, code_signing_certificates_1.convertCertificateToCertificatePEM)(certificate);
     await Promise.all([
         fs_1.promises.writeFile(path_1.default.join(keyOutputDir, 'public-key.pem'), keyPairPEM.publicKeyPEM),
         fs_1.promises.writeFile(path_1.default.join(keyOutputDir, 'private-key.pem'), keyPairPEM.privateKeyPEM),
         fs_1.promises.writeFile(path_1.default.join(certificateOutputDir, 'certificate.pem'), certificatePEM),
     ]);
-    log_1.log(`Generated public and private keys output in ${keyOutputDir}. Remember to add them to .gitignore or to encrypt them. (e.g. with git-crypt)`);
-    log_1.log(`Generated code signing certificate output in ${certificateOutputDir}.`);
-    log_1.log(`To automatically configure this project for code signing, run \`yarn expo-updates codesigning:configure --certificate-input-directory=${certificateOutput} --key-input-directory=${keyOutput}\`.`);
+    (0, log_1.log)(`Generated public and private keys output in ${keyOutputDir}. Remember to add them to .gitignore or to encrypt them. (e.g. with git-crypt)`);
+    (0, log_1.log)(`Generated code signing certificate output in ${certificateOutputDir}.`);
+    (0, log_1.log)(`To automatically configure this project for code signing, run \`yarn expo-updates codesigning:configure --certificate-input-directory=${certificateOutput} --key-input-directory=${keyOutput}\`.`);
 }
 exports.generateCodeSigningAsync = generateCodeSigningAsync;

package/build-cli/utils/args.js

@@ -14,8 +14,8 @@ const Log = tslib_1.__importStar(require("./log"));
  * @returns valid project directory.
  */
 function getProjectRoot(args) {
-    const projectRoot = path_1.resolve(args._[0] || '.');
-    if (!fs_1.existsSync(projectRoot)) {
+    const projectRoot = (0, path_1.resolve)(args._[0] || '.');
+    if (!(0, fs_1.existsSync)(projectRoot)) {
         Log.exit(`Invalid project root: ${projectRoot}`);
     }
     return projectRoot;
@@ -30,7 +30,7 @@ exports.getProjectRoot = getProjectRoot;
  */
 function assertArgs(schema, argv) {
     try {
-        return arg_1.default(schema, { argv });
+        return (0, arg_1.default)(schema, { argv });
     }
     catch (error) {
         // Ensure unknown options are handled the same way.

package/build-cli/utils/modifyConfigAsync.js

@@ -7,7 +7,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const Log = tslib_1.__importStar(require("./log"));
 /** Wraps `[@expo/config] modifyConfigAsync()` and adds additional logging. */
 async function attemptModification(projectRoot, edits, exactEdits) {
-    const modification = await config_1.modifyConfigAsync(projectRoot, edits, {
+    const modification = await (0, config_1.modifyConfigAsync)(projectRoot, edits, {
         skipSDKVersionRequirement: true,
     });
     if (modification.type === 'success') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.13.0",
+  "version": "0.13.3",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -64,5 +64,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "0f796e10a2b2f258c40f9d56aa141c372cd63fc1"
+  "gitHead": "6c7bf5038ccdfbe3e881f86d63ab92b8314ec2c1"
 }

package/scripts/source-login-scripts.sh

@@ -9,6 +9,11 @@
 
 current_shell=$(ps -cp "$$" -o comm='' | sed 's/^-//')
 
+# attempt to source via nvm
+if [ -f "$HOME/.nvm/nvm.sh" ]; then
+  . "$HOME/.nvm/nvm.sh"
+fi
+
 if [[ "$current_shell" == zsh ]]; then
    # Zsh's setup script order is:
    #   /etc/zshenv