Skip to content

Commit 96ed8d0

Browse files
committed
Fixed output xcproject name
1 parent d5b3d4c commit 96ed8d0

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

packages/react-native/scripts/setup-ios-spm.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,15 @@ const {main: downloadArtifacts} = require('./spm/download-spm-artifacts');
5151
const {main: generateAutolinking} = require('./spm/generate-spm-autolinking');
5252
const {main: generatePackage} = require('./spm/generate-spm-package');
5353
const {main: generateXcodeproj} = require('./spm/generate-spm-xcodeproj');
54+
const {findSourcePath} = require('./spm/generate-spm-package');
5455
const {
5556
defaultCacheDir,
57+
deriveAppName,
5658
displayPath,
5759
findProjectRoot,
5860
makeLogger,
5961
readPackageJson,
6062
resolveAndWriteVFSOverlay,
61-
toSwiftName,
6263
} = require('./spm/spm-utils');
6364
const {execSync} = require('child_process');
6465
const fs = require('fs');
@@ -509,12 +510,11 @@ async function main(argv /*:: ?: Array<string> */) /*: Promise<void> */ {
509510
log('Step 5/5: Skipping .xcodeproj generation (--skip-xcodeproj)');
510511
}
511512

512-
// Derive app name for display (same logic as generate-spm-package.js)
513-
// Use projectRoot to find package.json (may be in parent dir).
514513
const appPkgJson = readPackageJson(projectRoot);
515514
const rawName =
516515
(appPkgJson != null ? appPkgJson.name : null) ?? path.basename(projectRoot);
517-
const appDisplayName = toSwiftName(rawName.replace(/^@[^/]+\//, ''));
516+
const sourcePath = findSourcePath(appRoot, rawName);
517+
const appDisplayName = args.productName ?? deriveAppName(rawName, sourcePath);
518518

519519
log('');
520520
log('SPM setup complete!');

0 commit comments

Comments
 (0)