Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

feat(ios): allow collections of NativeSource to be included via nativescript.config #5830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanWalker merged 2 commits into from
Feb 22, 2025
Merged

feat(ios): allow collections of NativeSource to be included via nativescript.config #5830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83b75d5
feat(ios): rename Xcode NSNativeSources to AppResourcesSrc for clarity
NathanWalker Feb 15, 2025
ee25c82
feat(ios): allow collections of NativeSource to be included via nativ…
NathanWalker Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const APK_EXTENSION_NAME = ".apk";
export const AAB_EXTENSION_NAME = ".aab";
export const APKS_EXTENSION_NAME = ".apks";
export const HASHES_FILE_NAME = ".nshashes";
export const TNS_NATIVE_SOURCE_GROUP_NAME = "NSNativeSources";
export const TNS_NATIVE_SOURCE_GROUP_NAME = "AppResourcesSrc";
export const NATIVE_SOURCE_FOLDER = "src";
export const APPLICATION_RESPONSE_TIMEOUT_SECONDS = 60;
export const NATIVE_EXTENSION_FOLDER = "extensions";
Expand Down
52 changes: 40 additions & 12 deletions 52 lib/services/ios-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import * as projectServiceBaseLib from "./platform-project-service-base";
import { PlistSession, Reporter } from "plist-merge-patch";
import { EOL } from "os";
import * as plist from "plist";
import * as fastGlob from "fast-glob";
import { IOSProvisionService } from "./ios-provision-service";
import { IOSEntitlementsService } from "./ios-entitlements-service";
import { IOSBuildData } from "../data/build-data";
Expand Down Expand Up @@ -817,6 +818,21 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
resourcesNativeCodePath,
projectData
);

const nativeSource = this.$projectConfigService.getValue(
`${this._platformData.platformNameLowerCase}.NativeSource`,
[]
);

if (nativeSource?.length) {
for (const source of nativeSource) {
await this.prepareNativeSourceCode(
source.name,
source.path,
projectData
);
}
}
}

this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
Expand Down Expand Up @@ -1360,7 +1376,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
projectData: IProjectData
): Promise<void> {
const project = this.createPbxProj(projectData);
const group = this.getRootGroup(groupName, sourceFolderPath);
const group = await this.getRootGroup(groupName, sourceFolderPath);
project.addPbxGroup(group.files, group.name, group.path, null, {
isMain: true,
filesRelativeToProject: true,
Expand Down Expand Up @@ -1430,21 +1446,30 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
}
}

private getRootGroup(name: string, rootPath: string) {
private async getRootGroup(name: string, rootPath: string) {
const filePathsArr: string[] = [];
const rootGroup: INativeSourceCodeGroup = {
name: name,
files: filePathsArr,
path: rootPath,
};

if (this.$fs.exists(rootPath)) {
const stats = this.$fs.getFsStats(rootPath);
if (stats.isDirectory() && !this.$fs.isEmptyDir(rootPath)) {
this.$fs.readDirectory(rootPath).forEach((fileName) => {
const filePath = path.join(rootGroup.path, fileName);
filePathsArr.push(filePath);
});
if (fastGlob.isDynamicPattern(rootPath)) {
const projectRoot = this.$projectDataService.getProjectData().projectDir;
const filePaths = await fastGlob(rootPath);
for (const filePath of filePaths) {
const sourceFilePath = path.normalize(path.join(projectRoot, filePath));
filePathsArr.push(sourceFilePath);
}
} else {
if (this.$fs.exists(rootPath)) {
const stats = this.$fs.getFsStats(rootPath);
if (stats.isDirectory() && !this.$fs.isEmptyDir(rootPath)) {
this.$fs.readDirectory(rootPath).forEach((fileName) => {
const filePath = path.join(rootGroup.path, fileName);
filePathsArr.push(filePath);
});
}
}
}

Expand Down Expand Up @@ -1499,13 +1524,16 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
}
}

private removeNativeSourceCode(
private async removeNativeSourceCode(
pluginPlatformsFolderPath: string,
pluginData: IPluginData,
projectData: IProjectData
): void {
) {
const project = this.createPbxProj(projectData);
const group = this.getRootGroup(pluginData.name, pluginPlatformsFolderPath);
const group = await this.getRootGroup(
pluginData.name,
pluginPlatformsFolderPath
);
project.removePbxGroup(group.name, group.path);
project.removeFromHeaderSearchPaths(group.path);
this.savePbxProj(project, projectData);
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.