Revert "Use asset catalog for ios images"

This reverts commit ce0652c.

packages/cli-plugin-metro/src/commands/bundle/assetPathUtils.ts

@@ -64,7 +64,7 @@ function getAndroidResourceFolderName(
   return androidFolder;
 }
 
-function getResourceIdentifier(asset: PackagerAsset): string {
+function getAndroidResourceIdentifier(asset: PackagerAsset): string {
   const folderPath = getBasePath(asset);
   return `${folderPath}/${asset.name}`
     .toLowerCase()
@@ -84,6 +84,6 @@ function getBasePath(asset: PackagerAsset): string {
 export default {
   getAndroidAssetSuffix,
   getAndroidResourceFolderName,
-  getResourceIdentifier,
+  getAndroidResourceIdentifier,
   getBasePath,
 };

packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts

@@ -119,12 +119,7 @@ export async function buildBundleWithConfig(
     });
 
     // When we're done saving bundle output and the assets, we're done.
-    return await saveAssets(
-      outputAssets,
-      args.platform,
-      args.assetsDest,
-      args.assetCatalogDest,
-    );
+    return await saveAssets(outputAssets, args.platform, args.assetsDest);
   } finally {
     server.end();
   }

packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts

@@ -10,7 +10,6 @@ import path from 'path';
 
 export interface CommandLineArgs {
   assetsDest?: string;
-  assetCatalogDest?: string;
   entryFile: string;
   resetCache: boolean;
   resetGlobalCache: boolean;
@@ -103,10 +102,6 @@ export default [
     description:
       'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
   },
-  {
-    name: '--asset-catalog-dest [string]',
-    description: 'Path where to create an iOS Asset Catalog for images',
-  },
   {
     name: '--reset-cache',
     description: 'Removes cached files',

packages/cli-plugin-metro/src/commands/bundle/getAssetDestPathAndroid.ts

@@ -14,7 +14,7 @@ function getAssetDestPathAndroid(asset: PackagerAsset, scale: number): string {
     asset,
     scale,
   );
-  const fileName = assetPathUtils.getResourceIdentifier(asset);
+  const fileName = assetPathUtils.getAndroidResourceIdentifier(asset);
   return path.join(androidFolder, `${fileName}.${asset.type}`);
 }
 

packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts

@@ -6,19 +6,14 @@
  *
  */
 
-import {logger} from '@react-native-community/cli-tools';
-import fs from 'fs';
 import path from 'path';
-import {
-  cleanAssetCatalog,
-  getImageSet,
-  isCatalogAsset,
-  writeImageSet,
-} from './assetCatalogIOS';
-import {AssetData} from './buildBundle';
+import fs from 'fs';
+
 import filterPlatformAssetScales from './filterPlatformAssetScales';
 import getAssetDestPathAndroid from './getAssetDestPathAndroid';
 import getAssetDestPathIOS from './getAssetDestPathIOS';
+import {logger} from '@react-native-community/cli-tools';
+import type {AssetData} from './buildBundle';
 
 interface CopiedFiles {
   [src: string]: string;
@@ -28,23 +23,20 @@ function saveAssets(
   assets: AssetData[],
   platform: string,
   assetsDest: string | undefined,
-  assetCatalogDest: string | undefined,
 ) {
   if (!assetsDest) {
     logger.warn('Assets destination folder is not set, skipping...');
-    return;
+    return Promise.resolve();
   }
 
-  const filesToCopy: CopiedFiles = Object.create(null); // Map src -> dest
-
   const getAssetDestPath =
     platform === 'android' ? getAssetDestPathAndroid : getAssetDestPathIOS;
 
-  const addAssetToCopy = (asset: AssetData) => {
+  const filesToCopy: CopiedFiles = Object.create(null); // Map src -> dest
+  assets.forEach((asset) => {
     const validScales = new Set(
       filterPlatformAssetScales(platform, asset.scales),
     );
-
     asset.scales.forEach((scale, idx) => {
       if (!validScales.has(scale)) {
         return;
@@ -53,37 +45,7 @@ function saveAssets(
       const dest = path.join(assetsDest, getAssetDestPath(asset, scale));
       filesToCopy[src] = dest;
     });
-  };
-
-  if (platform === 'ios' && assetCatalogDest != null) {
-    // Use iOS Asset Catalog for images. This will allow Apple app thinning to
-    // remove unused scales from the optimized bundle.
-    const catalogDir = path.join(assetCatalogDest, 'RNAssets.xcassets');
-    if (!fs.existsSync(catalogDir)) {
-      logger.error(
-        `Could not find asset catalog 'RNAssets.xcassets' in ${assetCatalogDest}. Make sure to create it if it does not exist.`,
-      );
-      return;
-    }
-
-    logger.info('Adding images to asset catalog', catalogDir);
-    cleanAssetCatalog(catalogDir);
-    for (const asset of assets) {
-      if (isCatalogAsset(asset)) {
-        const imageSet = getImageSet(
-          catalogDir,
-          asset,
-          filterPlatformAssetScales(platform, asset.scales),
-        );
-        writeImageSet(imageSet);
-      } else {
-        addAssetToCopy(asset);
-      }
-    }
-    logger.info('Done adding images to asset catalog');
-  } else {
-    assets.forEach(addAssetToCopy);
-  }
+  });
 
   return copyAll(filesToCopy);
 }
@@ -95,7 +57,7 @@ function copyAll(filesToCopy: CopiedFiles) {
   }
 
   logger.info(`Copying ${queue.length} asset files`);
-  return new Promise<void>((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     const copyNext = (error?: NodeJS.ErrnoException) => {
       if (error) {
         reject(error);