Merge branch 'develop'

.nvmrc

@@ -1 +1 @@
-8.11.1
+8.15.0

README.md

@@ -34,7 +34,7 @@ As of now (20/04/2018), `create-react-app` (more precisely `react-scripts`) does
 
 # Prerequisites
 
-Supports `react-scripts >= 1.0.x`, hence it supports the newest version `2.x.x`.
+Supports `react-scripts >= 1.0.x`, hence it supports the newest version `3.x.x`.
 
 # Installation
 

scripts/index.js

@@ -12,13 +12,13 @@ const {
 } = require('../utils/cliHandler');
 const { getReactScriptsVersion, isEjected } = require('../utils');
 
-const { major, minor, patch } = getReactScriptsVersion(reactScriptsVersion);
+const { major, concatenatedVersion } = getReactScriptsVersion(reactScriptsVersion);
 
 const paths = isEjected ? importCwd('./config/paths') : importCwd('react-scripts/config/paths');
 const webpack = importCwd('webpack');
 
 const config =
-  major >= 2 && minor >= 1 && patch >= 2
+  concatenatedVersion >= 212
     ? (isEjected
         ? importCwd('./config/webpack.config')
         : importCwd('react-scripts/config/webpack.config'))('development')
@@ -65,12 +65,8 @@ if (major >= 2) {
   // 2.0.1 => 3
   // 2.0.2 => 3
   // 2.0.3 => 3
-  // 2.0.4 => 2
-  // 2.1.0 => 2
-  // 2.1.1 => 2
-  // 2.1.2 => 2
-  // 2.1.3 => 2
-  const oneOfIndex = minor === 0 && patch < 4 && patch >= 1 ? 3 : 2;
+  // 2.0.4 to 3.0.0 => 2
+  const oneOfIndex = concatenatedVersion === 200 || concatenatedVersion >= 204 ? 2 : 3;
   config.module.rules[oneOfIndex].oneOf[0].options.name = `media/[name].[hash:8].[ext]`;
   config.module.rules[oneOfIndex].oneOf[7].options.name = `media/[name].[hash:8].[ext]`;
 } else {

utils/index.js

@@ -9,6 +9,7 @@ const DEFAULT_VERSION = {
   major: 2,
   minor: 1,
   patch: 2,
+  concatenatedVersion: 212,
 };
 
 exports.isEjected = fs.pathExistsSync(path.join(process.cwd(), 'config/paths.js'));
@@ -19,6 +20,9 @@ exports.getReactScriptsVersion = function getReactScriptsVersion(cliVersion) {
       major: Number(semver.major(cliVersion)),
       minor: Number(semver.minor(cliVersion)),
       patch: Number(semver.patch(cliVersion)),
+      concatenatedVersion: Number(
+        `${semver.major(cliVersion)}${semver.minor(cliVersion)}${semver.patch(cliVersion)}`
+      ),
     };
     return versions;
   }
@@ -33,6 +37,9 @@ exports.getReactScriptsVersion = function getReactScriptsVersion(cliVersion) {
     major: Number(semver.major(version)),
     minor: Number(semver.minor(version)),
     patch: Number(semver.patch(version)),
+    concatenatedVersion: Number(
+      `${semver.major(version)}${semver.minor(version)}${semver.patch(version)}`
+    ),
   };
   return versions;
 };