Skip to content

Commit e4ab3c1

Browse files
author
Capacitor+ Bot
committed
chore: sync upstream PR ionic-team#8252 from @MOHITKOURAV01
2 parents 270d700 + 1202888 commit e4ab3c1

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

cli/src/ios/doctor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export async function doctorIOS(config: Config): Promise<void> {
1919
// check online datebase of common errors
2020
// check if www folder is empty (index.html does not exist)
2121
try {
22-
await check([() => checkBundler(config) || checkCocoaPods(config), () => checkWebDir(config), checkXcode]);
22+
await check([() => checkBundler(config), () => checkCocoaPods(config), () => checkWebDir(config), checkXcode]);
2323
logSuccess('iOS looking great! 👌');
2424
} catch (e: any) {
2525
fatal(e.stack ?? e);

cli/src/ios/update.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ async function updatePluginFiles(config: Config, plugins: Plugin[], deployment:
6868
}
6969

7070
async function generateCordovaPackageFiles(cordovaPlugins: Plugin[], config: Config) {
71-
cordovaPlugins.map((plugin: any) => {
72-
generateCordovaPackageFile(plugin, config);
73-
});
71+
await Promise.all(
72+
cordovaPlugins.map(async (plugin) => {
73+
await generateCordovaPackageFile(plugin, config);
74+
}),
75+
);
7476
}
7577

7678
async function generateCordovaPackageFile(p: Plugin, config: Config) {

cli/src/tasks/add.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function printNextSteps(platformName: string) {
112112

113113
function addChecks(config: Config, platformName: string): CheckFunction[] {
114114
if (platformName === config.ios.name) {
115-
return [() => checkIOSPackage(config), () => checkBundler(config) || checkCocoaPods(config)];
115+
return [() => checkIOSPackage(config), () => checkBundler(config), () => checkCocoaPods(config)];
116116
} else if (platformName === config.android.name) {
117117
return [() => checkAndroidPackage(config)];
118118
} else if (platformName === config.web.name) {

cli/src/tasks/update.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ export function updateChecks(config: Config, platforms: string[]): CheckFunction
5050
const checks: CheckFunction[] = [];
5151
for (const platformName of platforms) {
5252
if (platformName === config.ios.name) {
53-
checks.push(() => checkBundler(config) || checkCocoaPods(config));
53+
checks.push(() => checkBundler(config));
54+
checks.push(() => checkCocoaPods(config));
5455
} else if (platformName === config.android.name) {
5556
continue;
5657
} else if (platformName === config.web.name) {

0 commit comments

Comments
 (0)