Merge branch 'master' into serve-app-under

* master:
  Updates comment to reflect codebase (facebook#3576)
  Add mjs and jsx filename extensions to file-loader exclude pattern (facebook#3537)

packages/react-scripts/config/webpack.config.dev.js

@@ -229,7 +229,7 @@ module.exports = {
             // it's runtime that would otherwise processed through "file" loader.
             // Also exclude `html` and `json` extensions so they get processed
             // by webpacks internal loaders.
-            exclude: [/\.js$/, /\.html$/, /\.json$/],
+            exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
             loader: require.resolve('file-loader'),
             options: {
               name: 'static/media/[name].[hash:8].[ext]',

packages/react-scripts/config/webpack.config.prod.js

@@ -249,7 +249,7 @@ module.exports = {
             // it's runtime that would otherwise processed through "file" loader.
             // Also exclude `html` and `json` extensions so they get processed
             // by webpacks internal loaders.
-            exclude: [/\.js$/, /\.html$/, /\.json$/],
+            exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
             options: {
               name: 'static/media/[name].[hash:8].[ext]',
             },

packages/react-scripts/scripts/start.js

@@ -55,7 +55,7 @@ const HOST = process.env.HOST || '0.0.0.0';
 const servedPathPathname = url.parse(paths.servedPath).pathname || '';
 
 // We attempt to use the default port but if it is busy, we offer the user to
-// run on a different port. `detect()` Promise resolves to the next free port.
+// run on a different port. `choosePort()` Promise resolves to the next free port.
 choosePort(HOST, DEFAULT_PORT)
   .then(port => {
     if (port == null) {