Skip to content

Commit 157992b

Browse files
johann-sonntagbauerSpaceK33z
authored andcommitted
fix react dependency versions during initial install (facebook#1669)
* fix react dependency versions during initial install * add review remarks
1 parent 5edc4a9 commit 157992b

File tree

1 file changed

+29
-3
lines changed

1 file changed

+29
-3
lines changed

packages/create-react-cy-app/index.js

+29-3
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,9 @@ function run(root, appName, version, verbose, originalDirectory, template) {
212212
checkNodeVersion(packageName);
213213

214214
// Since react-scripts has been installed with --save
215-
// We need to move it into devDependencies and rewrite package.json
216-
moveReactScriptsToDev(packageName);
215+
// we need to move it into devDependencies and rewrite package.json
216+
// also ensure react dependencies have caret version range
217+
fixDependencies(packageName);
217218

218219
var scriptsPath = path.resolve(
219220
process.cwd(),
@@ -326,7 +327,29 @@ function checkAppName(appName) {
326327
}
327328
}
328329

329-
function moveReactScriptsToDev(packageName) {
330+
function makeCaretRange(dependencies, name) {
331+
var version = dependencies[name];
332+
333+
if (typeof version === 'undefined') {
334+
console.error(
335+
chalk.red('Missing ' + name + ' dependency in package.json')
336+
);
337+
process.exit(1);
338+
}
339+
340+
var patchedVersion = '^' + version;
341+
342+
if (!semver.validRange(patchedVersion)) {
343+
console.error(
344+
'Unable to patch ' + name + ' dependency version because version ' + chalk.red(version) + ' will become invalid ' + chalk.red(patchedVersion)
345+
);
346+
patchedVersion = version;
347+
}
348+
349+
dependencies[name] = patchedVersion;
350+
}
351+
352+
function fixDependencies(packageName) {
330353
var packagePath = path.join(process.cwd(), 'package.json');
331354
var packageJson = require(packagePath);
332355

@@ -350,6 +373,9 @@ function moveReactScriptsToDev(packageName) {
350373
packageJson.devDependencies[packageName] = packageVersion;
351374
delete packageJson.dependencies[packageName];
352375

376+
makeCaretRange(packageJson.dependencies, 'react');
377+
makeCaretRange(packageJson.dependencies, 'react-dom');
378+
353379
fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));
354380
}
355381

0 commit comments

Comments
 (0)