@akylas/nativescript-cli 8.8.7 → 8.9.4

package/lib/common/file-system.js

@@ -19,7 +19,6 @@ const helpers_1 = require("./helpers");
 const constants_1 = require("../constants");
 const os_1 = require("os");
 const archiver_1 = require("archiver");
-const stringifyPackage = require("stringify-package");
 const mkdirp = require("mkdirp");
 const detectNewline = require("detect-newline");
 let FileSystem = FileSystem_1 = class FileSystem {
@@ -235,7 +234,7 @@ let FileSystem = FileSystem_1 = class FileSystem {
                 const existingFile = this.readText(filename);
                 newline = detectNewline(existingFile);
             }
-            stringifiedData = stringifyPackage(data, space, newline);
+            stringifiedData = JSON.stringify(data, null, space).concat(newline);
         }
         else {
             stringifiedData = JSON.stringify(data, null, space);

package/lib/common/logger/logger.js

@@ -18,7 +18,7 @@ const cli_layout_1 = require("./layouts/cli-layout");
 const constants_1 = require("../../constants");
 const yok_1 = require("../yok");
 const color_1 = require("../../color");
-const markedTerminal = require("marked-terminal").markedTerminal;
+const marked_terminal_1 = require("marked-terminal");
 class Logger {
     constructor($config) {
         this.$config = $config;
@@ -27,7 +27,7 @@ class Logger {
         this.passwordReplacement = "$1$3*******$2$4";
         this.defaultLogLevel = this.$config.DEBUG
             ? constants_1.LoggerLevel.TRACE
-            : constants_1.LoggerLevel.INFO;
+            : constants_1.LoggerLevel.WARN;
     }
     initialize(opts) {
         opts = opts || {};
@@ -123,8 +123,8 @@ class Logger {
                 },
             },
         };
-        marked_1.marked.use(markedTerminal(opts));
-        const formattedMessage = (0, marked_1.marked)(util.format.apply(null, args));
+        marked_1.marked.use((0, marked_terminal_1.markedTerminal)(opts));
+        const formattedMessage = marked_1.marked.parse(util.format.apply(null, args));
         this.info(formattedMessage, { [constants_1.LoggerConfigData.skipNewLine]: true });
     }
     isVerbose() {

package/lib/common/mobile/android/android-emulator-services.js

@@ -146,7 +146,7 @@ class AndroidEmulatorServices {
         }
         const minVersion = semver.coerce(constants_1.AndroidVirtualDevice.MIN_ANDROID_VERSION);
         const bestVersion = best && best.version && semver.coerce(best.version);
-        return bestVersion && semver.gte(bestVersion, minVersion) ? best : null;
+        return !bestVersion || semver.gte(bestVersion, minVersion) ? best : null;
     }
     async waitForEmulatorBootToComplete(emulator, endTimeEpoch, timeout) {
         this.$logger.info("Waiting for emulator device initialization...", {

package/lib/common/mobile/emulator-helper.js

@@ -7,6 +7,7 @@ const yok_1 = require("../yok");
 class EmulatorHelper {
     constructor() {
         this.mapAndroidApiLevelToVersion = {
+            "android-36": "16.0.0",
             "android-35": "15.0.0",
             "android-34": "14.0.0",
             "android-33": "13.0.0",

package/lib/common/mobile/mobile-core/devices-service.js

@@ -498,7 +498,8 @@ class DevicesService extends events_1.EventEmitter {
         }
         if (data.platform === this.$devicePlatformsConstants.visionOS &&
             deviceInstances.length) {
-            const runningDeviceInstance = deviceInstances.find((device) => device.deviceInfo.platform === this.$devicePlatformsConstants.visionOS);
+            const runningDeviceInstance = deviceInstances.find((device) => device.deviceInfo.platform ===
+                this.$devicePlatformsConstants.visionOS);
             if (!runningDeviceInstance) {
                 return this.startEmulatorCore(data);
             }

package/lib/common/opener.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Opener = void 0;
-const open_1 = require("open");
+const xopen = require("open");
 const yok_1 = require("./yok");
 class Opener {
     open(target, appname) {
-        return (0, open_1.default)(target, {
+        return xopen(target, {
             app: {
                 name: appname,
             },

package/lib/common/services/hooks-service.js

@@ -93,24 +93,38 @@ class HooksService {
         }
         return _.flatten(results);
     }
+    isESModule(hook) {
+        const ext = path.extname(hook.fullPath).toLowerCase();
+        return ext === ".mjs";
+    }
     async executeHook(directoryPath, hookName, hook, hookArguments) {
         hookArguments = hookArguments || {};
         let result;
         const relativePath = path.relative(directoryPath, hook.fullPath);
         const trackId = relativePath.replace(new RegExp("\\" + path.sep, "g"), constants_1.AnalyticsEventLabelDelimiter);
+        const isESM = this.isESModule(hook);
         let command = this.getSheBangInterpreter(hook);
         let inProc = false;
         if (!command) {
             command = hook.fullPath;
-            if (path.extname(hook.fullPath).toLowerCase() === ".js") {
+            if ([".mjs", ".cjs", ".js"].includes(path.extname(hook.fullPath).toLowerCase())) {
                 command = process.argv[0];
-                inProc = this.shouldExecuteInProcess(this.$fs.readText(hook.fullPath));
+                inProc = isESM
+                    ? true
+                    : this.shouldExecuteInProcess(this.$fs.readText(hook.fullPath));
             }
         }
         const startTime = this.$performanceService.now();
         if (inProc) {
             this.$logger.trace("Executing %s hook at location %s in-process", hookName, hook.fullPath);
-            const hookEntryPoint = require(hook.fullPath);
+            let hookEntryPoint;
+            if (isESM) {
+                const { default: hookFn } = await Promise.resolve(`${hook.fullPath}`).then(s => require(s));
+                hookEntryPoint = hookFn;
+            }
+            else {
+                hookEntryPoint = require(hook.fullPath);
+            }
             this.$logger.trace(`Validating ${hookName} arguments.`);
             const invalidArguments = this.validateHookArguments(hookEntryPoint, hook.fullPath);
             if (invalidArguments.length) {
@@ -119,7 +133,8 @@ class HooksService {
             }
             const projectDataHookArg = hookArguments["hookArgs"] && hookArguments["hookArgs"]["projectData"];
             if (projectDataHookArg) {
-                hookArguments["projectData"] = hookArguments["$projectData"] = projectDataHookArg;
+                hookArguments["projectData"] = hookArguments["$projectData"] =
+                    projectDataHookArg;
             }
             const maybePromise = this.$injector.resolve(hookEntryPoint, hookArguments);
             if (maybePromise) {
@@ -215,9 +230,11 @@ class HooksService {
     prepareEnvironment(hookFullPath) {
         const clientName = this.$staticConfig.CLIENT_NAME.toUpperCase();
         const environment = {};
-        environment[util.format("%s-COMMANDLINE", clientName)] = process.argv.join(" ");
+        environment[util.format("%s-COMMANDLINE", clientName)] =
+            process.argv.join(" ");
         environment[util.format("%s-HOOK_FULL_PATH", clientName)] = hookFullPath;
-        environment[util.format("%s-VERSION", clientName)] = this.$staticConfig.version;
+        environment[util.format("%s-VERSION", clientName)] =
+            this.$staticConfig.version;
         return {
             cwd: this.$projectHelper.projectDir,
             stdio: "inherit",

package/lib/constants.js

@@ -69,7 +69,7 @@ exports.APK_EXTENSION_NAME = ".apk";
 exports.AAB_EXTENSION_NAME = ".aab";
 exports.APKS_EXTENSION_NAME = ".apks";
 exports.HASHES_FILE_NAME = ".nshashes";
-exports.TNS_NATIVE_SOURCE_GROUP_NAME = "NSNativeSources";
+exports.TNS_NATIVE_SOURCE_GROUP_NAME = "AppResourcesSrc";
 exports.NATIVE_SOURCE_FOLDER = "src";
 exports.APPLICATION_RESPONSE_TIMEOUT_SECONDS = 60;
 exports.NATIVE_EXTENSION_FOLDER = "extensions";

package/lib/controllers/migrate-controller.js

@@ -40,7 +40,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/core",
                 minVersion: "6.5.0",
-                desiredVersion: "~8.8.0",
+                desiredVersion: "~8.9.0",
                 shouldAddIfMissing: true,
             },
             {
@@ -50,7 +50,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/types",
                 minVersion: "7.0.0",
-                desiredVersion: "~8.8.0",
+                desiredVersion: "~8.9.0",
                 isDev: true,
             },
             {
@@ -100,7 +100,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/angular",
                 minVersion: "10.0.0",
-                desiredVersion: "^18.0.0",
+                desiredVersion: "^19.0.0",
                 async shouldMigrateAction(dependency, projectData, loose) {
                     if (!this.hasDependency(dependency, projectData)) {
                         return false;
@@ -147,7 +147,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
                 packageName: "typescript",
                 isDev: true,
                 minVersion: "3.7.0",
-                desiredVersion: "~5.4.0",
+                desiredVersion: "~5.7.0",
             },
             {
                 packageName: "node-sass",
@@ -176,13 +176,13 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "@nativescript/ios",
                 minVersion: "6.5.3",
-                desiredVersion: "~8.8.0",
+                desiredVersion: "~8.9.0",
                 isDev: true,
             },
             {
                 packageName: "@nativescript/android",
                 minVersion: "7.0.0",
-                desiredVersion: "~8.8.0",
+                desiredVersion: "~8.9.0",
                 isDev: true,
             },
         ];
@@ -722,7 +722,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
     }
     async migrateNativeScriptAngular() {
         const minVersion = "10.0.0";
-        const desiredVersion = "~18.0.0";
+        const desiredVersion = "~19.1.0";
         const dependencies = [
             {
                 packageName: "@angular/animations",
@@ -781,7 +781,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             {
                 packageName: "zone.js",
                 minVersion: "0.11.1",
-                desiredVersion: "~0.14.0",
+                desiredVersion: "~0.15.0",
                 shouldAddIfMissing: true,
             },
             {

package/lib/controllers/prepare-controller.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrepareController = void 0;
-const choki = require("chokidar");
+const chokidar_1 = require("chokidar");
 const events_1 = require("events");
 const _ = require("lodash");
 const path = require("path");
@@ -186,9 +186,7 @@ class PrepareController extends events_1.EventEmitter {
             },
             ignored: ["**/.*", ".*"],
         };
-        const watcher = choki
-            .watch(patterns, watcherOptions)
-            .on("all", async (event, filePath) => {
+        const watcher = (0, chokidar_1.watch)(patterns, watcherOptions).on("all", async (event, filePath) => {
             if (this.isFileWatcherPaused())
                 return;
             filePath = path.join(projectData.projectDir, filePath);

package/lib/definitions/ios.d.ts

@@ -41,8 +41,18 @@ declare global {
 		): Promise<string>;
 	}
 
+	type IosSPMPackage = IosSPMPackageDefinition & { targets?: string[] };
+
 	interface ISPMService {
-		applySPMPackages(platformData: IPlatformData, projectData: IProjectData);
+		applySPMPackages(
+			platformData: IPlatformData,
+			projectData: IProjectData,
+			pluginSpmPackages?: IosSPMPackage[]
+		);
+		getSPMPackages(
+			projectData: IProjectData,
+			platform: string
+		): IosSPMPackage[];
 	}
 
 	interface IXcodebuildArgsService {

package/lib/definitions/project.d.ts

@@ -101,10 +101,36 @@ interface INsConfigPlaform {
 	id?: string;
 }
 
+interface IOSSPMPackageBase {
+	name: string;
+	libs: string[];
+	/**
+	 * Optional: If you have more targets (like widgets for example)
+	 * you can list their names here to include the Swift Package with them
+	 */
+	targets?: string[];
+}
+
+export interface IOSRemoteSPMPackage extends IOSSPMPackageBase {
+	repositoryURL: string;
+	version: string;
+}
+
+export interface IOSLocalSPMPackage extends IOSSPMPackageBase {
+	path: string;
+}
+
+export type IOSSPMPackage = IOSRemoteSPMPackage | IOSLocalSPMPackage;
+
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
 	runtimePackageName?: string
 	cocoapodUseBundleExec?: boolean
+	/**
+	 * Swift Package Manager
+	 * List packages to be included in the iOS build.
+	 */
+	SPMPackages?: Array<IOSSPMPackage>;
 }
 
 interface INSConfigVisionOS extends INsConfigIOS {}
@@ -218,7 +244,7 @@ interface IProjectData extends ICreateProjectData {
 	initializeProjectData(projectDir?: string): void;
 	initializeProjectDataFromContent(
 		packageJsonContent: string,
-		projectDir?: string
+		projectDir?: string,
 	): void;
 	getAppDirectoryPath(projectDir?: string): string;
 	getAppDirectoryRelativePath(): string;
@@ -309,7 +335,7 @@ interface IProjectDataService {
 	 */
 	getRuntimePackage(
 		projectDir: string,
-		platform: SupportedPlatform
+		platform: SupportedPlatform,
 	): IBasePluginData;
 
 	/**
@@ -329,7 +355,7 @@ interface IProjectCleanupService {
 	 */
 	clean(
 		pathsToClean: string[],
-		options?: IProjectCleanupOptions
+		options?: IProjectCleanupOptions,
 	): Promise<IProjectCleanupResult>;
 
 	/**
@@ -338,7 +364,7 @@ interface IProjectCleanupService {
 	 */
 	cleanPath(
 		pathToClean: string,
-		options?: IProjectCleanupOptions
+		options?: IProjectCleanupOptions,
 	): Promise<IProjectCleanupResult>;
 }
 
@@ -440,7 +466,7 @@ interface IProjectConfigService {
 
 	writeLegacyNSConfigIfNeeded(
 		projectDir: string,
-		runtimePackage: IBasePluginData
+		runtimePackage: IBasePluginData,
 	): Promise<void>;
 }
 
@@ -543,14 +569,14 @@ interface IProjectTemplatesService {
 	 */
 	prepareTemplate(
 		templateName: string,
-		projectDir: string
+		projectDir: string,
 	): Promise<ITemplateData>;
 }
 
 interface IPlatformProjectServiceBase {
 	getPluginPlatformsFolderPath(
 		pluginData: IPluginData,
-		platform: string
+		platform: string,
 	): string;
 	getFrameworkVersion(projectData: IProjectData): string;
 }
@@ -612,7 +638,7 @@ interface ILocalBuildService {
 	 */
 	build(
 		platform: string,
-		platformBuildOptions: IPlatformBuildData
+		platformBuildOptions: IPlatformBuildData,
 	): Promise<string>;
 	/**
 	 * Removes build artifacts specific to the platform
@@ -632,7 +658,7 @@ interface ITestExecutionService {
 	startKarmaServer(
 		platform: string,
 		liveSyncInfo: ILiveSyncInfo,
-		deviceDescriptors: ILiveSyncDeviceDescriptor[]
+		deviceDescriptors: ILiveSyncDeviceDescriptor[],
 	): Promise<void>;
 	canStartKarmaServer(projectData: IProjectData): Promise<boolean>;
 }
@@ -666,17 +692,17 @@ interface ICocoaPodsService {
 	 */
 	applyPodfileFromAppResources(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	applyPodfileArchExclusions(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	applyPodfileFromExtensions(
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	/**
@@ -691,7 +717,7 @@ interface ICocoaPodsService {
 		moduleName: string,
 		podfilePath: string,
 		projectData: IProjectData,
-		platformData: IPlatformData
+		platformData: IPlatformData,
 	): Promise<void>;
 
 	/**
@@ -713,7 +739,7 @@ interface ICocoaPodsService {
 		moduleName: string,
 		podfilePath: string,
 		projectData: IProjectData,
-		nativeProjectPath: string
+		nativeProjectPath: string,
 	): void;
 
 	/**
@@ -731,7 +757,7 @@ interface ICocoaPodsService {
 	 */
 	executePodInstall(
 		projectRoot: string,
-		xcodeProjPath: string
+		xcodeProjPath: string,
 	): Promise<ISpawnResult>;
 
 	/**
@@ -743,7 +769,7 @@ interface ICocoaPodsService {
 	mergePodXcconfigFile(
 		projectData: IProjectData,
 		platformData: IPlatformData,
-		opts: IRelease
+		opts: IRelease,
 	): Promise<void>;
 }
 
@@ -751,16 +777,16 @@ interface ICocoaPodsPlatformManager {
 	addPlatformSection(
 		projectData: IProjectData,
 		podfilePlatformData: IPodfilePlatformData,
-		projectPodfileContent: string
+		projectPodfileContent: string,
 	): string;
 	removePlatformSection(
 		moduleName: string,
 		projectPodFileContent: string,
-		podfilePath: string
+		podfilePath: string,
 	): string;
 	replacePlatformRow(
 		podfileContent: string,
-		podfilePath: string
+		podfilePath: string,
 	): { replacedContent: string; podfilePlatformData: IPodfilePlatformData };
 }
 
@@ -785,24 +811,24 @@ interface IIOSNativeTargetService {
 		targetType: string,
 		project: IXcode.project,
 		platformData: IPlatformData,
-		parentTarget?: string
+		parentTarget?: string,
 	): IXcode.target;
 	prepareSigning(
 		targetUuids: string[],
 		projectData: IProjectData,
-		projectPath: string
+		projectPath: string,
 	): void;
 	getTargetDirectories(folderPath: string): string[];
 	setXcodeTargetBuildConfigurationProperties(
 		properties: IXcodeTargetBuildConfigurationProperty[],
 		targetName: string,
-		project: IXcode.project
+		project: IXcode.project,
 	): void;
 	setConfigurationsFromJsonFile(
 		jsonPath: string,
 		targetUuid: string,
 		targetName: string,
-		project: IXcode.project
+		project: IXcode.project,
 	): void;
 }
 
@@ -811,7 +837,7 @@ interface IIOSNativeTargetService {
  */
 interface IIOSExtensionsService {
 	addExtensionsFromPath(
-		options: IAddExtensionsFromPathOptions
+		options: IAddExtensionsFromPathOptions,
 	): Promise<boolean>;
 	removeExtensions(options: IRemoveExtensionsOptions): void;
 }

package/lib/node-package-manager.js

@@ -30,7 +30,7 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
         const packageJsonPath = (0, path_1.join)(pathToSave, "package.json");
         const jsonContentBefore = this.$fs.readJson(packageJsonPath);
         const flags = this.getFlagsString(config, true);
-        let params = ["install", "--legacy-peer-deps"];
+        let params = ["install"];
         const isInstallingAllDependencies = packageName === pathToSave;
         if (!isInstallingAllDependencies) {
             params.push(packageName);

package/lib/services/analytics/analytics-service.js

@@ -167,7 +167,8 @@ class AnalyticsService {
             const projectData = this.$projectDataService.getProjectData(projectDir);
             customDimensions["cd2"] =
                 projectData.projectType;
-            customDimensions["cd9"] = projectData.isShared.toString();
+            customDimensions["cd9"] =
+                projectData.isShared.toString();
         }
         return customDimensions;
     }

package/lib/services/android/gradle-build-args-service.js

@@ -56,7 +56,7 @@ class GradleBuildArgsService {
             args.push("--debug");
         }
         else if (logLevel === "INFO") {
-            args.push("--quiet");
+            args.push("--info");
         }
         return args;
     }

package/lib/services/android-plugin-build-service.js

@@ -454,7 +454,7 @@ class AndroidPluginBuildService {
             localArgs.push(...additionalArgs);
         }
         if (this.$logger.getLevel() === "INFO") {
-            localArgs.push("--quiet");
+            localArgs.push("--info");
         }
         const opts = {
             cwd: pluginBuildSettings.pluginDir,

package/lib/services/assets-generation/assets-generation-service.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsGenerationService = void 0;
-const Jimp = require("jimp");
+const JimpModule = require("jimp");
 const Color = require("color");
 const decorators_1 = require("../../common/decorators");
 const constants_1 = require("../../constants");
@@ -67,7 +67,7 @@ class AssetsGenerationService {
                 }
                 try {
                     const color = (_e = (_c = generationData[(_b = assetItem.data) === null || _b === void 0 ? void 0 : _b.fromKey]) !== null && _c !== void 0 ? _c : (_d = assetItem.data) === null || _d === void 0 ? void 0 : _d.default) !== null && _e !== void 0 ? _e : "white";
-                    const colorHEX = Jimp.cssColorToHex(color);
+                    const colorHEX = JimpModule.cssColorToHex(color);
                     const hex = (_f = colorHEX === null || colorHEX === void 0 ? void 0 : colorHEX.toString(16).substring(0, 6)) !== null && _f !== void 0 ? _f : "FFFFFF";
                     this.$fs.writeFile(assetItem.path, [
                         `<?xml version="1.0" encoding="utf-8"?>`,
@@ -112,38 +112,49 @@ class AssetsGenerationService {
                         constants_1.AssetConstants.defaultOverlayImageScale;
                     const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
                     image = await this.resize(generationData.imagePath, imageResize, imageResize);
-                    image = this.generateImage(background, width, height, outputPath, image);
+                    image = this.generateImage(background, width, height, image);
                     break;
                 case "blank":
-                    image = this.generateImage(background, width, height, outputPath);
+                    image = this.generateImage(background, width, height);
                     break;
                 case "resize":
                     image = await this.resize(generationData.imagePath, width, height);
                     break;
                 case "outerScale":
                     image = await this.resize(generationData.imagePath, assetItem.width, assetItem.height);
-                    image = this.generateImage("#00000000", width, height, outputPath, image);
+                    image = this.generateImage("#00000000", width, height, image);
                     break;
                 default:
                     throw new Error(`Invalid image generation operation: ${operation}`);
             }
             if (assetItem.rgba === false) {
-                image = image.colorType(2);
+                image = this.generateImage("#FFFFFF", image.width, image.height, image);
+            }
+            if (this.isAssetFilePath(outputPath)) {
+                image.write(outputPath);
+            }
+            else {
+                this.$logger.warn(`Incorrect destination path ${outputPath} for image ${assetItem.filename}`);
             }
-            image.write(outputPath);
         }
     }
     async resize(imagePath, width, height) {
-        const image = await Jimp.read(imagePath);
-        return image.scaleToFit(width, height);
+        const image = await JimpModule.Jimp.read(imagePath);
+        return image.scaleToFit({
+            w: width,
+            h: height,
+        });
     }
-    generateImage(background, width, height, outputPath, overlayImage) {
-        const J = Jimp;
+    generateImage(background, width, height, overlayImage) {
         const backgroundColor = this.getRgbaNumber(background);
-        let image = new J(width, height, backgroundColor);
+        let image = new JimpModule.Jimp({
+            width,
+            height,
+            color: backgroundColor,
+        });
         if (overlayImage) {
-            const centeredWidth = (width - overlayImage.bitmap.width) / 2;
-            const centeredHeight = (height - overlayImage.bitmap.height) / 2;
+            const centeredWidth = (width - overlayImage.width) / 2;
+            const centeredHeight = (height - overlayImage.height) / 2;
             image = image.composite(overlayImage, centeredWidth, centeredHeight);
         }
         return image;
@@ -152,7 +163,14 @@ class AssetsGenerationService {
         const color = new Color(colorString);
         const colorRgb = color.rgb();
         const alpha = Math.round(colorRgb.alpha() * 255);
-        return Jimp.rgbaToInt(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
+        return JimpModule.rgbaToInt(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
+    }
+    isAssetFilePath(path) {
+        if (!path) {
+            return false;
+        }
+        const index = path.lastIndexOf(".");
+        return index > -1 && index < path.length - 1;
     }
 }
 exports.AssetsGenerationService = AssetsGenerationService;

package/lib/services/ios/spm-service.js

@@ -15,9 +15,13 @@ class SPMService {
         const spmPackages = this.$projectConfigService.getValue(`${platform}.SPMPackages`, []);
         return spmPackages;
     }
-    async applySPMPackages(platformData, projectData) {
+    async applySPMPackages(platformData, projectData, pluginSpmPackages) {
+        var _a;
         try {
             const spmPackages = this.getSPMPackages(projectData, platformData.platformNameLowerCase);
+            if (pluginSpmPackages === null || pluginSpmPackages === void 0 ? void 0 : pluginSpmPackages.length) {
+                spmPackages.push(...pluginSpmPackages);
+            }
             if (!spmPackages.length) {
                 this.$logger.trace("SPM: no SPM packages to apply.");
                 return;
@@ -40,6 +44,11 @@ class SPMService {
                 }
                 this.$logger.trace(`SPM: adding package ${pkg.name} to project.`, pkg);
                 await project.ios.addSPMPackage(projectData.projectName, pkg);
+                if ((_a = pkg.targets) === null || _a === void 0 ? void 0 : _a.length) {
+                    for (const target of pkg.targets) {
+                        await project.ios.addSPMPackage(target, pkg);
+                    }
+                }
             }
             await project.commit();
             await this.resolveSPMDependencies(platformData, projectData);