Skip to content

Commit

Permalink
Add a build step to hoist warning conditions (#12537)
Browse files Browse the repository at this point in the history
  • Loading branch information
gaearon authored Apr 4, 2018
1 parent b15b165 commit 1c2876d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('wrap-warning-with-env-check', () => {
it('should wrap warning calls', () => {
compare(
"warning(condition, 'a %s b', 'c');",
"__DEV__ ? warning(condition, 'a %s b', 'c') : void 0;"
"__DEV__ ? !condition ? warning(false, 'a %s b', 'c') : void 0 : void 0;"
);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,35 @@ module.exports = function(babel, options) {
}

if (path.get('callee').isIdentifier({name: 'warning'})) {
node[SEEN_SYMBOL] = true;

// Turns this code:
//
// warning(condition, argument, argument);
//
// into this:
//
// if (__DEV__) {
// warning(condition, argument, argument);
// if (!condition) {
// warning(false, argument, argument);
// }
// }
//
// The goal is to strip out warning calls entirely in production.
// The goal is to strip out warning calls entirely in production
// and to avoid evaluating the arguments in development.
const condition = node.arguments[0];
const newNode = t.callExpression(
node.callee,
[t.booleanLiteral(false)].concat(node.arguments.slice(1))
);
newNode[SEEN_SYMBOL] = true;
path.replaceWith(
t.ifStatement(
DEV_EXPRESSION,
t.blockStatement([t.expressionStatement(node)])
t.blockStatement([
t.ifStatement(
t.unaryExpression('!', condition),
t.expressionStatement(newNode)
),
])
)
);
}
Expand Down
6 changes: 6 additions & 0 deletions scripts/jest/preprocessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ const pathToBabel = path.join(
const pathToBabelPluginDevWithCode = require.resolve(
'../error-codes/replace-invariant-error-codes'
);
const pathToBabelPluginWrapWarning = require.resolve(
'../babel/wrap-warning-with-env-check'
);
const pathToBabelPluginAsyncToGenerator = require.resolve(
'babel-plugin-transform-async-to-generator'
);
Expand All @@ -29,6 +32,8 @@ const babelOptions = {
require.resolve('babel-plugin-transform-es2015-modules-commonjs'),

pathToBabelPluginDevWithCode,
pathToBabelPluginWrapWarning,

// Keep stacks detailed in tests.
// Don't put this in .babelrc so that we don't embed filenames
// into ReactART builds that include JSX.
Expand Down Expand Up @@ -75,6 +80,7 @@ module.exports = {
pathToBabel,
pathToBabelrc,
pathToBabelPluginDevWithCode,
pathToBabelPluginWrapWarning,
pathToErrorCodes,
]),
};
4 changes: 2 additions & 2 deletions scripts/rollup/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function getBabelConfig(updateBabelOptions, bundleType, filename) {
return Object.assign({}, options, {
plugins: options.plugins.concat([
// Wrap warning() calls in a __DEV__ check so they are stripped from production.
require('./plugins/wrap-warning-with-env-check'),
require('../babel/wrap-warning-with-env-check'),
]),
});
case UMD_DEV:
Expand All @@ -101,7 +101,7 @@ function getBabelConfig(updateBabelOptions, bundleType, filename) {
// Minify invariant messages
require('../error-codes/replace-invariant-error-codes'),
// Wrap warning() calls in a __DEV__ check so they are stripped from production.
require('./plugins/wrap-warning-with-env-check'),
require('../babel/wrap-warning-with-env-check'),
]),
});
default:
Expand Down

0 comments on commit 1c2876d

Please sign in to comment.