nativescript 9.1.0-alpha.0 → 9.1.0-alpha.2

package/lib/project-data.js

@@ -25,7 +25,6 @@ class ProjectData {
         this.projectIdentifiers.ios = identifier;
         this.projectIdentifiers.android = identifier;
         this.projectIdentifiers.visionos = identifier;
-        this.projectIdentifiers.macos = identifier;
     }
     constructor($fs, $errors, $projectHelper, $staticConfig, $options, $logger, $injector, $androidResourcesMigrationService, $devicePlatformsConstants) {
         this.$fs = $fs;
@@ -176,14 +175,12 @@ class ProjectData {
                 ios: "",
                 android: "",
                 visionos: "",
-                macos: "",
             };
         }
         const identifier = {
             ios: config.id,
             android: config.id,
             visionos: config.id,
-            macos: config.id,
         };
         if (config.ios && config.ios.id) {
             identifier.ios = config.ios.id;
@@ -194,9 +191,6 @@ class ProjectData {
         if (config.visionos && config.visionos.id) {
             identifier.visionos = config.visionos.id;
         }
-        if (config.macos && config.macos.id) {
-            identifier.macos = config.macos.id;
-        }
         return identifier;
     }
     getProjectType() {

package/lib/services/bundler/bundler-compiler-service.js

@@ -36,6 +36,9 @@ class BundlerCompilerService extends events_1.EventEmitter {
         this.bundlerProcesses = {};
         this.expectedHashes = {};
     }
+    getViteDistOutputPath(projectDir) {
+        return path.join(projectDir, process.env.NS_VITE_DIST_DIR || constants_1.VITE_DIST_FOLDER_NAME);
+    }
     async compileWithWatch(platformData, projectData, prepareData) {
         return new Promise(async (resolve, reject) => {
             if (this.bundlerProcesses[platformData.platformNameLowerCase]) {
@@ -67,7 +70,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
                             console.log("Received Vite IPC message:", message);
                         }
                         // Copy Vite output files directly to platform destination
-                        const distOutput = path.join(projectData.projectDir, ".ns-vite-build");
+                        const distOutput = this.getViteDistOutputPath(projectData.projectDir);
                         const destDir = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
                         if (debugLog) {
                             console.log(`Copying from ${distOutput} to ${destDir}.`);
@@ -96,6 +99,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
                                 console.log("Vite first build completed, resolving compileWithWatch");
                             }
                             resolve(childProcess);
+                            return;
                         }
                         // Transform Vite message to match webpack format
                         const files = message.emittedFiles.map((file) => path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName, file));
@@ -214,11 +218,31 @@ class BundlerCompilerService extends events_1.EventEmitter {
                     delete this.bundlerProcesses[platformData.platformNameLowerCase];
                     reject(err);
                 });
+                const isVite = this.getBundler() === "vite";
                 childProcess.on("close", async (arg) => {
                     await this.$cleanupService.removeKillProcess(childProcess.pid.toString());
                     delete this.bundlerProcesses[platformData.platformNameLowerCase];
                     const exitCode = typeof arg === "number" ? arg : arg && arg.code;
                     if (exitCode === 0) {
+                        // Non-watch Vite builds spawn the child with stdio:"inherit"
+                        // (no IPC channel), so the emittedFiles message handler in
+                        // compileWithWatch never fires and the Vite output is never
+                        // copied to the platforms app folder. Mirror that copy step
+                        // here so release/CI prepare and build flows actually deploy
+                        // the freshly built bundle. Without this, the deploy folder
+                        // is left empty (or worse, runs stale dev/HMR artifacts from
+                        // a previous `ns debug` run) and the runtime crashes on
+                        // launch with `Check failed: has_pending_exception()`.
+                        if (isVite) {
+                            try {
+                                const distOutput = this.getViteDistOutputPath(projectData.projectDir);
+                                const destDir = path.join(platformData.appDestinationDirectoryPath, this.$options.hostProjectModuleName);
+                                this.copyViteBundleToNative(distOutput, destDir);
+                            }
+                            catch (copyErr) {
+                                this.$logger.warn(`Failed to copy Vite output to platform destination: ${copyErr.message}`);
+                            }
+                        }
                         resolve();
                     }
                     else {
@@ -244,13 +268,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
             }
         }
     }
-    async shouldUsePreserveSymlinksOption(projectData) {
-        // Modern bundlers (webpack v5+ and rspack) are more sensitive to
-        // duplicate module identities when symlink paths are preserved.
-        // In local file-linked setups this can load webpack internals twice.
-        if (this.isModernBundler(projectData)) {
-            return false;
-        }
+    async shouldUsePreserveSymlinksOption() {
         // pnpm does not require symlink (https://github.com/nodejs/node-eps/issues/46#issuecomment-277373566)
         // and it also does not work in some cases.
         // Check https://github.com/NativeScript/nativescript-cli/issues/5259 for more information
@@ -282,7 +300,7 @@ class BundlerCompilerService extends events_1.EventEmitter {
             ]
             : cliArgs;
         const additionalNodeArgs = semver.major(process.version) <= 8 ? ["--harmony"] : [];
-        if (await this.shouldUsePreserveSymlinksOption(projectData)) {
+        if (await this.shouldUsePreserveSymlinksOption()) {
             additionalNodeArgs.push("--preserve-symlinks");
         }
         if (process.arch === "x64") {
@@ -318,7 +336,6 @@ class BundlerCompilerService extends events_1.EventEmitter {
                 USER_PROJECT_PLATFORMS_ANDROID: this.$options.hostProjectPath,
                 USER_PROJECT_PLATFORMS_ANDROID_MODULE: this.$options.hostProjectModuleName,
                 USER_PROJECT_PLATFORMS_IOS: this.$options.hostProjectPath,
-                USER_PROJECT_PLATFORMS_MACOS: this.$options.hostProjectPath,
             });
         }
         if (debugLog) {
@@ -333,9 +350,6 @@ class BundlerCompilerService extends events_1.EventEmitter {
         var _a, _b, _c;
         const { env } = prepareData;
         const envData = Object.assign({}, env, { [platform.toLowerCase()]: true });
-        if (platform.toLowerCase() === "macos") {
-            envData.platform = "macos";
-        }
         const appId = projectData.projectIdentifiers[platform];
         const appPath = projectData.getAppDirectoryRelativePath();
         const appResourcesPath = projectData.getAppResourcesRelativeDirectoryPath();

package/lib/services/debug-service-base.js

@@ -43,7 +43,7 @@ class DebugServiceBase extends events_1.EventEmitter {
         if (debugOptions.useHttpUrl) {
             chromeDevToolsPrefix = `https://chrome-devtools-frontend.appspot.com/serve_file/@${commitSHA}`;
         }
-        const chromeUrl = `${chromeDevToolsPrefix}/inspector.html?ws=localhost:${port}`;
+        const chromeUrl = `${chromeDevToolsPrefix}/inspector.html?ws=127.0.0.1:${port}`;
         return chromeUrl;
     }
 }

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

@@ -8,11 +8,12 @@ const _ = require("lodash");
 const yok_1 = require("../../common/yok");
 const constants = require("../../constants");
 class IOSSigningService {
-    constructor($errors, $fs, $iOSProvisionService, $logger, $pbxprojDomXcode, $prompter, $xcconfigService, $xcprojService) {
+    constructor($errors, $fs, $iOSProvisionService, $logger, $options, $pbxprojDomXcode, $prompter, $xcconfigService, $xcprojService) {
         this.$errors = $errors;
         this.$fs = $fs;
         this.$iOSProvisionService = $iOSProvisionService;
         this.$logger = $logger;
+        this.$options = $options;
         this.$pbxprojDomXcode = $pbxprojDomXcode;
         this.$prompter = $prompter;
         this.$xcconfigService = $xcconfigService;
@@ -150,6 +151,7 @@ class IOSSigningService {
         return [];
     }
     async getManualSigningConfiguration(projectData, provision, mobileProvisionData) {
+        var _a;
         const pickStart = Date.now();
         const mobileprovision = mobileProvisionData ||
             (await this.$iOSProvisionService.pick(provision, projectData.projectIdentifiers.ios));
@@ -162,6 +164,7 @@ class IOSSigningService {
         if (!mobileprovision) {
             this.$errors.fail("Failed to find mobile provision with UUID or Name: " + provision);
         }
+        const isVisionOS = ((_a = this.$options.platformOverride) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "visionos";
         const configuration = {
             team: mobileprovision.TeamIdentifier &&
                 mobileprovision.TeamIdentifier.length > 0
@@ -170,8 +173,12 @@ class IOSSigningService {
             uuid: mobileprovision.UUID,
             name: mobileprovision.Name,
             identity: mobileprovision.Type === "Development"
-                ? "iPhone Developer"
-                : "iPhone Distribution",
+                ? isVisionOS
+                    ? "Apple Development"
+                    : "iPhone Developer"
+                : isVisionOS
+                    ? "Apple Distribution"
+                    : "iPhone Distribution",
         };
         return configuration;
     }

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

@@ -86,18 +86,11 @@ class SPMService {
         }
     }
     async resolveSPMDependencies(platformData, projectData) {
-        let destination = "generic/platform=iOS";
-        if (platformData.platformNameLowerCase === "visionos") {
-            destination = "generic/platform=visionOS";
-        }
-        else if (platformData.platformNameLowerCase === "macos") {
-            destination = "generic/platform=macOS";
-        }
         await this.$xcodebuildCommandService.executeCommand(this.$xcodebuildArgsService
             .getXcodeProjectArgs(platformData, projectData)
             .concat([
             "-destination",
-            destination,
+            "generic/platform=iOS",
             "-resolvePackageDependencies",
         ]), {
             cwd: projectData.projectDir,

package/lib/services/ios/xcodebuild-args-service.js

@@ -18,11 +18,7 @@ class XcodebuildArgsService {
     }
     async getBuildForSimulatorArgs(platformData, projectData, buildConfig) {
         let args = await this.getArchitecturesArgs(buildConfig);
-        const isMacOS = this.$devicePlatformsConstants.ismacOS(buildConfig.platform);
-        if (isMacOS) {
-            args = args.concat(["CODE_SIGNING_ALLOWED=NO"]);
-        }
-        else if (this.$iOSWatchAppService.hasWatchApp(platformData, projectData)) {
+        if (this.$iOSWatchAppService.hasWatchApp(platformData, projectData)) {
             args = args.concat(["CODE_SIGNING_ALLOWED=NO"]);
         }
         else {
@@ -30,9 +26,6 @@ class XcodebuildArgsService {
         }
         let destination = "generic/platform=iOS Simulator";
         let isvisionOS = this.$devicePlatformsConstants.isvisionOS(buildConfig.platform);
-        if (isMacOS) {
-            destination = "generic/platform=macOS";
-        }
         if (isvisionOS) {
             destination = "generic/platform=visionOS Simulator";
             if (buildConfig._device) {
@@ -47,11 +40,9 @@ class XcodebuildArgsService {
             "-configuration",
             buildConfig.release ? constants_1.Configurations.Release : constants_1.Configurations.Debug,
         ])
-            .concat(this.getBuildCommonArgs(platformData, projectData, isMacOS
-            ? ios_project_service_1.MacOSPlatformSdkName
-            : isvisionOS
-                ? ios_project_service_1.VisionSimulatorPlatformSdkName
-                : ios_project_service_1.SimulatorPlatformSdkName))
+            .concat(this.getBuildCommonArgs(platformData, projectData, isvisionOS
+            ? ios_project_service_1.VisionSimulatorPlatformSdkName
+            : ios_project_service_1.SimulatorPlatformSdkName))
             .concat(this.getBuildLoggingArgs())
             .concat(this.getXcodeProjectArgs(platformData, projectData));
         return args;
@@ -61,10 +52,6 @@ class XcodebuildArgsService {
         const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
         let destination = "generic/platform=iOS";
         let isvisionOS = this.$devicePlatformsConstants.isvisionOS(buildConfig.platform);
-        const isMacOS = this.$devicePlatformsConstants.ismacOS(buildConfig.platform);
-        if (isMacOS) {
-            destination = "generic/platform=macOS";
-        }
         if (isvisionOS) {
             destination = "generic/platform=visionOS";
             if (buildConfig._device) {
@@ -83,12 +70,13 @@ class XcodebuildArgsService {
         ]
             .concat(this.getXcodeProjectArgs(platformData, projectData))
             .concat(architectures)
-            .concat(this.getBuildCommonArgs(platformData, projectData, isMacOS
-            ? ios_project_service_1.MacOSPlatformSdkName
-            : isvisionOS
-                ? ios_project_service_1.VisionDevicePlatformSdkName
-                : ios_project_service_1.DevicePlatformSdkName))
+            .concat(this.getBuildCommonArgs(platformData, projectData, isvisionOS ? ios_project_service_1.VisionDevicePlatformSdkName : ios_project_service_1.DevicePlatformSdkName))
             .concat(this.getBuildLoggingArgs());
+        // pbxproj-dom sets CODE_SIGN_IDENTITY[sdk=iphoneos*] which doesn't match
+        // the xros SDK used by visionOS builds — pass it explicitly as an override
+        if (isvisionOS) {
+            args.push(`CODE_SIGN_IDENTITY=${buildConfig.release ? "Apple Distribution" : "Apple Development"}`);
+        }
         return args;
     }
     async getArchitecturesArgs(buildConfig) {
@@ -99,13 +87,6 @@ class XcodebuildArgsService {
             args.push("ONLY_ACTIVE_ARCH=YES", "EXCLUDED_ARCHS=x86_64");
             return args;
         }
-        if (this.$devicePlatformsConstants.ismacOS(buildConfig.platform)) {
-            if (process.arch === "arm64") {
-                // Avoid attempting x86_64 builds against arm64-only frameworks.
-                args.push("ONLY_ACTIVE_ARCH=YES", "EXCLUDED_ARCHS=x86_64");
-            }
-            return args;
-        }
         const devicesArchitectures = buildConfig.buildForDevice
             ? await this.getArchitecturesFromConnectedDevices(buildConfig)
             : [];

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

@@ -21,7 +21,9 @@ class IOSEntitlementsService {
     }
     getPlatformsEntitlementsPath(projectData) {
         var _a;
-        return path.join(projectData.platformsDir, (_a = this.$options.platformOverride) !== null && _a !== void 0 ? _a : this.$devicePlatformsConstants.iOS.toLowerCase(), projectData.projectName, projectData.projectName + ".entitlements");
+        return path.join(projectData.platformsDir, this.$mobileHelper
+            .normalizePlatformName((_a = this.$options.platformOverride) !== null && _a !== void 0 ? _a : this.$devicePlatformsConstants.iOS)
+            .toLowerCase(), projectData.projectName, projectData.projectName + ".entitlements");
     }
     getPlatformsEntitlementsRelativePath(projectData) {
         return path.join(projectData.projectName, projectData.projectName + ".entitlements");

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

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IOSProjectService = exports.MacOSPlatformSdkName = exports.VisionSimulatorPlatformSdkName = exports.VisionDevicePlatformSdkName = exports.SimulatorPlatformSdkName = exports.DevicePlatformSdkName = void 0;
+exports.IOSProjectService = exports.VisionSimulatorPlatformSdkName = exports.VisionDevicePlatformSdkName = exports.SimulatorPlatformSdkName = exports.DevicePlatformSdkName = void 0;
 const path = require("path");
 const shell = require("shelljs");
 const _ = require("lodash");
@@ -26,24 +26,17 @@ exports.DevicePlatformSdkName = "iphoneos";
 exports.SimulatorPlatformSdkName = "iphonesimulator";
 exports.VisionDevicePlatformSdkName = "xros";
 exports.VisionSimulatorPlatformSdkName = "xrsimulator";
-exports.MacOSPlatformSdkName = "macosx";
 const FRAMEWORK_EXTENSIONS = [".framework", ".xcframework"];
 const getPlatformSdkName = (buildData) => {
     const forDevice = !buildData || buildData.buildForDevice || buildData.buildForAppStore;
     const isvisionOS = yok_1.injector
         .resolve("devicePlatformsConstants")
         .isvisionOS(buildData.platform);
-    const ismacOS = yok_1.injector
-        .resolve("devicePlatformsConstants")
-        .ismacOS(buildData.platform);
     if (isvisionOS) {
         return forDevice
             ? exports.VisionDevicePlatformSdkName
             : exports.VisionSimulatorPlatformSdkName;
     }
-    if (ismacOS) {
-        return exports.MacOSPlatformSdkName;
-    }
     return forDevice ? exports.DevicePlatformSdkName : exports.SimulatorPlatformSdkName;
 };
 const getConfigurationName = (release) => {
@@ -79,6 +72,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$mobileHelper = $mobileHelper;
         this.$projectConfigService = $projectConfigService;
         this._platformsDirCache = null;
+        this._platformOverrideCache = null;
         this._platformData = null;
         // Track added frameworks by name to prevent duplicates in monorepo/workspace setups
         // where the same plugin may exist in multiple node_modules paths
@@ -87,19 +81,20 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this._addedStaticLibs = new Set();
     }
     getPlatformData(projectData) {
-        var _a;
+        var _a, _b;
         if (!projectData && !this._platformData) {
             throw new Error("First call of getPlatformData without providing projectData.");
         }
+        const currentOverride = (_a = this.$options.platformOverride) !== null && _a !== void 0 ? _a : null;
         if (projectData &&
             projectData.platformsDir &&
-            this._platformsDirCache !== projectData.platformsDir) {
-            const platform = this.$mobileHelper.normalizePlatformName((_a = this.$options.platformOverride) !== null && _a !== void 0 ? _a : this.$devicePlatformsConstants.iOS);
+            (this._platformsDirCache !== projectData.platformsDir ||
+                this._platformOverrideCache !== currentOverride)) {
+            const platform = this.$mobileHelper.normalizePlatformName((_b = this.$options.platformOverride) !== null && _b !== void 0 ? _b : this.$devicePlatformsConstants.iOS);
             const projectRoot = this.$options.hostProjectPath
                 ? this.$options.hostProjectPath
                 : path.join(projectData.platformsDir, platform.toLowerCase());
             const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, platform.toLowerCase());
-            const isMacOSPlatform = this.$devicePlatformsConstants.ismacOS(platform);
             this._platformData = {
                 frameworkPackageName: runtimePackage.name,
                 normalizedPlatformName: platform,
@@ -109,22 +104,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 projectRoot: projectRoot,
                 getBuildOutputPath: (options) => {
                     const config = getConfigurationName(!options || options.release);
-                    if (isMacOSPlatform) {
-                        return path.join(projectRoot, constants.BUILD_DIR, config);
-                    }
                     return path.join(projectRoot, constants.BUILD_DIR, `${config}-${getPlatformSdkName(options)}`);
                 },
                 getValidBuildOutputData: (buildOptions) => {
-                    const isMacOS = !!buildOptions &&
-                        this.$devicePlatformsConstants.ismacOS(buildOptions.platform);
-                    if (isMacOS) {
-                        return {
-                            packageNames: [
-                                `${projectData.projectName}.app`,
-                                `${projectData.projectName}.zip`,
-                            ],
-                        };
-                    }
                     const forDevice = !buildOptions ||
                         !!buildOptions.buildForDevice ||
                         !!buildOptions.buildForAppStore;
@@ -166,15 +148,11 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                     ".xbm",
                 ], // https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/
             };
+            this._platformsDirCache = projectData.platformsDir;
+            this._platformOverrideCache = currentOverride;
         }
         return this._platformData;
     }
-    getPluginPlatform(projectData) {
-        var _a;
-        const platformData = this.getPlatformData(projectData);
-        return (((_a = platformData.normalizedPlatformName) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ||
-            platformData.platformNameLowerCase);
-    }
     async validateOptions(projectId, provision, teamId) {
         if (provision && teamId) {
             this.$errors.fail("The options --provision and --teamId are mutually exclusive.");
@@ -379,10 +357,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.savePbxProj(project, projectData);
     }
     async prepareProject(projectData, prepareData) {
+        const platformData = this.getPlatformData(projectData);
         const projectRoot = this.$options.hostProjectPath
             ? this.$options.hostProjectPath
-            : path.join(projectData.platformsDir, this.$devicePlatformsConstants.iOS.toLowerCase());
-        const platformData = this.getPlatformData(projectData);
+            : platformData.projectRoot;
         const pluginsData = this.getAllProductionPlugins(projectData);
         const pbxProjPath = this.getPbxProjPath(projectData);
         this.$iOSExtensionsService.removeExtensions({ pbxProjPath });
@@ -490,7 +468,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
                 }
             }
         }
-        this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
         const addedWatchApp = await this.$iOSWatchAppService.addWatchAppFromPath({
             watchAppFolderPath: path.join(resourcesDirectoryPath, platformData.normalizedPlatformName),
             projectData,
@@ -522,13 +499,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, constants.NATIVE_EXTENSION_FOLDER));
         this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, "watchapp"));
         this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, "watchextension"));
-        const macOSPlatformName = this.$devicePlatformsConstants.macOS &&
-            this.$devicePlatformsConstants.macOS.toLowerCase();
-        if (macOSPlatformName &&
-            platformData.platformNameLowerCase === macOSPlatformName) {
-            // macOS apps do not use iOS launch storyboards.
-            this.$fs.deleteFile(path.join(platformsAppResourcesPath, "LaunchScreen.storyboard"));
-        }
     }
     async processConfigurationFilesFromAppResources(projectData, opts) {
         await this.mergeInfoPlists(projectData, opts);
@@ -560,9 +530,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             });
         };
         const allPlugins = this.getAllProductionPlugins(projectData);
-        const pluginPlatform = this.getPluginPlatform(projectData);
         for (const plugin of allPlugins) {
-            const pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(pluginPlatform), this.getPlatformData(projectData).configurationFileName);
+            const pluginInfoPlistPath = path.join(plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME), this.getPlatformData(projectData).configurationFileName);
             makePatch(pluginInfoPlistPath);
         }
         makePatch(infoPlistPath);
@@ -647,17 +616,16 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         return this.$fs.writeFile(this.getPbxProjPath(projectData), project.writeSync({ omitEmptyValues }));
     }
     async preparePluginNativeCode(pluginData, projectData, opts) {
-        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(this.getPluginPlatform(projectData));
-        const sourcePath = this.getPluginNativeSourcePath(pluginData, projectData, pluginPlatformsFolderPath);
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+        const sourcePath = path.join(pluginPlatformsFolderPath, "src");
         await this.prepareNativeSourceCode(pluginData.name, sourcePath, projectData);
         await this.prepareResources(pluginPlatformsFolderPath, pluginData, projectData);
         await this.prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
         await this.prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
     }
     async removePluginNativeCode(pluginData, projectData) {
-        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(this.getPluginPlatform(projectData));
-        const sourcePath = this.getPluginNativeSourcePath(pluginData, projectData, pluginPlatformsFolderPath);
-        this.removeNativeSourceCode(sourcePath, pluginData, projectData);
+        const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
+        this.removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData);
         this.removeFrameworks(pluginPlatformsFolderPath, pluginData, projectData);
         this.removeStaticLibs(pluginPlatformsFolderPath, pluginData, projectData);
         const projectRoot = this.getPlatformData(projectData).projectRoot;
@@ -762,12 +730,12 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         ], projectData.projectName, project);
         this.savePbxProj(project, projectData);
     }
-    getAllLibsForPluginWithFileExtension(pluginData, fileExtension, projectData) {
+    getAllLibsForPluginWithFileExtension(pluginData, fileExtension) {
         const fileExtensions = _.isArray(fileExtension)
             ? fileExtension
             : [fileExtension];
         const filterCallback = (fileName, pluginPlatformsFolderPath) => fileExtensions.indexOf(path.extname(fileName)) !== -1;
-        return this.getAllNativeLibrariesForPlugin(pluginData, this.getPluginPlatform(projectData), filterCallback);
+        return this.getAllNativeLibrariesForPlugin(pluginData, IOSProjectService.IOS_PLATFORM_NAME, filterCallback);
     }
     validateFramework(libraryPath) {
         const infoPlistPath = path.join(libraryPath, constants.INFO_PLIST_FILE_NAME);
@@ -807,21 +775,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         }
         this.savePbxProj(project, projectData);
     }
-    getPluginNativeSourcePath(pluginData, projectData, pluginPlatformsFolderPath) {
-        const sourcePath = path.join(pluginPlatformsFolderPath, "src");
-        if (this.$fs.exists(sourcePath)) {
-            return sourcePath;
-        }
-        // For macOS only, allow reusing plugin native source code from iOS.
-        // Framework/static library discovery remains strict to `platforms/macos`.
-        if (this.$devicePlatformsConstants.ismacOS(this.getPlatformData(projectData).normalizedPlatformName)) {
-            const iosSourcePath = path.join(pluginData.pluginPlatformsFolderPath("ios" /* constants.PlatformTypes.ios */), "src");
-            if (this.$fs.exists(iosSourcePath)) {
-                return iosSourcePath;
-            }
-        }
-        return sourcePath;
-    }
     async addExtensions(projectData, pluginsData) {
         const resorcesExtensionsPath = path.join(projectData.getAppResourcesDirectoryPath(), this.getPlatformData(projectData).normalizedPlatformName, constants.NATIVE_EXTENSION_FOLDER);
         const platformData = this.getPlatformData(projectData);
@@ -835,7 +788,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         let addedExtensionsFromPlugins = false;
         for (const pluginIndex in pluginsData) {
             const pluginData = pluginsData[pluginIndex];
-            const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(this.getPluginPlatform(projectData));
+            const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
             const extensionPath = path.join(pluginPlatformsFolderPath, constants.NATIVE_EXTENSION_FOLDER);
             const addedExtensionFromPlugin = await this.$iOSExtensionsService.addExtensionsFromPath({
                 extensionsFolderPath: extensionPath,
@@ -890,25 +843,25 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
         this.savePbxProj(project, projectData);
     }
     async prepareFrameworks(pluginPlatformsFolderPath, pluginData, projectData) {
-        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS, projectData)) {
+        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS)) {
             await this.addFramework(path.join(pluginPlatformsFolderPath, fileName), projectData);
         }
     }
     async prepareStaticLibs(pluginPlatformsFolderPath, pluginData, projectData) {
-        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, ".a", projectData)) {
+        for (const fileName of this.getAllLibsForPluginWithFileExtension(pluginData, ".a")) {
             await this.addStaticLibrary(path.join(pluginPlatformsFolderPath, fileName), projectData);
         }
     }
-    async removeNativeSourceCode(sourceFolderPath, pluginData, projectData) {
+    async removeNativeSourceCode(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
-        const group = await this.getRootGroup(pluginData.name, sourceFolderPath);
+        const group = await this.getRootGroup(pluginData.name, pluginPlatformsFolderPath);
         project.removePbxGroup(group.name, group.path);
         project.removeFromHeaderSearchPaths(group.path);
         this.savePbxProj(project, projectData);
     }
     removeFrameworks(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
-        _.each(this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS, projectData), (fileName) => {
+        _.each(this.getAllLibsForPluginWithFileExtension(pluginData, FRAMEWORK_EXTENSIONS), (fileName) => {
             const relativeFrameworkPath = this.getLibSubpathRelativeToProjectPath(fileName, projectData);
             project.removeFramework(relativeFrameworkPath, {
                 customFramework: true,
@@ -919,7 +872,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
     }
     removeStaticLibs(pluginPlatformsFolderPath, pluginData, projectData) {
         const project = this.createPbxProj(projectData);
-        _.each(this.getAllLibsForPluginWithFileExtension(pluginData, ".a", projectData), (fileName) => {
+        _.each(this.getAllLibsForPluginWithFileExtension(pluginData, ".a"), (fileName) => {
             const staticLibPath = path.join(pluginPlatformsFolderPath, fileName);
             const relativeStaticLibPath = this.getLibSubpathRelativeToProjectPath(path.basename(staticLibPath), projectData);
             project.removeFramework(relativeStaticLibPath);
@@ -953,9 +906,8 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
             this.$fs.deleteFile(pluginsXcconfigFilePath);
         }
         const allPlugins = this.getAllProductionPlugins(projectData);
-        const pluginPlatform = this.getPluginPlatform(projectData);
         for (const plugin of allPlugins) {
-            const pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(pluginPlatform);
+            const pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
             const pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, constants_2.BUILD_XCCONFIG_FILE_NAME);
             if (this.$fs.exists(pluginXcconfigFilePath)) {
                 for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
@@ -1018,6 +970,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 }
 exports.IOSProjectService = IOSProjectService;
 IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER = "__PROJECT_NAME__";
+IOSProjectService.IOS_PLATFORM_NAME = "ios";
 __decorate([
     (0, helpers_2.hook)("buildIOS")
 ], IOSProjectService.prototype, "buildProject", null);