fix(cli): also generate packageClassList on copy (#7358)

ionic-team · Mar 19, 2024 · 865cceb · 865cceb
1 parent 7113a19
commit 865cceb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/cli/src/ios/update.ts b/cli/src/ios/update.ts
@@ -31,11 +31,7 @@ import {
 import type { Plugin } from '../plugin';
 import { copy as copyTask } from '../tasks/copy';
 import { convertToUnixPath } from '../util/fs';
-import {
-  getPluginFiles,
-  findPluginClasses,
-  writePluginJSON,
-} from '../util/iosplugin';
+import { generateIOSPackageJSON } from '../util/iosplugin';
 import { resolveNode } from '../util/node';
 import { checkPackageManager, generatePackageFile } from '../util/spm';
 import { runCommand, isInstalled } from '../util/subprocess';
@@ -180,15 +176,6 @@ end`,
   }
 }
 
-async function generateIOSPackageJSON(
-  config: Config,
-  plugins: Plugin[],
-): Promise<void> {
-  const fileList = await getPluginFiles(plugins);
-  const classList = await findPluginClasses(fileList);
-  writePluginJSON(config, classList);
-}
-
 async function getRelativeCapacitoriOSPath(config: Config) {
   const capacitoriOSPath = resolveNode(
     config.app.rootDir,

diff --git a/cli/src/tasks/copy.ts b/cli/src/tasks/copy.ts
@@ -17,8 +17,10 @@ import {
 } from '../cordova';
 import type { Config } from '../definitions';
 import { isFatal } from '../errors';
+import { getIOSPlugins } from '../ios/common';
 import { logger } from '../log';
 import { getPlugins } from '../plugin';
+import { generateIOSPackageJSON } from '../util/iosplugin';
 import { allSerial } from '../util/promise';
 import { copyWeb } from '../web/copy';
 
@@ -135,6 +137,8 @@ export async function copy(
       await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
       const cordovaPlugins = await getCordovaPlugins(config, platformName);
       await handleCordovaPluginsJS(cordovaPlugins, config, platformName);
+      const iosPlugins = await getIOSPlugins(allPlugins);
+      await generateIOSPackageJSON(config, iosPlugins);
     } else if (platformName === config.android.name) {
       if (usesFederatedCapacitor) {
         await copyFederatedWebDirs(config, config.android.webDirAbs);

diff --git a/cli/src/util/iosplugin.ts b/cli/src/util/iosplugin.ts
@@ -68,3 +68,12 @@ export async function writePluginJSON(
   capJSON['packageClassList'] = classList;
   writeJSONSync(capJSONFile, capJSON, { spaces: '\t' });
 }
+
+export async function generateIOSPackageJSON(
+  config: Config,
+  plugins: Plugin[],
+): Promise<void> {
+  const fileList = await getPluginFiles(plugins);
+  const classList = await findPluginClasses(fileList);
+  writePluginJSON(config, classList);
+}