[config] disjointed features from plugins ios (#2811)

* Added invalid config warning * Update Paths-test.ts * unify utility * Fix entitlements resolution * Create react-native-project.ts * Added deprecation warning for androidStatusBarColor
expo · Oct 19, 2020 · 6ba2cf1 · 6ba2cf1
1 parent f10da27
commit 6ba2cf1
Show file tree

Hide file tree

Showing 12 changed files with 898 additions and 51 deletions.
diff --git a/packages/config/src/android/StatusBar.ts b/packages/config/src/android/StatusBar.ts
@@ -1,4 +1,5 @@
 import { ExpoConfig } from '../Config.types';
+import { addWarningAndroid } from '../WarningAggregator';
 import { getProjectColorsXMLPathAsync, setColorItem } from './Colors';
 import { buildResourceItem, readResourcesXMLAsync, ResourceItemXML } from './Resources';
 import { getProjectStylesXMLPathAsync, setStylesItem } from './Styles';
@@ -9,6 +10,12 @@ const WINDOW_TRANSLUCENT_STATUS = 'android:windowTranslucentStatus';
 const WINDOW_LIGHT_STATUS_BAR = 'android:windowLightStatusBar';
 
 export function getStatusBarColor(config: ExpoConfig) {
+  if (config.androidStatusBarColor != null) {
+    addWarningAndroid(
+      'status-bar',
+      '`androidStatusBarColor` is deprecated, use `androidStatusBar.backgroundColor` instead.'
+    );
+  }
   return config.androidStatusBar?.backgroundColor || 'translucent';
 }
 

diff --git a/packages/config/src/android/__tests__/Icon-test.ts b/packages/config/src/android/__tests__/Icon-test.ts
@@ -2,6 +2,7 @@ import { fs, vol } from 'memfs';
 import * as path from 'path';
 
 import { ExpoConfig } from '../../Config.types';
+import { getDirFromFS } from '../../ios/__tests__/utils/getDirFromFS';
 import { createAdaptiveIconXmlString, getAdaptiveIcon, getIcon, setIconAsync } from '../Icon';
 import {
   ADAPTIVE_ICON_XML_WITH_BACKGROUND_COLOR,
@@ -28,20 +29,6 @@ afterAll(() => {
   jest.unmock('fs');
 });
 
-function getDirFromFS(fsJSON: Record<string, string | null>, rootDir: string) {
-  return Object.entries(fsJSON)
-    .filter(([path, value]) => value !== null && path.startsWith(rootDir))
-    .reduce<Record<string, string>>(
-      (acc, [path, fileContent]) => ({
-        ...acc,
-        [path.substring(rootDir.length).startsWith('/')
-          ? path.substring(rootDir.length + 1)
-          : path.substring(rootDir.length)]: fileContent,
-      }),
-      {}
-    );
-}
-
 function setUpMipmapDirectories() {
   vol.mkdirpSync('/app/android/app/src/main/res/mipmap-mdpi');
   vol.mkdirpSync('/app/android/app/src/main/res/mipmap-hdpi');

diff --git a/packages/config/src/ios/DeviceFamily.ts b/packages/config/src/ios/DeviceFamily.ts
@@ -1,6 +1,7 @@
 import { XcodeProject } from 'xcode';
 
 import { ExpoConfig } from '../Config.types';
+import { addWarningIOS } from '../WarningAggregator';
 
 export function getSupportsTablet(config: ExpoConfig): boolean {
   return !!config.ios?.supportsTablet;
@@ -14,6 +15,13 @@ export function getDeviceFamilies(config: ExpoConfig): number[] {
   const supportsTablet = getSupportsTablet(config);
   const isTabletOnly = getIsTabletOnly(config);
 
+  if (isTabletOnly && config.ios?.supportsTablet === false) {
+    addWarningIOS(
+      'device-family',
+      `Found contradictory values: \`{ ios: { isTabletOnly: true, supportsTablet: false } }\`. Using \`{ isTabletOnly: true }\`.`
+    );
+  }
+
   // 1 is iPhone, 2 is iPad
   if (isTabletOnly) {
     return [2];

diff --git a/packages/config/src/ios/Entitlements.ts b/packages/config/src/ios/Entitlements.ts
@@ -7,6 +7,7 @@ import { InfoPlist } from './IosConfig.types';
 import * as Paths from './Paths';
 import {
   getPbxproj,
+  getProductName,
   getProjectName,
   isBuildConfig,
   isNotComment,
@@ -98,7 +99,7 @@ export function getEntitlementsPath(projectRoot: string): string {
    */
   const project = getPbxproj(projectRoot);
   const projectName = getProjectName(projectRoot);
-  const productName = project.productName;
+  const productName = getProductName(project);
 
   const entitlementsRelativePath = path.join(projectName, `${productName}.entitlements`);
   const entitlementsPath = path.normalize(path.join(projectRoot, 'ios', entitlementsRelativePath));

diff --git a/packages/config/src/ios/__tests__/DeviceFamily-test.ts b/packages/config/src/ios/__tests__/DeviceFamily-test.ts
@@ -2,6 +2,7 @@ import { ExpoConfig } from '@expo/config-types';
 import { fs, vol } from 'memfs';
 import * as path from 'path';
 
+import { addWarningIOS } from '../../WarningAggregator';
 import {
   formatDeviceFamilies,
   getDeviceFamilies,
@@ -28,6 +29,16 @@ const TABLET_AND_PHONE_SUPPORTED = [1, 2];
 const ONLY_PHONE_SUPPORTED = [1];
 const ONLY_TABLET_SUPPORTED = [2];
 
+describe(getDeviceFamilies, () => {
+  it(`warns about invalid config`, () => {
+    getDeviceFamilies({ ios: { isTabletOnly: true, supportsTablet: false } } as any);
+    expect(addWarningIOS).toHaveBeenLastCalledWith(
+      'device-family',
+      'Found contradictory values: `{ ios: { isTabletOnly: true, supportsTablet: false } }`. Using `{ isTabletOnly: true }`.'
+    );
+  });
+});
+
 describe('device family', () => {
   it(`returns false ios.isTabletOnly is not provided`, () => {
     expect(getIsTabletOnly({ ios: {} })).toBe(false);

diff --git a/packages/config/src/ios/__tests__/Icons-test.ts b/packages/config/src/ios/__tests__/Icons-test.ts
@@ -2,6 +2,7 @@ import { fs, vol } from 'memfs';
 import * as path from 'path';
 
 import { getIcons, ICON_CONTENTS, setIconsAsync } from '../Icons';
+import { getDirFromFS } from './utils/getDirFromFS';
 const actualFs = jest.requireActual('fs') as typeof fs;
 
 jest.mock('fs');
@@ -18,20 +19,6 @@ afterAll(() => {
   jest.unmock('fs');
 });
 
-function getDirFromFS(fsJSON: Record<string, string | null>, rootDir: string) {
-  return Object.entries(fsJSON)
-    .filter(([path, value]) => value !== null && path.startsWith(rootDir))
-    .reduce<Record<string, string>>(
-      (acc, [path, fileContent]) => ({
-        ...acc,
-        [path.substring(rootDir.length).startsWith('/')
-          ? path.substring(rootDir.length + 1)
-          : path.substring(rootDir.length)]: fileContent,
-      }),
-      {}
-    );
-}
-
 describe('iOS Icons', () => {
   it(`returns null if no icon values provided`, () => {
     expect(getIcons({})).toBeNull();

diff --git a/packages/config/src/ios/__tests__/Locales-test.ts b/packages/config/src/ios/__tests__/Locales-test.ts
@@ -4,6 +4,7 @@ import * as path from 'path';
 import { addWarningIOS } from '../../WarningAggregator';
 import { getLocales, setLocalesAsync } from '../Locales';
 import { getPbxproj } from '../utils/Xcodeproj';
+import { getDirFromFS } from './utils/getDirFromFS';
 const actualFs = jest.requireActual('fs') as typeof fs;
 
 jest.mock('fs');
@@ -17,20 +18,6 @@ afterAll(() => {
   jest.unmock('../../WarningAggregator');
 });
 
-function getDirFromFS(fsJSON: Record<string, string | null>, rootDir: string) {
-  return Object.entries(fsJSON)
-    .filter(([path, value]) => value !== null && path.startsWith(rootDir))
-    .reduce<Record<string, string>>(
-      (acc, [path, fileContent]) => ({
-        ...acc,
-        [path.substring(rootDir.length).startsWith('/')
-          ? path.substring(rootDir.length + 1)
-          : path.substring(rootDir.length)]: fileContent,
-      }),
-      {}
-    );
-}
-
 describe('iOS Locales', () => {
   it(`returns null if no values are provided`, () => {
     expect(getLocales({})).toBeNull();

diff --git a/packages/config/src/ios/__tests__/Paths-test.ts b/packages/config/src/ios/__tests__/Paths-test.ts
@@ -24,7 +24,7 @@ describe(getXcodeProjectPath, () => {
         'ios/testproject.xcodeproj/project.pbxproj': actualFs.readFileSync(
           path.join(__dirname, 'fixtures/project.pbxproj'),
           'utf-8'
-        ),
+        ) as string,
         'ios/Podfile': 'content',
         'ios/TestPod.podspec': 'noop',
         'ios/testproject/AppDelegate.m': '',
@@ -38,11 +38,11 @@ describe(getXcodeProjectPath, () => {
         'ios/otherproject.xcodeproj/project.pbxproj': actualFs.readFileSync(
           path.join(__dirname, 'fixtures/project.pbxproj'),
           'utf-8'
-        ),
+        ) as string,
         'ios/testproject.xcodeproj/project.pbxproj': actualFs.readFileSync(
           path.join(__dirname, 'fixtures/project.pbxproj'),
           'utf-8'
-        ),
+        ) as string,
         'ios/testproject/AppDelegate.m': '',
       },
       '/multiple'
@@ -77,7 +77,7 @@ describe(getAppDelegate, () => {
         'ios/testproject.xcodeproj/project.pbxproj': actualFs.readFileSync(
           path.join(__dirname, 'fixtures/project.pbxproj'),
           'utf-8'
-        ),
+        ) as string,
         'ios/Podfile': 'content',
         'ios/TestPod.podspec': 'noop',
         'ios/testproject/AppDelegate.m': '',
@@ -91,7 +91,7 @@ describe(getAppDelegate, () => {
         'ios/testproject.xcodeproj/project.pbxproj': actualFs.readFileSync(
           path.join(__dirname, 'fixtures/project.pbxproj'),
           'utf-8'
-        ),
+        ) as string,
         'ios/Podfile': 'content',
         'ios/TestPod.podspec': 'noop',
         'ios/testproject/AppDelegate.swift': '',
@@ -104,7 +104,7 @@ describe(getAppDelegate, () => {
         'ios/testproject.xcodeproj/project.pbxproj': actualFs.readFileSync(
           path.join(__dirname, 'fixtures/project.pbxproj'),
           'utf-8'
-        ),
+        ) as string,
         'ios/Podfile': 'content',
         'ios/TestPod.podspec': 'noop',
       },
@@ -116,7 +116,7 @@ describe(getAppDelegate, () => {
         'ios/testproject.xcodeproj/project.pbxproj': actualFs.readFileSync(
           path.join(__dirname, 'fixtures/project.pbxproj'),
           'utf-8'
-        ),
+        ) as string,
         'ios/Podfile': 'content',
         'ios/TestPod.podspec': 'noop',
         'ios/testproject/AppDelegate.swift': '',

diff --git a/packages/config/src/ios/__tests__/utils/getDirFromFS.ts b/packages/config/src/ios/__tests__/utils/getDirFromFS.ts
@@ -0,0 +1,13 @@
+export function getDirFromFS(fsJSON: Record<string, string | null>, rootDir: string) {
+  return Object.entries(fsJSON)
+    .filter(([path, value]) => value !== null && path.startsWith(rootDir))
+    .reduce<Record<string, string>>(
+      (acc, [path, fileContent]) => ({
+        ...acc,
+        [path.substring(rootDir.length).startsWith('/')
+          ? path.substring(rootDir.length + 1)
+          : path.substring(rootDir.length)]: fileContent,
+      }),
+      {}
+    );
+}
diff --git a/packages/config/src/ios/utils/Xcodeproj.ts b/packages/config/src/ios/utils/Xcodeproj.ts
@@ -136,6 +136,22 @@ export function getPbxproj(projectRoot: string): XcodeProject {
   return project;
 }
 
+/**
+ * Get the productName for a project, if the name is using a variable `$(TARGET_NAME)`, then attempt to get the value of that variable.
+ *
+ * @param project
+ */
+export function getProductName(project: XcodeProject): string {
+  let productName = project.productName;
+
+  if (productName === '$(TARGET_NAME)') {
+    const targetName = project.getFirstTarget()?.firstTarget?.productName;
+    productName = targetName ?? project.productName;
+  }
+
+  return productName;
+}
+
 export function getProjectSection(project: XcodeProject) {
   return project.pbxProjectSection();
 }