react-native-nano-icons 0.1.1 → 0.1.2

package/lib/commonjs/plugin/src/buildFonts.d.ts

@@ -5,3 +5,4 @@ import type { IconSetConfig, BuiltFont } from './types.js';
  * unless EXPO_DEBUG is set, in which case the full error is re-thrown.
  */
 export declare function buildAllFonts(iconSets: IconSetConfig[], projectRoot: string): Promise<BuiltFont[]>;
+export declare function getOrBuildFonts(projectRoot: string, iconSets: IconSetConfig[]): Promise<BuiltFont[]>;

package/lib/commonjs/plugin/src/buildFonts.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildAllFonts = buildAllFonts;
+exports.getOrBuildFonts = getOrBuildFonts;
 const index_js_1 = require("../../cli/index.js");
 /**
  * Build TTF + glyphmap for all icon sets.
@@ -21,3 +22,11 @@ async function buildAllFonts(iconSets, projectRoot) {
         return [];
     }
 }
+// Single build run per process; reused across ios/android mods.
+let _buildPromise = null;
+function getOrBuildFonts(projectRoot, iconSets) {
+    if (!_buildPromise) {
+        _buildPromise = buildAllFonts(iconSets, projectRoot);
+    }
+    return _buildPromise;
+}

package/lib/commonjs/plugin/src/index.js

@@ -1,43 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_plugins_1 = require("@expo/config-plugins");
-const buildFonts_js_1 = require("./buildFonts.js");
 const withNanoIconsFontLinking_js_1 = require("./withNanoIconsFontLinking.js");
-const BUILT_FONTS_KEY = '_nanoIconsBuilt';
-// Single Pyodide/PathKit run for the whole prebuild; reused across ios/android mods.
-let _builtFontsCache = null;
-function getOrBuildFonts(projectRoot, iconSets) {
-    if (_builtFontsCache)
-        return Promise.resolve(_builtFontsCache);
-    return (0, buildFonts_js_1.buildAllFonts)(iconSets, projectRoot).then((built) => {
-        _builtFontsCache = built;
-        return built;
-    });
-}
 const withNanoIcons = (config, options) => {
     if (!options?.iconSets?.length)
         return config;
-    // Build fonts (once per process, cached) and attach to config for linking mods.
-    config = (0, config_plugins_1.withDangerousMod)(config, [
-        'ios',
-        async (config) => {
-            const projectRoot = config.modRequest.projectRoot;
-            const built = await getOrBuildFonts(projectRoot, options.iconSets);
-            config[BUILT_FONTS_KEY] = built;
-            return config;
-        },
-    ]);
-    config = (0, config_plugins_1.withDangerousMod)(config, [
-        'android',
-        async (config) => {
-            const projectRoot = config.modRequest.projectRoot;
-            const built = await getOrBuildFonts(projectRoot, options.iconSets);
-            config[BUILT_FONTS_KEY] = built;
-            return config;
-        },
-    ]);
-    // Link built TTFs into native projects (reads _nanoIconsBuilt from config).
-    config = (0, withNanoIconsFontLinking_js_1.withNanoIconsFontLinking)(config);
+    config = (0, withNanoIconsFontLinking_js_1.withNanoIconsFontLinking)(config, options.iconSets);
     return config;
 };
 exports.default = withNanoIcons;

package/lib/commonjs/plugin/src/withNanoIconsFontLinking.d.ts

@@ -1,14 +1,14 @@
 import { withXcodeProject, withDangerousMod } from '@expo/config-plugins';
+import type { IconSetConfig } from './types.js';
 /**
  * Add TTFs to the iOS project (Resources group + UIAppFonts in Info.plist).
- * Reads cached built font paths from config._nanoIconsBuilt (set by the build mod) to prevent redundant builds for iOS and Android.
  */
-export declare function withNanoIconsIos(config: Parameters<typeof withXcodeProject>[0]): ReturnType<typeof withXcodeProject>;
+export declare function withNanoIconsIos(config: Parameters<typeof withXcodeProject>[0], iconSets: IconSetConfig[]): ReturnType<typeof withXcodeProject>;
 /**
- * Copy TTFs to Android assets/fonts. Reads paths from config._nanoIconsBuilt.
+ * Copy TTFs to Android assets/fonts.
  */
-export declare function withNanoIconsAndroid(config: Parameters<typeof withDangerousMod>[0]): ReturnType<typeof withDangerousMod>;
+export declare function withNanoIconsAndroid(config: Parameters<typeof withDangerousMod>[0], iconSets: IconSetConfig[]): ReturnType<typeof withDangerousMod>;
 /**
- * Apply iOS and Android font linking. Built font list is read from config (set by build mod).
+ * Apply iOS and Android font linking.
  */
-export declare function withNanoIconsFontLinking(config: Parameters<typeof withNanoIconsIos>[0]): ReturnType<typeof withNanoIconsAndroid>;
+export declare function withNanoIconsFontLinking(config: Parameters<typeof withNanoIconsIos>[0], iconSets: IconSetConfig[]): ReturnType<typeof withNanoIconsAndroid>;

package/lib/commonjs/plugin/src/withNanoIconsFontLinking.js

@@ -9,18 +9,14 @@ exports.withNanoIconsFontLinking = withNanoIconsFontLinking;
 const config_plugins_1 = require("@expo/config-plugins");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
+const buildFonts_js_1 = require("./buildFonts.js");
 const ANDROID_ASSETS_FONTS_DIR = 'app/src/main/assets/fonts';
-const BUILT_FONTS_KEY = '_nanoIconsBuilt';
-function getBuiltFonts(config) {
-    return config[BUILT_FONTS_KEY];
-}
 /**
  * Add TTFs to the iOS project (Resources group + UIAppFonts in Info.plist).
- * Reads cached built font paths from config._nanoIconsBuilt (set by the build mod) to prevent redundant builds for iOS and Android.
  */
-function withNanoIconsIos(config) {
+function withNanoIconsIos(config, iconSets) {
     config = (0, config_plugins_1.withXcodeProject)(config, async (config) => {
-        const built = getBuiltFonts(config);
+        const built = await (0, buildFonts_js_1.getOrBuildFonts)(config.modRequest.projectRoot, iconSets);
         if (!built?.length)
             return config;
         const ttfPaths = built.map((b) => b.ttfPath);
@@ -40,7 +36,7 @@ function withNanoIconsIos(config) {
         return config;
     });
     config = (0, config_plugins_1.withInfoPlist)(config, async (config) => {
-        const built = getBuiltFonts(config);
+        const built = await (0, buildFonts_js_1.getOrBuildFonts)(config.modRequest.projectRoot, iconSets);
         if (!built?.length)
             return config;
         const ttfPaths = built.map((b) => b.ttfPath);
@@ -62,13 +58,13 @@ function getUIAppFonts(infoPlist) {
     return [];
 }
 /**
- * Copy TTFs to Android assets/fonts. Reads paths from config._nanoIconsBuilt.
+ * Copy TTFs to Android assets/fonts.
  */
-function withNanoIconsAndroid(config) {
+function withNanoIconsAndroid(config, iconSets) {
     return (0, config_plugins_1.withDangerousMod)(config, [
         'android',
         async (config) => {
-            const built = getBuiltFonts(config);
+            const built = await (0, buildFonts_js_1.getOrBuildFonts)(config.modRequest.projectRoot, iconSets);
             if (!built?.length)
                 return config;
             const fontsDir = path_1.default.join(config.modRequest.platformProjectRoot, ANDROID_ASSETS_FONTS_DIR);
@@ -83,10 +79,10 @@ function withNanoIconsAndroid(config) {
     ]);
 }
 /**
- * Apply iOS and Android font linking. Built font list is read from config (set by build mod).
+ * Apply iOS and Android font linking.
  */
-function withNanoIconsFontLinking(config) {
-    config = withNanoIconsIos(config);
-    config = withNanoIconsAndroid(config);
+function withNanoIconsFontLinking(config, iconSets) {
+    config = withNanoIconsIos(config, iconSets);
+    config = withNanoIconsAndroid(config, iconSets);
     return config;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nano-icons",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Use any svg as font. High-performance, build-time icon font generation for React Native & Expo.",
   "react-native": "src/index.ts",
   "source": "src/index.ts",

package/plugin/src/buildFonts.ts

@@ -27,3 +27,16 @@ export async function buildAllFonts(
     return [];
   }
 }
+
+// Single build run per process; reused across ios/android mods.
+let _buildPromise: Promise<BuiltFont[]> | null = null;
+
+export function getOrBuildFonts(
+  projectRoot: string,
+  iconSets: IconSetConfig[]
+): Promise<BuiltFont[]> {
+  if (!_buildPromise) {
+    _buildPromise = buildAllFonts(iconSets, projectRoot);
+  }
+  return _buildPromise;
+}

package/plugin/src/index.ts

@@ -1,31 +1,6 @@
-import type {
-  ConfigPlugin,
-  ExportedConfigWithProps,
-} from '@expo/config-plugins';
-import { withDangerousMod } from '@expo/config-plugins';
-import { buildAllFonts } from './buildFonts.js';
+import type { ConfigPlugin } from '@expo/config-plugins';
 import { withNanoIconsFontLinking } from './withNanoIconsFontLinking.js';
-import type {
-  NanoIconsPluginOptions,
-  IconSetConfig,
-  BuiltFont,
-} from './types.js';
-
-const BUILT_FONTS_KEY = '_nanoIconsBuilt';
-
-// Single Pyodide/PathKit run for the whole prebuild; reused across ios/android mods.
-let _builtFontsCache: BuiltFont[] | null = null;
-
-function getOrBuildFonts(
-  projectRoot: string,
-  iconSets: IconSetConfig[]
-): Promise<BuiltFont[]> {
-  if (_builtFontsCache) return Promise.resolve(_builtFontsCache);
-  return buildAllFonts(iconSets, projectRoot).then((built: BuiltFont[]) => {
-    _builtFontsCache = built;
-    return built;
-  });
-}
+import type { NanoIconsPluginOptions } from './types.js';
 
 const withNanoIcons: ConfigPlugin<NanoIconsPluginOptions> = (
   config,
@@ -33,29 +8,7 @@ const withNanoIcons: ConfigPlugin<NanoIconsPluginOptions> = (
 ) => {
   if (!options?.iconSets?.length) return config;
 
-  // Build fonts (once per process, cached) and attach to config for linking mods.
-  config = withDangerousMod(config, [
-    'ios',
-    async (config: ExportedConfigWithProps<unknown>) => {
-      const projectRoot = config.modRequest.projectRoot;
-      const built = await getOrBuildFonts(projectRoot, options.iconSets);
-      (config as unknown as Record<string, unknown>)[BUILT_FONTS_KEY] = built;
-      return config;
-    },
-  ]);
-
-  config = withDangerousMod(config, [
-    'android',
-    async (config: ExportedConfigWithProps<unknown>) => {
-      const projectRoot = config.modRequest.projectRoot;
-      const built = await getOrBuildFonts(projectRoot, options.iconSets);
-      (config as unknown as Record<string, unknown>)[BUILT_FONTS_KEY] = built;
-      return config;
-    },
-  ]);
-
-  // Link built TTFs into native projects (reads _nanoIconsBuilt from config).
-  config = withNanoIconsFontLinking(config);
+  config = withNanoIconsFontLinking(config, options.iconSets);
 
   return config;
 };

package/plugin/src/withNanoIconsFontLinking.ts

@@ -4,31 +4,25 @@ import {
   withXcodeProject,
   withDangerousMod,
 } from '@expo/config-plugins';
+import type { InfoPlist } from '@expo/config-plugins';
 import fs from 'fs/promises';
 import path from 'path';
-import type { BuiltFont } from './types.js';
-type InfoPlist = Record<string, unknown>;
+import { getOrBuildFonts } from './buildFonts.js';
+import type { IconSetConfig } from './types.js';
 
 const ANDROID_ASSETS_FONTS_DIR = 'app/src/main/assets/fonts';
 
-const BUILT_FONTS_KEY = '_nanoIconsBuilt' as const;
-
-function getBuiltFonts(config: {
-  [key: string]: unknown;
-}): BuiltFont[] | undefined {
-  return config[BUILT_FONTS_KEY] as BuiltFont[] | undefined;
-}
-
 /**
  * Add TTFs to the iOS project (Resources group + UIAppFonts in Info.plist).
- * Reads cached built font paths from config._nanoIconsBuilt (set by the build mod) to prevent redundant builds for iOS and Android.
  */
 export function withNanoIconsIos(
-  config: Parameters<typeof withXcodeProject>[0]
+  config: Parameters<typeof withXcodeProject>[0],
+  iconSets: IconSetConfig[]
 ): ReturnType<typeof withXcodeProject> {
   config = withXcodeProject(config, async (config) => {
-    const built = getBuiltFonts(
-      config as unknown as { [key: string]: unknown }
+    const built = await getOrBuildFonts(
+      config.modRequest.projectRoot,
+      iconSets
     );
     if (!built?.length) return config;
     const ttfPaths = built.map((b) => b.ttfPath);
@@ -51,8 +45,9 @@ export function withNanoIconsIos(
   config = withInfoPlist(
     config as Parameters<typeof withInfoPlist>[0],
     async (config) => {
-      const built = getBuiltFonts(
-        config as unknown as { [key: string]: unknown }
+      const built = await getOrBuildFonts(
+        config.modRequest.projectRoot,
+        iconSets
       );
       if (!built?.length) return config;
       const ttfPaths = built.map((b) => b.ttfPath);
@@ -80,16 +75,18 @@ function getUIAppFonts(infoPlist: InfoPlist): string[] {
 }
 
 /**
- * Copy TTFs to Android assets/fonts. Reads paths from config._nanoIconsBuilt.
+ * Copy TTFs to Android assets/fonts.
  */
 export function withNanoIconsAndroid(
-  config: Parameters<typeof withDangerousMod>[0]
+  config: Parameters<typeof withDangerousMod>[0],
+  iconSets: IconSetConfig[]
 ): ReturnType<typeof withDangerousMod> {
   return withDangerousMod(config, [
     'android',
     async (config) => {
-      const built = getBuiltFonts(
-        config as unknown as { [key: string]: unknown }
+      const built = await getOrBuildFonts(
+        config.modRequest.projectRoot,
+        iconSets
       );
       if (!built?.length) return config;
       const fontsDir = path.join(
@@ -108,12 +105,13 @@ export function withNanoIconsAndroid(
 }
 
 /**
- * Apply iOS and Android font linking. Built font list is read from config (set by build mod).
+ * Apply iOS and Android font linking.
  */
 export function withNanoIconsFontLinking(
-  config: Parameters<typeof withNanoIconsIos>[0]
+  config: Parameters<typeof withNanoIconsIos>[0],
+  iconSets: IconSetConfig[]
 ): ReturnType<typeof withNanoIconsAndroid> {
-  config = withNanoIconsIos(config);
-  config = withNanoIconsAndroid(config);
+  config = withNanoIconsIos(config, iconSets);
+  config = withNanoIconsAndroid(config, iconSets);
   return config;
 }