Skip to content
Closed
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion react-native-git-upgrade/cliEntry.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,18 @@ function readPackageFiles(useYarn) {
'package.json',
);
const pakPath = path.resolve(process.cwd(), 'package.json');
const appPath = path.resolve(process.cwd(), 'app.json');
let app = null;
try {
app = parseJsonFile(appPath);
} catch (err) {
log.warn('Unable to parse app.json', err.message);
}
return {
reactNativeNodeModulesPak: parseJsonFile(reactNativeNodeModulesPakPath),
reactNodeModulesPak: parseJsonFile(reactNodeModulesPakPath),
pak: parseJsonFile(pakPath),
app: app,
};
}

Expand Down Expand Up @@ -306,8 +314,9 @@ async function run(requestedVersion, cliArgs) {
reactNativeNodeModulesPak,
reactNodeModulesPak,
pak,
app,
} = readPackageFiles(useYarn);
const appName = pak.name;
const appName = (app && app.name) || pak.name;
const currentVersion = reactNativeNodeModulesPak.version;
const currentReactVersion = reactNodeModulesPak.version;
const declaredVersion = pak.dependencies['react-native'];
Expand Down