From 94a95c9c4933affd4c29138e13eec63e52046ac1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <michael@jackson.us>
Date: Thu, 29 Nov 2018 20:37:35 -0800
Subject: [PATCH] Correct some comments

And remove some outdated info from 1.x
---
 packages/react-dev-utils/WebpackDevServerUtils.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/react-dev-utils/WebpackDevServerUtils.js b/packages/react-dev-utils/WebpackDevServerUtils.js
index 0a3e233e641..67a1a45e3a6 100644
--- a/packages/react-dev-utils/WebpackDevServerUtils.js
+++ b/packages/react-dev-utils/WebpackDevServerUtils.js
@@ -269,8 +269,6 @@ function onProxyError(proxy) {
 
 function prepareProxy(proxy, appPublicFolder) {
   // `proxy` lets you specify alternate servers for specific requests.
-  // It can either be a string or an object conforming to the Webpack dev server proxy configuration
-  // https://webpack.github.io/docs/webpack-dev-server.html
   if (!proxy) {
     return undefined;
   }
@@ -287,7 +285,7 @@ function prepareProxy(proxy, appPublicFolder) {
     process.exit(1);
   }
 
-  // Otherwise, if proxy is specified, we will let it handle any request except for files in the public folder.
+  // If proxy is specified, let it handle any request except for files in the public folder.
   function mayProxy(pathname) {
     const maybePublicPath = path.resolve(appPublicFolder, pathname.slice(1));
     return !fs.existsSync(maybePublicPath);
@@ -321,7 +319,7 @@ function prepareProxy(proxy, appPublicFolder) {
       // For `GET` requests, if request `accept`s text/html, we pick /index.html.
       // Modern browsers include text/html into `accept` header when navigating.
       // However API calls like `fetch()` won’t generally accept text/html.
-      // If this heuristic doesn’t work well for you, use a custom `proxy` object.
+      // If this heuristic doesn’t work well for you, use `src/setupProxy.js`.
       context: function(pathname, req) {
         return (
           req.method !== 'GET' ||
@@ -331,7 +329,7 @@ function prepareProxy(proxy, appPublicFolder) {
         );
       },
       onProxyReq: proxyReq => {
-        // Browers may send Origin headers even with same-origin
+        // Browsers may send Origin headers even with same-origin
         // requests. To prevent CORS issues, we have to change
         // the Origin to match the target URL.
         if (proxyReq.getHeader('origin')) {