Fix range issue

storybookjs · Apr 7, 2019 · 53befcc · 53befcc
1 parent 0cad065
commit 53befcc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/react/src/server/cra-config.js b/app/react/src/server/cra-config.js
@@ -60,7 +60,7 @@ export function isReactScriptsInstalled(requiredVersion = '2.0.0') {
   try {
     // eslint-disable-next-line import/no-dynamic-require,global-require
     const reactScriptsJson = require(path.join(getReactScriptsPath(), 'package.json'));
-    return !semver.lt(reactScriptsJson.version, requiredVersion);
+    return !semver.gtr(requiredVersion, reactScriptsJson.version);
   } catch (e) {
     return false;
   }

diff --git a/app/react/src/server/framework-preset-cra.js b/app/react/src/server/framework-preset-cra.js
@@ -14,6 +14,10 @@ export function webpackFinal(config, { configDir }) {
 }
 
 export function managerWebpack(config) {
+  if (!isReactScriptsInstalled()) {
+    return config;
+  }
+
   return {
     ...config,
     resolveLoader: {

diff --git a/lib/cli/generators/REACT_SCRIPTS/index.js b/lib/cli/generators/REACT_SCRIPTS/index.js
@@ -26,7 +26,7 @@ export default async npmOptions => {
   packageJson.devDependencies['@storybook/addons'] = addonsVersion;
 
   // When working with `create-react-app@>=2.0.0`, we know `babel-loader` is installed.
-  if (semver.lt(packageJson.dependencies['react-scripts'], '2.0.0')) {
+  if (semver.gtr('2.0.0', packageJson.dependencies['react-scripts'])) {
     await installBabel(npmOptions, packageJson);
   }