expo-document-picker 10.2.0 → 10.2.1

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 10.2.1 — 2022-04-25
+
+### 💡 Others
+
+- [plugin] Update to use codesigning variables in entitlements. ([#17158](https://github.com/expo/expo/pull/17158) by [@EvanBacon](https://github.com/EvanBacon))
+
 ## 10.2.0 — 2022-04-18
 
 ### 💡 Others

package/README.md

@@ -31,7 +31,7 @@ No additional set up necessary.
 
 ### Plugin
 
-In order to enable Apple iCloud storage in managed EAS builds, you'll need to define the `appleTeamId` property in the config plugin:
+You can change the `com.apple.developer.icloud-container-environment` entitlement using the `iCloudContainerEnvironment` property.
 
 `app.json`
 
@@ -41,18 +41,11 @@ In order to enable Apple iCloud storage in managed EAS builds, you'll need to de
     "usesIcloudStorage": true,
     "bundleIdentifier": "com.yourname.yourapp"
   },
-  "plugins": [
-    [
-      "expo-document-picker",
-      {
-        "appleTeamId": "YOUR_TEAM_ID"
-      }
-    ]
-  ]
+  "plugins": ["expo-document-picker"]
 }
 ```
 
-> Running `expo eject` will generate a the native project locally with the applied changes in your iOS Entitlements file.
+> Running `expo prebuild` will generate a the [native project locally](https://docs.expo.io/workflow/customizing/) with the applied changes in your iOS Entitlements file.
 
 # Contributing
 

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '10.2.0'
+version = '10.2.1'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -74,7 +74,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 17
-    versionName '10.2.0'
+    versionName '10.2.1'
   }
   lintOptions {
     abortOnError false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-document-picker",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "description": "Provides access to the system's UI for selecting documents from the available providers on the user's device.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "22dce752354bb429c84851bc4389abe47a766b1f"
+  "gitHead": "8fa7ceccfeab2f5090019403d6472fb80d6d7eaf"
 }

package/plugin/build/withDocumentPicker.d.ts

@@ -1,4 +1,2 @@
-import { ConfigPlugin } from '@expo/config-plugins';
-import { IosProps } from './withDocumentPickerIOS';
-declare const _default: ConfigPlugin<void | IosProps>;
+declare const _default: import("@expo/config-plugins").ConfigPlugin<import("./withDocumentPickerIOS").IosProps>;
 export default _default;

package/plugin/build/withDocumentPicker.js

@@ -3,8 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
 const withDocumentPickerIOS_1 = require("./withDocumentPickerIOS");
 const pkg = require('expo-document-picker/package.json');
-const withDocumentPicker = (config, { appleTeamId = process.env.EXPO_APPLE_TEAM_ID, iCloudContainerEnvironment } = {}) => {
-    config = (0, withDocumentPickerIOS_1.withDocumentPickerIOS)(config, { appleTeamId, iCloudContainerEnvironment });
-    return config;
-};
-exports.default = (0, config_plugins_1.createRunOncePlugin)(withDocumentPicker, pkg.name, pkg.version);
+exports.default = (0, config_plugins_1.createRunOncePlugin)(withDocumentPickerIOS_1.withDocumentPickerIOS, pkg.name, pkg.version);

package/plugin/build/withDocumentPickerIOS.d.ts

@@ -1,7 +1,6 @@
 import { ConfigPlugin } from '@expo/config-plugins';
 import { ExpoConfig } from '@expo/config-types';
 export declare type IosProps = {
-    appleTeamId?: string;
     /**
      * Sets the `com.apple.developer.icloud-container-environment` entitlement which is read by EAS CLI to set
      * the `iCloudContainerEnvironment` in the `xcodebuild` `exportOptionsPlist`.
@@ -11,4 +10,4 @@ export declare type IosProps = {
     iCloudContainerEnvironment?: 'Development' | 'Production';
 };
 export declare const withDocumentPickerIOS: ConfigPlugin<IosProps>;
-export declare function setICloudEntitlements(config: Pick<ExpoConfig, 'ios'>, { appleTeamId, iCloudContainerEnvironment }: IosProps, { 'com.apple.developer.icloud-container-environment': _env, ...entitlements }: Record<string, any>): Record<string, any>;
+export declare function setICloudEntitlements(config: Pick<ExpoConfig, 'ios'>, { iCloudContainerEnvironment }: IosProps, { 'com.apple.developer.icloud-container-environment': _env, ...entitlements }: Record<string, any>): Record<string, any>;

package/plugin/build/withDocumentPickerIOS.js

@@ -2,32 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setICloudEntitlements = exports.withDocumentPickerIOS = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
-const withDocumentPickerIOS = (config, { appleTeamId, iCloudContainerEnvironment }) => {
+const withDocumentPickerIOS = (config, { iCloudContainerEnvironment } = {}) => {
     return (0, config_plugins_1.withEntitlementsPlist)(config, (config) => {
-        if (appleTeamId) {
-            config.modResults = setICloudEntitlements(config, { appleTeamId, iCloudContainerEnvironment }, config.modResults);
-        }
-        else {
-            config_plugins_1.WarningAggregator.addWarningIOS('expo-document-picker', 'Cannot configure iOS entitlements because neither the appleTeamId property, nor the environment variable EXPO_APPLE_TEAM_ID were defined.');
-        }
+        config.modResults = setICloudEntitlements(config, { iCloudContainerEnvironment }, config.modResults);
         return config;
     });
 };
 exports.withDocumentPickerIOS = withDocumentPickerIOS;
-function setICloudEntitlements(config, { appleTeamId, iCloudContainerEnvironment }, { 'com.apple.developer.icloud-container-environment': _env, ...entitlements }) {
+function setICloudEntitlements(config, { iCloudContainerEnvironment }, { 'com.apple.developer.icloud-container-environment': _env, ...entitlements }) {
     var _a;
     if ((_a = config.ios) === null || _a === void 0 ? void 0 : _a.usesIcloudStorage) {
         // Used for AdHoc iOS builds: https://github.com/expo/eas-cli/issues/693
         // https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_icloud-container-environment
         entitlements['com.apple.developer.icloud-container-environment'] = iCloudContainerEnvironment;
         entitlements['com.apple.developer.icloud-container-identifiers'] = [
-            'iCloud.' + config.ios.bundleIdentifier,
+            `iCloud.${config.ios.bundleIdentifier}`,
         ];
         entitlements['com.apple.developer.ubiquity-container-identifiers'] = [
-            'iCloud.' + config.ios.bundleIdentifier,
+            `iCloud.${config.ios.bundleIdentifier}`,
         ];
-        entitlements['com.apple.developer.ubiquity-kvstore-identifier'] =
-            appleTeamId + '.' + config.ios.bundleIdentifier;
+        entitlements['com.apple.developer.ubiquity-kvstore-identifier'] = `$(TeamIdentifierPrefix)${config.ios.bundleIdentifier}`;
         entitlements['com.apple.developer.icloud-services'] = ['CloudDocuments'];
     }
     return entitlements;

package/plugin/src/withDocumentPicker.ts

@@ -1,15 +1,7 @@
-import { ConfigPlugin, createRunOncePlugin } from '@expo/config-plugins';
+import { createRunOncePlugin } from '@expo/config-plugins';
 
-import { withDocumentPickerIOS, IosProps } from './withDocumentPickerIOS';
+import { withDocumentPickerIOS } from './withDocumentPickerIOS';
 
 const pkg = require('expo-document-picker/package.json');
 
-const withDocumentPicker: ConfigPlugin<IosProps | void> = (
-  config,
-  { appleTeamId = process.env.EXPO_APPLE_TEAM_ID, iCloudContainerEnvironment } = {}
-) => {
-  config = withDocumentPickerIOS(config, { appleTeamId, iCloudContainerEnvironment });
-  return config;
-};
-
-export default createRunOncePlugin(withDocumentPicker, pkg.name, pkg.version);
+export default createRunOncePlugin(withDocumentPickerIOS, pkg.name, pkg.version);

package/plugin/src/withDocumentPickerIOS.ts

@@ -1,8 +1,7 @@
-import { ConfigPlugin, WarningAggregator, withEntitlementsPlist } from '@expo/config-plugins';
+import { ConfigPlugin, withEntitlementsPlist } from '@expo/config-plugins';
 import { ExpoConfig } from '@expo/config-types';
 
 export type IosProps = {
-  appleTeamId?: string;
   /**
    * Sets the `com.apple.developer.icloud-container-environment` entitlement which is read by EAS CLI to set
    * the `iCloudContainerEnvironment` in the `xcodebuild` `exportOptionsPlist`.
@@ -14,28 +13,21 @@ export type IosProps = {
 
 export const withDocumentPickerIOS: ConfigPlugin<IosProps> = (
   config,
-  { appleTeamId, iCloudContainerEnvironment }
+  { iCloudContainerEnvironment } = {}
 ) => {
   return withEntitlementsPlist(config, (config) => {
-    if (appleTeamId) {
-      config.modResults = setICloudEntitlements(
-        config,
-        { appleTeamId, iCloudContainerEnvironment },
-        config.modResults
-      );
-    } else {
-      WarningAggregator.addWarningIOS(
-        'expo-document-picker',
-        'Cannot configure iOS entitlements because neither the appleTeamId property, nor the environment variable EXPO_APPLE_TEAM_ID were defined.'
-      );
-    }
+    config.modResults = setICloudEntitlements(
+      config,
+      { iCloudContainerEnvironment },
+      config.modResults
+    );
     return config;
   });
 };
 
 export function setICloudEntitlements(
   config: Pick<ExpoConfig, 'ios'>,
-  { appleTeamId, iCloudContainerEnvironment }: IosProps,
+  { iCloudContainerEnvironment }: IosProps,
   { 'com.apple.developer.icloud-container-environment': _env, ...entitlements }: Record<string, any>
 ): Record<string, any> {
   if (config.ios?.usesIcloudStorage) {
@@ -44,13 +36,15 @@ export function setICloudEntitlements(
     entitlements['com.apple.developer.icloud-container-environment'] = iCloudContainerEnvironment;
 
     entitlements['com.apple.developer.icloud-container-identifiers'] = [
-      'iCloud.' + config.ios.bundleIdentifier,
+      `iCloud.${config.ios.bundleIdentifier}`,
     ];
     entitlements['com.apple.developer.ubiquity-container-identifiers'] = [
-      'iCloud.' + config.ios.bundleIdentifier,
+      `iCloud.${config.ios.bundleIdentifier}`,
     ];
-    entitlements['com.apple.developer.ubiquity-kvstore-identifier'] =
-      appleTeamId + '.' + config.ios.bundleIdentifier;
+    entitlements[
+      'com.apple.developer.ubiquity-kvstore-identifier'
+    ] = `$(TeamIdentifierPrefix)${config.ios.bundleIdentifier}`;
+
     entitlements['com.apple.developer.icloud-services'] = ['CloudDocuments'];
   }
   return entitlements;