File tree Expand file tree Collapse file tree
packages/react-native/scripts Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -51,14 +51,15 @@ const {main: downloadArtifacts} = require('./spm/download-spm-artifacts');
5151const { main : generateAutolinking } = require ( './spm/generate-spm-autolinking' ) ;
5252const { main : generatePackage } = require ( './spm/generate-spm-package' ) ;
5353const { main : generateXcodeproj } = require ( './spm/generate-spm-xcodeproj' ) ;
54+ const { findSourcePath} = require ( './spm/generate-spm-package' ) ;
5455const {
5556 defaultCacheDir,
57+ deriveAppName,
5658 displayPath,
5759 findProjectRoot,
5860 makeLogger,
5961 readPackageJson,
6062 resolveAndWriteVFSOverlay,
61- toSwiftName,
6263} = require ( './spm/spm-utils' ) ;
6364const { execSync} = require ( 'child_process' ) ;
6465const 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!' ) ;
You can’t perform that action at this time.
0 commit comments