Skip to content

Commit 122d787

Browse files
DjDeveloperrDjDeveloperr
committed
feat: implement macOS support with build and run commands
1 parent 7deb5e9 commit 122d787

8 files changed

Lines changed: 273 additions & 13 deletions

File tree

‎lib/bootstrap.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ injector.requireCommand("run|ios", "./commands/run");
182182
injector.requireCommand("run|android", "./commands/run");
183183
injector.requireCommand("run|vision", "./commands/run");
184184
injector.requireCommand("run|visionos", "./commands/run");
185+
injector.requireCommand("run|macos", "./commands/run");
185186
injector.requireCommand("typings", "./commands/typings");
186187

187188
injector.requireCommand("preview", "./commands/preview");
@@ -197,6 +198,7 @@ injector.requireCommand("build|ios", "./commands/build");
197198
injector.requireCommand("build|android", "./commands/build");
198199
injector.requireCommand("build|vision", "./commands/build");
199200
injector.requireCommand("build|visionos", "./commands/build");
201+
injector.requireCommand("build|macos", "./commands/build");
200202
injector.requireCommand("deploy", "./commands/deploy");
201203

202204
injector.requireCommand("embed", "./commands/embedding/embed");

‎lib/commands/build.ts‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,3 +277,58 @@ export class BuildVisionOsCommand extends BuildIosCommand implements ICommand {
277277

278278
injector.registerCommand("build|vision", BuildVisionOsCommand);
279279
injector.registerCommand("build|visionos", BuildVisionOsCommand);
280+
281+
export class BuildMacOSCommand extends BuildIosCommand implements ICommand {
282+
constructor(
283+
protected $options: IOptions,
284+
$errors: IErrors,
285+
$projectData: IProjectData,
286+
$platformsDataService: IPlatformsDataService,
287+
$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
288+
$buildController: IBuildController,
289+
$platformValidationService: IPlatformValidationService,
290+
$logger: ILogger,
291+
$buildDataService: IBuildDataService,
292+
protected $migrateController: IMigrateController,
293+
) {
294+
super(
295+
$options,
296+
$errors,
297+
$projectData,
298+
$platformsDataService,
299+
$devicePlatformsConstants,
300+
$buildController,
301+
$platformValidationService,
302+
$logger,
303+
$buildDataService,
304+
$migrateController,
305+
);
306+
}
307+
308+
public async execute(args: string[]): Promise<void> {
309+
await this.executeCore([
310+
this.$devicePlatformsConstants.macOS.toLowerCase(),
311+
]);
312+
}
313+
314+
public async canExecute(args: string[]): Promise<boolean> {
315+
const platform = this.$devicePlatformsConstants.macOS;
316+
if (!this.$options.force) {
317+
await this.$migrateController.validate({
318+
projectDir: this.$projectData.projectDir,
319+
platforms: [platform],
320+
});
321+
}
322+
323+
super.validatePlatform(platform);
324+
325+
let canExecute = await super.canExecuteCommandBase(platform);
326+
if (canExecute) {
327+
canExecute = await super.validateArgs(args, platform);
328+
}
329+
330+
return canExecute;
331+
}
332+
}
333+
334+
injector.registerCommand("build|macos", BuildMacOSCommand);

‎lib/commands/run.ts‎

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,14 @@ import {
1313
ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE,
1414
ANDROID_RELEASE_BUILD_ERROR_MESSAGE,
1515
} from "../constants";
16-
import { IOptions, IPlatformValidationService } from "../declarations";
16+
import {
17+
IOpener,
18+
IOptions,
19+
IPlatformValidationService,
20+
} from "../declarations";
1721
import { IMigrateController } from "../definitions/migrate";
1822
import { IProjectData, IProjectDataService } from "../definitions/project";
23+
import { IBuildController, IBuildDataService } from "../definitions/build";
1924

2025
export class RunCommandBase implements ICommand {
2126
private liveSyncCommandHelperAdditionalOptions: ILiveSyncCommandHelperAdditionalOptions =
@@ -223,3 +228,65 @@ export class RunVisionOSCommand extends RunIosCommand {
223228

224229
injector.registerCommand("run|vision", RunVisionOSCommand);
225230
injector.registerCommand("run|visionos", RunVisionOSCommand);
231+
232+
export class RunMacOSCommand implements ICommand {
233+
public allowedParameters: ICommandParameter[] = [];
234+
235+
public get platform(): string {
236+
return this.$devicePlatformsConstants.macOS || "macOS";
237+
}
238+
239+
constructor(
240+
private $buildController: IBuildController,
241+
private $buildDataService: IBuildDataService,
242+
private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
243+
private $errors: IErrors,
244+
private $migrateController: IMigrateController,
245+
private $opener: IOpener,
246+
private $options: IOptions,
247+
private $platformValidationService: IPlatformValidationService,
248+
private $projectDataService: IProjectDataService,
249+
) {}
250+
251+
public async execute(args: string[]): Promise<void> {
252+
const projectData = this.$projectDataService.getProjectData();
253+
const buildData = this.$buildDataService.getBuildData(
254+
projectData.projectDir,
255+
this.platform.toLowerCase(),
256+
this.$options,
257+
);
258+
const outputPath = await this.$buildController.prepareAndBuild(buildData);
259+
await this.$opener.open(outputPath, projectData.projectName);
260+
}
261+
262+
public async canExecute(args: string[]): Promise<boolean> {
263+
const projectData = this.$projectDataService.getProjectData();
264+
265+
if (
266+
!this.$platformValidationService.isPlatformSupportedForOS(
267+
this.platform,
268+
projectData,
269+
)
270+
) {
271+
this.$errors.fail(
272+
`Applications for platform ${this.platform} can not be built on this OS`,
273+
);
274+
}
275+
276+
if (!this.$options.force) {
277+
await this.$migrateController.validate({
278+
projectDir: projectData.projectDir,
279+
platforms: [this.platform],
280+
});
281+
}
282+
283+
return this.$platformValidationService.validateOptions(
284+
this.$options.provision,
285+
this.$options.teamId,
286+
projectData,
287+
this.platform.toLowerCase(),
288+
);
289+
}
290+
}
291+
292+
injector.registerCommand("run|macos", RunMacOSCommand);

‎lib/controllers/prepare-controller.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ export class PrepareController extends EventEmitter {
194194
};
195195
}
196196

197+
this.syncMacOSBundleArtifacts(projectData, platformData);
198+
197199
await this.writeRuntimePackageJson(projectData, platformData, prepareData);
198200

199201
await this.$projectChangesService.savePrepareInfo(
@@ -518,6 +520,55 @@ export class PrepareController extends EventEmitter {
518520
this.$fs.writeJson(packagePath, packageData);
519521
}
520522

523+
private syncMacOSBundleArtifacts(
524+
projectData: IProjectData,
525+
platformData: IPlatformData,
526+
): void {
527+
if (platformData.platformNameLowerCase !== "macos") {
528+
return;
529+
}
530+
if (process.env.NS_MACOS_IOS_BUNDLE_FALLBACK !== "1") {
531+
return;
532+
}
533+
534+
const macosAppPath = path.join(
535+
platformData.projectRoot,
536+
projectData.projectName,
537+
"app",
538+
);
539+
const hasMacBundle =
540+
this.$fs.exists(path.join(macosAppPath, "bundle.js")) ||
541+
this.$fs.exists(path.join(macosAppPath, "bundle.mjs"));
542+
543+
if (hasMacBundle) {
544+
return;
545+
}
546+
547+
const iosAppPath = path.join(
548+
projectData.platformsDir,
549+
"ios",
550+
projectData.projectName,
551+
"app",
552+
);
553+
if (!this.$fs.exists(iosAppPath)) {
554+
return;
555+
}
556+
557+
this.$logger.trace(
558+
`Copying bundle artifacts from ${iosAppPath} to ${macosAppPath} for macOS prepare.`,
559+
);
560+
561+
this.$fs.ensureDirectoryExists(macosAppPath);
562+
const emittedFiles = this.$fs.enumerateFilesInDirectorySync(iosAppPath);
563+
564+
emittedFiles.forEach((sourcePath) => {
565+
const relativePath = path.relative(iosAppPath, sourcePath);
566+
const destinationPath = path.join(macosAppPath, relativePath);
567+
this.$fs.ensureDirectoryExists(path.dirname(destinationPath));
568+
this.$fs.copyFile(sourcePath, destinationPath);
569+
});
570+
}
571+
521572
private emitPrepareEvent(filesChangeEventData: IFilesChangeEventData) {
522573
if (this.isInitialPrepareReady) {
523574
this.emit(PREPARE_READY_EVENT_NAME, filesChangeEventData);

‎lib/services/bundler/bundler-compiler-service.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,7 @@ export class BundlerCompilerService
502502
USER_PROJECT_PLATFORMS_ANDROID_MODULE:
503503
this.$options.hostProjectModuleName,
504504
USER_PROJECT_PLATFORMS_IOS: this.$options.hostProjectPath,
505+
USER_PROJECT_PLATFORMS_MACOS: this.$options.hostProjectPath,
505506
});
506507
}
507508

@@ -528,6 +529,9 @@ export class BundlerCompilerService
528529
) {
529530
const { env } = prepareData;
530531
const envData = Object.assign({}, env, { [platform.toLowerCase()]: true });
532+
if (platform.toLowerCase() === "macos") {
533+
envData.platform = "macos";
534+
}
531535

532536
const appId = projectData.projectIdentifiers[platform];
533537
const appPath = projectData.getAppDirectoryRelativePath();

‎lib/services/ios-project-service.ts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ export const DevicePlatformSdkName = "iphoneos";
6969
export const SimulatorPlatformSdkName = "iphonesimulator";
7070
export const VisionDevicePlatformSdkName = "xros";
7171
export const VisionSimulatorPlatformSdkName = "xrsimulator";
72+
export const MacOSPlatformSdkName = "macosx";
7273

7374
const FRAMEWORK_EXTENSIONS = [".framework", ".xcframework"];
7475

@@ -78,13 +79,20 @@ const getPlatformSdkName = (buildData: IBuildData): string => {
7879
const isvisionOS = injector
7980
.resolve("devicePlatformsConstants")
8081
.isvisionOS(buildData.platform);
82+
const ismacOS = injector
83+
.resolve("devicePlatformsConstants")
84+
.ismacOS(buildData.platform);
8185

8286
if (isvisionOS) {
8387
return forDevice
8488
? VisionDevicePlatformSdkName
8589
: VisionSimulatorPlatformSdkName;
8690
}
8791

92+
if (ismacOS) {
93+
return MacOSPlatformSdkName;
94+
}
95+
8896
return forDevice ? DevicePlatformSdkName : SimulatorPlatformSdkName;
8997
};
9098

@@ -155,6 +163,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
155163
platform.toLowerCase() as constants.SupportedPlatform,
156164
);
157165

166+
const isMacOSPlatform = this.$devicePlatformsConstants.ismacOS(platform);
158167
this._platformData = {
159168
frameworkPackageName: runtimePackage.name,
160169
normalizedPlatformName: platform,
@@ -167,6 +176,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
167176
projectRoot: projectRoot,
168177
getBuildOutputPath: (options: IBuildData): string => {
169178
const config = getConfigurationName(!options || options.release);
179+
if (isMacOSPlatform) {
180+
return path.join(projectRoot, constants.BUILD_DIR, config);
181+
}
170182
return path.join(
171183
projectRoot,
172184
constants.BUILD_DIR,
@@ -176,6 +188,17 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
176188
getValidBuildOutputData: (
177189
buildOptions: IBuildData,
178190
): IValidBuildOutputData => {
191+
const isMacOS =
192+
!!buildOptions &&
193+
this.$devicePlatformsConstants.ismacOS(buildOptions.platform);
194+
if (isMacOS) {
195+
return {
196+
packageNames: [
197+
`${projectData.projectName}.app`,
198+
`${projectData.projectName}.zip`,
199+
],
200+
};
201+
}
179202
const forDevice =
180203
!buildOptions ||
181204
!!buildOptions.buildForDevice ||
@@ -942,6 +965,19 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
942965
this.$fs.deleteDirectory(
943966
path.join(platformsAppResourcesPath, "watchextension"),
944967
);
968+
969+
const macOSPlatformName =
970+
this.$devicePlatformsConstants.macOS &&
971+
this.$devicePlatformsConstants.macOS.toLowerCase();
972+
if (
973+
macOSPlatformName &&
974+
platformData.platformNameLowerCase === macOSPlatformName
975+
) {
976+
// macOS apps do not use iOS launch storyboards.
977+
this.$fs.deleteFile(
978+
path.join(platformsAppResourcesPath, "LaunchScreen.storyboard"),
979+
);
980+
}
945981
}
946982

947983
public async processConfigurationFilesFromAppResources(

0 commit comments

Comments
 (0)