expo-mail-composer 12.6.0 → 12.7.1

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 12.7.1 — 2023-12-19
+
+_This version does not introduce any user-facing changes._
+
+## 12.7.0 — 2023-11-14
+
+### 🛠 Breaking changes
+
+- Bumped iOS deployment target to 13.4. ([#25063](https://github.com/expo/expo/pull/25063) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- On `Android` bump `compileSdkVersion` and `targetSdkVersion` to `34`. ([#24708](https://github.com/expo/expo/pull/24708) by [@alanjhughes](https://github.com/alanjhughes))
+
+### 💡 Others
+
+- Migrate to new standard `URL` support on native. ([#24941](https://github.com/expo/expo/pull/24941) by [@EvanBacon](https://github.com/EvanBacon))
+
 ## 12.6.0 — 2023-10-17
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '12.6.0'
+version = '12.7.1'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -61,11 +61,11 @@ if (!safeExtGet("expoProvidesDefaultConfig", false)) {
 android {
   // Remove this if and it's contents, when support for SDK49 is dropped
   if (!safeExtGet("expoProvidesDefaultConfig", false)) {
-    compileSdkVersion safeExtGet("compileSdkVersion", 33)
+    compileSdkVersion safeExtGet("compileSdkVersion", 34)
 
     defaultConfig {
       minSdkVersion safeExtGet("minSdkVersion", 23)
-      targetSdkVersion safeExtGet("targetSdkVersion", 33)
+      targetSdkVersion safeExtGet("targetSdkVersion", 34)
     }
 
     publishing {
@@ -94,7 +94,7 @@ android {
   namespace "expo.modules.mailcomposer"
   defaultConfig {
     versionCode 17
-    versionName "12.6.0"
+    versionName "12.7.1"
   }
 }
 

package/android/src/main/java/expo/modules/mailcomposer/MailIntentBuilder.kt

@@ -67,7 +67,7 @@ class MailIntentBuilder(
 
   fun putAttachments(
     intentName: String,
-    application: Application,
+    application: Application
   ) = apply {
     try {
       options.attachments?.let { requestedAttachments ->

package/android/src/main/java/expo/modules/mailcomposer/Records.kt

@@ -17,5 +17,5 @@ data class MailComposerOptions(
   @Field
   val isHtml: Boolean?,
   @Field
-  val attachments: List<String>?,
+  val attachments: List<String>?
 ) : Record

package/build/ExpoMailComposer.web.d.ts

@@ -1,6 +1,5 @@
 import { MailComposerOptions, MailComposerResult } from './MailComposer.types';
 declare const _default: {
-    readonly name: string;
     composeAsync(options: MailComposerOptions): Promise<MailComposerResult>;
     isAvailableAsync(): Promise<boolean>;
 };

package/build/ExpoMailComposer.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoMailComposer.web.d.ts","sourceRoot":"","sources":["../src/ExpoMailComposer.web.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAsB,MAAM,sBAAsB,CAAC;;;0BAwBrE,mBAAmB,GAAG,QAAQ,kBAAkB,CAAC;wBAiBnD,QAAQ,OAAO,CAAC;;AArB5C,wBAwBE"}
+{"version":3,"file":"ExpoMailComposer.web.d.ts","sourceRoot":"","sources":["../src/ExpoMailComposer.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAsB,MAAM,sBAAsB,CAAC;;0BAqBrE,mBAAmB,GAAG,QAAQ,kBAAkB,CAAC;wBAqBnD,QAAQ,OAAO,CAAC;;AAtB5C,wBAyBE"}

package/build/ExpoMailComposer.web.js

@@ -1,4 +1,3 @@
-import qs from 'query-string';
 import { MailComposerStatus } from './MailComposer.types';
 function removeNullishValues(obj) {
     for (const propName in obj) {
@@ -16,25 +15,25 @@ function checkValue(value) {
     return arr.join(',');
 }
 export default {
-    get name() {
-        return 'ExpoMailComposer';
-    },
     async composeAsync(options) {
+        if (typeof window === 'undefined') {
+            return { status: MailComposerStatus.CANCELLED };
+        }
+        const mailtoUrl = new URL('mailto:' + (checkValue(options.recipients) || ''));
         const email = removeNullishValues({
-            cc: checkValue(options.ccRecipients),
-            bcc: checkValue(options.bccRecipients),
+            cc: options.ccRecipients,
+            bcc: options.bccRecipients,
             subject: options.subject,
             body: options.body,
         });
-        const query = qs.stringify(email);
-        const queryComponent = query ? '?' + query : '';
-        const to = checkValue(options.recipients) || '';
-        const mailto = `mailto:${to}${queryComponent}`;
-        window.open(mailto);
+        Object.entries(email).forEach(([key, value]) => {
+            mailtoUrl.searchParams.append(key, value);
+        });
+        window.open(mailtoUrl.toString());
         return { status: MailComposerStatus.UNDETERMINED };
     },
     async isAvailableAsync() {
-        return true;
+        return typeof window !== 'undefined';
     },
 };
 //# sourceMappingURL=ExpoMailComposer.web.js.map

package/build/ExpoMailComposer.web.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoMailComposer.web.js","sourceRoot":"","sources":["../src/ExpoMailComposer.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,cAAc,CAAC;AAE9B,OAAO,EAA2C,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAEnG,SAAS,mBAAmB,CAAC,GAAG;IAC9B,KAAK,MAAM,QAAQ,IAAI,GAAG,EAAE;QAC1B,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE;YACzB,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC;SACtB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,UAAU,CAAC,KAAyB;IAC3C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvB,CAAC;AAED,eAAe;IACb,IAAI,IAAI;QACN,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,OAA4B;QAC7C,MAAM,KAAK,GAAG,mBAAmB,CAAC;YAChC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC;YACpC,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,aAAa,CAAC;YACtC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,UAAU,EAAE,GAAG,cAAc,EAAE,CAAC;QAE/C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEpB,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC,YAAY,EAAE,CAAC;IACrD,CAAC;IACD,KAAK,CAAC,gBAAgB;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC","sourcesContent":["import qs from 'query-string';\n\nimport { MailComposerOptions, MailComposerResult, MailComposerStatus } from './MailComposer.types';\n\nfunction removeNullishValues(obj) {\n  for (const propName in obj) {\n    if (obj[propName] == null) {\n      delete obj[propName];\n    }\n  }\n  return obj;\n}\n\nfunction checkValue(value?: string[] | string): string | null {\n  if (!value) {\n    return null;\n  }\n\n  const arr = Array.isArray(value) ? value : [value];\n  return arr.join(',');\n}\n\nexport default {\n  get name(): string {\n    return 'ExpoMailComposer';\n  },\n  async composeAsync(options: MailComposerOptions): Promise<MailComposerResult> {\n    const email = removeNullishValues({\n      cc: checkValue(options.ccRecipients),\n      bcc: checkValue(options.bccRecipients),\n      subject: options.subject,\n      body: options.body,\n    });\n\n    const query = qs.stringify(email);\n    const queryComponent = query ? '?' + query : '';\n    const to = checkValue(options.recipients) || '';\n    const mailto = `mailto:${to}${queryComponent}`;\n\n    window.open(mailto);\n\n    return { status: MailComposerStatus.UNDETERMINED };\n  },\n  async isAvailableAsync(): Promise<boolean> {\n    return true;\n  },\n};\n"]}
+{"version":3,"file":"ExpoMailComposer.web.js","sourceRoot":"","sources":["../src/ExpoMailComposer.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAEnG,SAAS,mBAAmB,CAAC,GAAG;IAC9B,KAAK,MAAM,QAAQ,IAAI,GAAG,EAAE;QAC1B,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE;YACzB,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC;SACtB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,UAAU,CAAC,KAAyB;IAC3C,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACnD,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvB,CAAC;AAED,eAAe;IACb,KAAK,CAAC,YAAY,CAAC,OAA4B;QAC7C,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YACjC,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC,SAAS,EAAE,CAAC;SACjD;QACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,SAAS,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAE9E,MAAM,KAAK,GAAG,mBAAmB,CAAC;YAChC,EAAE,EAAE,OAAO,CAAC,YAAY;YACxB,GAAG,EAAE,OAAO,CAAC,aAAa;YAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAA2B,CAAC;QAE7B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC7C,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAElC,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC,YAAY,EAAE,CAAC;IACrD,CAAC;IACD,KAAK,CAAC,gBAAgB;QACpB,OAAO,OAAO,MAAM,KAAK,WAAW,CAAC;IACvC,CAAC;CACF,CAAC","sourcesContent":["import { MailComposerOptions, MailComposerResult, MailComposerStatus } from './MailComposer.types';\n\nfunction removeNullishValues(obj) {\n  for (const propName in obj) {\n    if (obj[propName] == null) {\n      delete obj[propName];\n    }\n  }\n  return obj;\n}\n\nfunction checkValue(value?: string[] | string): string | null {\n  if (!value) {\n    return null;\n  }\n\n  const arr = Array.isArray(value) ? value : [value];\n  return arr.join(',');\n}\n\nexport default {\n  async composeAsync(options: MailComposerOptions): Promise<MailComposerResult> {\n    if (typeof window === 'undefined') {\n      return { status: MailComposerStatus.CANCELLED };\n    }\n    const mailtoUrl = new URL('mailto:' + (checkValue(options.recipients) || ''));\n\n    const email = removeNullishValues({\n      cc: options.ccRecipients,\n      bcc: options.bccRecipients,\n      subject: options.subject,\n      body: options.body,\n    }) as Record<string, string>;\n\n    Object.entries(email).forEach(([key, value]) => {\n      mailtoUrl.searchParams.append(key, value);\n    });\n\n    window.open(mailtoUrl.toString());\n\n    return { status: MailComposerStatus.UNDETERMINED };\n  },\n  async isAvailableAsync(): Promise<boolean> {\n    return typeof window !== 'undefined';\n  },\n};\n"]}

package/ios/ExpoMailComposer.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.license        = package['license']
   s.author         = package['author']
   s.homepage       = package['homepage']
-  s.platform       = :ios, '13.0'
+  s.platform       = :ios, '13.4'
   s.swift_version  = '5.4'
   s.source         = { git: 'https://github.com/expo/expo.git' }
   s.static_framework = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-mail-composer",
-  "version": "12.6.0",
+  "version": "12.7.1",
   "description": "Provides an API to compose mails using OS specific UI",
   "main": "build/MailComposer.js",
   "types": "build/MailComposer.d.ts",
@@ -34,14 +34,11 @@
   "jest": {
     "preset": "expo-module-scripts"
   },
-  "dependencies": {
-    "query-string": "^6.2.0"
-  },
   "devDependencies": {
     "expo-module-scripts": "^3.0.0"
   },
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "da25937e2a99661cbe5eb60ca1d8d6245fc96a50"
+  "gitHead": "43f1b4f8a5a9bca649e4e7ca6e4155482a162431"
 }

package/src/ExpoMailComposer.web.ts

@@ -1,5 +1,3 @@
-import qs from 'query-string';
-
 import { MailComposerOptions, MailComposerResult, MailComposerStatus } from './MailComposer.types';
 
 function removeNullishValues(obj) {
@@ -21,27 +19,28 @@ function checkValue(value?: string[] | string): string | null {
 }
 
 export default {
-  get name(): string {
-    return 'ExpoMailComposer';
-  },
   async composeAsync(options: MailComposerOptions): Promise<MailComposerResult> {
+    if (typeof window === 'undefined') {
+      return { status: MailComposerStatus.CANCELLED };
+    }
+    const mailtoUrl = new URL('mailto:' + (checkValue(options.recipients) || ''));
+
     const email = removeNullishValues({
-      cc: checkValue(options.ccRecipients),
-      bcc: checkValue(options.bccRecipients),
+      cc: options.ccRecipients,
+      bcc: options.bccRecipients,
       subject: options.subject,
       body: options.body,
-    });
+    }) as Record<string, string>;
 
-    const query = qs.stringify(email);
-    const queryComponent = query ? '?' + query : '';
-    const to = checkValue(options.recipients) || '';
-    const mailto = `mailto:${to}${queryComponent}`;
+    Object.entries(email).forEach(([key, value]) => {
+      mailtoUrl.searchParams.append(key, value);
+    });
 
-    window.open(mailto);
+    window.open(mailtoUrl.toString());
 
     return { status: MailComposerStatus.UNDETERMINED };
   },
   async isAvailableAsync(): Promise<boolean> {
-    return true;
+    return typeof window !== 'undefined';
   },
 };