expo-font 11.7.0 → 11.9.0

package/CHANGELOG.md

@@ -10,6 +10,28 @@
 
 ### 💡 Others
 
+## 11.9.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))
+
+### 🐛 Bug fixes
+
+- Handle the case where no argument is passed to the plugin. ([#25138](https://github.com/expo/expo/pull/25138) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 11.8.0 — 2023-10-17
+
+### 🛠 Breaking changes
+
+- Dropped support for Android SDK 21 and 22. ([#24201](https://github.com/expo/expo/pull/24201) by [@behenate](https://github.com/behenate))
+
+### 🎉 New features
+
+- Added config plugin to allow fonts to be linked at build time. ([#24772](https://github.com/expo/expo/pull/24772) by [@alanjhughes](https://github.com/alanjhughes))
+- Remove `unimodule.json` in favour of `expo-module.config.json`. ([#25099](https://github.com/expo/expo/pull/25099) by [@reichhartd](https://github.com/reichhartd))
+
 ## 11.7.0 — 2023-09-15
 
 ### 🎉 New features

package/android/build.gradle

@@ -3,15 +3,20 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '11.7.0'
+version = '11.9.0'
 
-buildscript {
-  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
-  if (expoModulesCorePlugin.exists()) {
-    apply from: expoModulesCorePlugin
-    applyKotlinExpoModulesCorePlugin()
+def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+if (expoModulesCorePlugin.exists()) {
+  apply from: expoModulesCorePlugin
+  applyKotlinExpoModulesCorePlugin()
+  // Remove this check, but keep the contents after SDK49 support is dropped
+  if (safeExtGet("expoProvidesDefaultConfig", false)) {
+    useExpoPublishing()
+    useCoreDependencies()
   }
+}
 
+buildscript {
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -35,23 +40,44 @@ buildscript {
   }
 }
 
-afterEvaluate {
-  publishing {
-    publications {
-      release(MavenPublication) {
-        from components.release
+// Remove this if and it's contents, when support for SDK49 is dropped
+if (!safeExtGet("expoProvidesDefaultConfig", false)) {
+  afterEvaluate {
+    publishing {
+      publications {
+        release(MavenPublication) {
+          from components.release
+        }
       }
-    }
-    repositories {
-      maven {
-        url = mavenLocal().url
+      repositories {
+        maven {
+          url = mavenLocal().url
+        }
       }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 33)
+  // Remove this if and it's contents, when support for SDK49 is dropped
+  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
+    compileSdkVersion safeExtGet("compileSdkVersion", 34)
+
+    defaultConfig {
+      minSdkVersion safeExtGet("minSdkVersion", 23)
+      targetSdkVersion safeExtGet("targetSdkVersion", 34)
+    }
+
+    publishing {
+      singleVariant("release") {
+        withSourcesJar()
+      }
+    }
+
+    lintOptions {
+      abortOnError false
+    }
+  }
 
   def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
   if (agpVersion.tokenize('.')[0].toInteger() < 8) {
@@ -67,23 +93,15 @@ android {
 
   namespace "expo.modules.font"
   defaultConfig {
-    minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 29
-    versionName "11.7.0"
-  }
-  lintOptions {
-    abortOnError false
-  }
-  publishing {
-    singleVariant("release") {
-      withSourcesJar()
-    }
+    versionName "11.9.0"
   }
 }
 
 dependencies {
-  implementation project(':expo-modules-core')
-
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
+  // Remove this if and it's contents, when support for SDK49 is dropped
+  if (!safeExtGet("expoProvidesDefaultConfig", false)) {
+    implementation project(':expo-modules-core')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
+  }
 }

package/app.plugin.js

@@ -0,0 +1 @@
+module.exports = require('./plugin/build/withFonts');

package/ios/EXFont.podspec

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-font",
-  "version": "11.7.0",
+  "version": "11.9.0",
   "description": "Load fonts at runtime and use them in React Native components.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "ee2c866ba3c7fbc35ff2a3e896041cf15d3bd7c5"
+  "gitHead": "3142a086578deffd8704a8f1b6f0f661527d836c"
 }

package/plugin/build/utils.d.ts

@@ -0,0 +1 @@
+export declare function resolveFontPaths(fonts: string[], projectRoot: string): Promise<string[]>;

package/plugin/build/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveFontPaths = void 0;
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+async function resolveFontPaths(fonts, projectRoot) {
+    const promises = fonts.map(async (p) => {
+        const resolvedPath = path_1.default.resolve(projectRoot, p);
+        const stat = await promises_1.default.stat(resolvedPath);
+        if (stat.isDirectory()) {
+            const dir = await promises_1.default.readdir(resolvedPath);
+            return dir.map((file) => path_1.default.join(resolvedPath, file));
+        }
+        return [resolvedPath];
+    });
+    return (await Promise.all(promises)).flat();
+}
+exports.resolveFontPaths = resolveFontPaths;

package/plugin/build/withFonts.d.ts

@@ -0,0 +1,6 @@
+import { ConfigPlugin } from 'expo/config-plugins';
+export type FontProps = {
+    fonts?: string[];
+};
+declare const _default: ConfigPlugin<FontProps>;
+export default _default;

package/plugin/build/withFonts.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_plugins_1 = require("expo/config-plugins");
+const withFontsAndroid_1 = require("./withFontsAndroid");
+const withFontsIos_1 = require("./withFontsIos");
+const pkg = require('expo-font/package.json');
+const withFonts = (config, props) => {
+    if (!props) {
+        return config;
+    }
+    if (props.fonts && props.fonts.length === 0) {
+        return config;
+    }
+    config = (0, withFontsIos_1.withFontsIos)(config, props.fonts ?? []);
+    config = (0, withFontsAndroid_1.withFontsAndroid)(config, props.fonts ?? []);
+    return config;
+};
+exports.default = (0, config_plugins_1.createRunOncePlugin)(withFonts, pkg.name, pkg.version);

package/plugin/build/withFontsAndroid.d.ts

@@ -0,0 +1,2 @@
+import { ConfigPlugin } from 'expo/config-plugins';
+export declare const withFontsAndroid: ConfigPlugin<string[]>;

package/plugin/build/withFontsAndroid.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withFontsAndroid = void 0;
+const config_plugins_1 = require("expo/config-plugins");
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("./utils");
+const withFontsAndroid = (config, fonts) => {
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        'android',
+        async (config) => {
+            const resolvedFonts = await (0, utils_1.resolveFontPaths)(fonts, config.modRequest.projectRoot);
+            await Promise.all(resolvedFonts.map(async (asset) => {
+                const fontsDir = path_1.default.join(config.modRequest.platformProjectRoot, 'app/src/main/assets/fonts');
+                await promises_1.default.mkdir(fontsDir, { recursive: true });
+                const output = path_1.default.join(fontsDir, path_1.default.basename(asset));
+                await promises_1.default.copyFile(asset, output);
+            }));
+            return config;
+        },
+    ]);
+};
+exports.withFontsAndroid = withFontsAndroid;

package/plugin/build/withFontsIos.d.ts

@@ -0,0 +1,2 @@
+import { ConfigPlugin } from 'expo/config-plugins';
+export declare const withFontsIos: ConfigPlugin<string[]>;

package/plugin/build/withFontsIos.js

@@ -0,0 +1,54 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withFontsIos = void 0;
+const config_plugins_1 = require("expo/config-plugins");
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("./utils");
+const withFontsIos = (config, fonts) => {
+    config = addFontsToTarget(config, fonts);
+    config = addFontsToPlist(config, fonts);
+    return config;
+};
+exports.withFontsIos = withFontsIos;
+function addFontsToTarget(config, fonts) {
+    return (0, config_plugins_1.withXcodeProject)(config, async (config) => {
+        const resolvedFonts = await (0, utils_1.resolveFontPaths)(fonts, config.modRequest.projectRoot);
+        const project = config.modResults;
+        const platformProjectRoot = config.modRequest.platformProjectRoot;
+        config_plugins_1.IOSConfig.XcodeUtils.ensureGroupRecursively(project, 'Resources');
+        addResourceFile(project, platformProjectRoot, resolvedFonts);
+        return config;
+    });
+}
+function addFontsToPlist(config, fonts) {
+    return (0, config_plugins_1.withInfoPlist)(config, async (config) => {
+        const resolvedFonts = await (0, utils_1.resolveFontPaths)(fonts, config.modRequest.projectRoot);
+        const existingFonts = getUIAppFonts(config.modResults);
+        const fontList = resolvedFonts.map((font) => path_1.default.basename(font)) ?? [];
+        const allFonts = [...existingFonts, ...fontList];
+        config.modResults.UIAppFonts = Array.from(new Set(allFonts));
+        return config;
+    });
+}
+function addResourceFile(project, platformRoot, f) {
+    for (const font of f) {
+        const fontPath = path_1.default.relative(platformRoot, font);
+        config_plugins_1.IOSConfig.XcodeUtils.addResourceFileToGroup({
+            filepath: fontPath,
+            groupName: 'Resources',
+            project,
+            isBuildFile: true,
+            verbose: true,
+        });
+    }
+}
+function getUIAppFonts(infoPlist) {
+    const fonts = infoPlist['UIAppFonts'];
+    if (fonts != null && Array.isArray(fonts) && fonts.every((font) => typeof font === 'string')) {
+        return fonts;
+    }
+    return [];
+}

package/plugin/src/utils.ts

@@ -0,0 +1,16 @@
+import fs from 'fs/promises';
+import path from 'path';
+
+export async function resolveFontPaths(fonts: string[], projectRoot: string) {
+  const promises = fonts.map(async (p) => {
+    const resolvedPath = path.resolve(projectRoot, p);
+    const stat = await fs.stat(resolvedPath);
+
+    if (stat.isDirectory()) {
+      const dir = await fs.readdir(resolvedPath);
+      return dir.map((file) => path.join(resolvedPath, file));
+    }
+    return [resolvedPath];
+  });
+  return (await Promise.all(promises)).flat();
+}

package/plugin/src/withFonts.ts

@@ -0,0 +1,27 @@
+import { ConfigPlugin, createRunOncePlugin } from 'expo/config-plugins';
+
+import { withFontsAndroid } from './withFontsAndroid';
+import { withFontsIos } from './withFontsIos';
+
+const pkg = require('expo-font/package.json');
+
+export type FontProps = {
+  fonts?: string[];
+};
+
+const withFonts: ConfigPlugin<FontProps> = (config, props) => {
+  if (!props) {
+    return config;
+  }
+
+  if (props.fonts && props.fonts.length === 0) {
+    return config;
+  }
+
+  config = withFontsIos(config, props.fonts ?? []);
+  config = withFontsAndroid(config, props.fonts ?? []);
+
+  return config;
+};
+
+export default createRunOncePlugin(withFonts, pkg.name, pkg.version);

package/plugin/src/withFontsAndroid.ts

@@ -0,0 +1,26 @@
+import { ConfigPlugin, withDangerousMod } from 'expo/config-plugins';
+import fs from 'fs/promises';
+import path from 'path';
+
+import { resolveFontPaths } from './utils';
+
+export const withFontsAndroid: ConfigPlugin<string[]> = (config, fonts) => {
+  return withDangerousMod(config, [
+    'android',
+    async (config) => {
+      const resolvedFonts = await resolveFontPaths(fonts, config.modRequest.projectRoot);
+      await Promise.all(
+        resolvedFonts.map(async (asset) => {
+          const fontsDir = path.join(
+            config.modRequest.platformProjectRoot,
+            'app/src/main/assets/fonts'
+          );
+          await fs.mkdir(fontsDir, { recursive: true });
+          const output = path.join(fontsDir, path.basename(asset));
+          await fs.copyFile(asset, output);
+        })
+      );
+      return config;
+    },
+  ]);
+};

package/plugin/src/withFontsIos.ts

@@ -0,0 +1,63 @@
+import { ExpoConfig } from '@expo/config-types';
+import {
+  ConfigPlugin,
+  IOSConfig,
+  InfoPlist,
+  XcodeProject,
+  withInfoPlist,
+  withXcodeProject,
+} from 'expo/config-plugins';
+import path from 'path';
+
+import { resolveFontPaths } from './utils';
+
+export const withFontsIos: ConfigPlugin<string[]> = (config, fonts) => {
+  config = addFontsToTarget(config, fonts);
+  config = addFontsToPlist(config, fonts);
+  return config;
+};
+
+function addFontsToTarget(config: ExpoConfig, fonts: string[]) {
+  return withXcodeProject(config, async (config) => {
+    const resolvedFonts = await resolveFontPaths(fonts, config.modRequest.projectRoot);
+    const project = config.modResults;
+    const platformProjectRoot = config.modRequest.platformProjectRoot;
+    IOSConfig.XcodeUtils.ensureGroupRecursively(project, 'Resources');
+    addResourceFile(project, platformProjectRoot, resolvedFonts);
+    return config;
+  });
+}
+
+function addFontsToPlist(config: ExpoConfig, fonts: string[]) {
+  return withInfoPlist(config, async (config) => {
+    const resolvedFonts = await resolveFontPaths(fonts, config.modRequest.projectRoot);
+    const existingFonts = getUIAppFonts(config.modResults);
+
+    const fontList = resolvedFonts.map((font) => path.basename(font)) ?? [];
+    const allFonts = [...existingFonts, ...fontList];
+    config.modResults.UIAppFonts = Array.from(new Set(allFonts));
+
+    return config;
+  });
+}
+
+function addResourceFile(project: XcodeProject, platformRoot: string, f: string[]) {
+  for (const font of f) {
+    const fontPath = path.relative(platformRoot, font);
+    IOSConfig.XcodeUtils.addResourceFileToGroup({
+      filepath: fontPath,
+      groupName: 'Resources',
+      project,
+      isBuildFile: true,
+      verbose: true,
+    });
+  }
+}
+
+function getUIAppFonts(infoPlist: InfoPlist): string[] {
+  const fonts = infoPlist['UIAppFonts'];
+  if (fonts != null && Array.isArray(fonts) && fonts.every((font) => typeof font === 'string')) {
+    return fonts as string[];
+  }
+  return [];
+}

package/plugin/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "expo-module-scripts/tsconfig.plugin",
+  "compilerOptions": {
+    "outDir": "build",
+    "rootDir": "src"
+  },
+  "include": ["./src"],
+  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+}

package/unimodule.json

@@ -1,4 +0,0 @@
-{
-  "name": "expo-font",
-  "platforms": ["ios", "android"]
-}