From e2dc3fc5a40427b2d0c742b75b862a6c656b41f8 Mon Sep 17 00:00:00 2001 From: Joe Haddad <timer150@gmail.com> Date: Thu, 20 Sep 2018 16:48:45 -0400 Subject: [PATCH] Lessen significance of browserslist Adjust the default browsers to be a single list and remove it from the build output; it only affects CSS now --- packages/react-dev-utils/browsersHelper.js | 36 ++-------------------- packages/react-scripts/package.json | 18 +++-------- packages/react-scripts/scripts/build.js | 2 -- 3 files changed, 8 insertions(+), 48 deletions(-) diff --git a/packages/react-dev-utils/browsersHelper.js b/packages/react-dev-utils/browsersHelper.js index c4ad85ab4..2aefb09ff 100644 --- a/packages/react-dev-utils/browsersHelper.js +++ b/packages/react-dev-utils/browsersHelper.js @@ -13,12 +13,7 @@ const inquirer = require('inquirer'); const pkgUp = require('pkg-up'); const fs = require('fs'); -const defaultBrowsers = { - development: ['chrome', 'firefox', 'edge'].map( - browser => `last 2 ${browser} versions` - ), - production: ['>0.25%', 'not op_mini all', 'ie 11'], -}; +const defaultBrowsers = ['>0.25%', 'not op_mini all', 'ie 11']; function checkBrowsers(dir, retry = true) { const current = browserslist.findConfig(dir); @@ -66,16 +61,7 @@ function checkBrowsers(dir, retry = true) { console.log(); console.log(chalk.green('Set target browsers:')); console.log(); - console.log( - `\t${chalk.bold('Production')}: ${chalk.cyan( - defaultBrowsers.production.join(', ') - )}` - ); - console.log( - `\t${chalk.bold('Development')}: ${chalk.cyan( - defaultBrowsers.development.join(', ') - )}` - ); + console.log(`\t${chalk.cyan(defaultBrowsers.join(', '))}`); console.log(); }) // Swallow any error @@ -88,20 +74,4 @@ function checkBrowsers(dir, retry = true) { }); } -function printBrowsers(dir) { - return checkBrowsers(dir).then(browsers => { - if (browsers == null) { - console.log('Built the bundle with default browser support.'); - return; - } - browsers = browsers[process.env.NODE_ENV] || browsers; - if (Array.isArray(browsers)) { - browsers = browsers.join(', '); - } - console.log( - `Built the bundle with browser support for ${chalk.cyan(browsers)}.` - ); - }); -} - -module.exports = { defaultBrowsers, checkBrowsers, printBrowsers }; +module.exports = { defaultBrowsers, checkBrowsers }; diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 165e02a44..2811663c9 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -80,17 +80,9 @@ "optionalDependencies": { "fsevents": "1.2.4" }, - "browserslist": { - "development": [ - "last 2 chrome versions", - "last 2 firefox versions", - "last 2 edge versions" - ], - "production": [ - ">1%", - "last 4 versions", - "Firefox ESR", - "not ie < 11" - ] - } + "browserslist": [ + ">0.25%", + "not op_mini all", + "ie 11" + ] } diff --git a/packages/react-scripts/scripts/build.js b/packages/react-scripts/scripts/build.js index 6c37f3d71..bc0f81b1d 100644 --- a/packages/react-scripts/scripts/build.js +++ b/packages/react-scripts/scripts/build.js @@ -41,7 +41,6 @@ const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages'); const printHostingInstructions = require('react-dev-utils/printHostingInstructions'); const FileSizeReporter = require('react-dev-utils/FileSizeReporter'); const printBuildError = require('react-dev-utils/printBuildError'); -const { printBrowsers } = require('react-dev-utils/browsersHelper'); const measureFileSizesBeforeBuild = FileSizeReporter.measureFileSizesBeforeBuild; @@ -119,7 +118,6 @@ checkBrowsers(paths.appPath) buildFolder, useYarn ); - printBrowsers(paths.appPath); }, err => { console.log(chalk.red('Failed to compile.\n')); -- GitLab