Commit 2d93ae12 authored by Johann Hubert Sonntagbauer's avatar Johann Hubert Sonntagbauer Committed by Dan Abramov
Browse files

fix react dependency versions during initial install (#1669)

* fix react dependency versions during initial install

* add review remarks
parent a3a223aa
Showing with 29 additions and 3 deletions
+29 -3
...@@ -212,8 +212,9 @@ function run(root, appName, version, verbose, originalDirectory, template) { ...@@ -212,8 +212,9 @@ function run(root, appName, version, verbose, originalDirectory, template) {
checkNodeVersion(packageName); checkNodeVersion(packageName);
// Since react-scripts has been installed with --save // Since react-scripts has been installed with --save
// We need to move it into devDependencies and rewrite package.json // we need to move it into devDependencies and rewrite package.json
moveReactScriptsToDev(packageName); // also ensure react dependencies have caret version range
fixDependencies(packageName);
var scriptsPath = path.resolve( var scriptsPath = path.resolve(
process.cwd(), process.cwd(),
...@@ -325,7 +326,29 @@ function checkAppName(appName) { ...@@ -325,7 +326,29 @@ function checkAppName(appName) {
} }
} }
function moveReactScriptsToDev(packageName) { function makeCaretRange(dependencies, name) {
var version = dependencies[name];
if (typeof version === 'undefined') {
console.error(
chalk.red('Missing ' + name + ' dependency in package.json')
);
process.exit(1);
}
var patchedVersion = '^' + version;
if (!semver.validRange(patchedVersion)) {
console.error(
'Unable to patch ' + name + ' dependency version because version ' + chalk.red(version) + ' will become invalid ' + chalk.red(patchedVersion)
);
patchedVersion = version;
}
dependencies[name] = patchedVersion;
}
function fixDependencies(packageName) {
var packagePath = path.join(process.cwd(), 'package.json'); var packagePath = path.join(process.cwd(), 'package.json');
var packageJson = require(packagePath); var packageJson = require(packagePath);
...@@ -349,6 +372,9 @@ function moveReactScriptsToDev(packageName) { ...@@ -349,6 +372,9 @@ function moveReactScriptsToDev(packageName) {
packageJson.devDependencies[packageName] = packageVersion; packageJson.devDependencies[packageName] = packageVersion;
delete packageJson.dependencies[packageName]; delete packageJson.dependencies[packageName];
makeCaretRange(packageJson.dependencies, 'react');
makeCaretRange(packageJson.dependencies, 'react-dom');
fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2)); fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment