facebook · gaearon · Dec 12, 2019 · Dec 12, 2019
diff --git a/packages/create-subscription/src/createSubscription.js b/packages/create-subscription/src/createSubscription.js
@@ -9,7 +9,7 @@
 
 import React from 'react';
 import invariant from 'shared/invariant';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 type Unsubscribe = () => void;
 
@@ -38,12 +38,10 @@ export function createSubscription<Property, Value>(
 
   if (__DEV__) {
     if (typeof getCurrentValue !== 'function') {
-      warningWithoutStack(
-        'Subscription must specify a getCurrentValue function',
-      );
+      warning('Subscription must specify a getCurrentValue function');
     }
     if (typeof subscribe !== 'function') {
-      warningWithoutStack('Subscription must specify a subscribe function');
+      warning('Subscription must specify a subscribe function');
     }
   }
 

diff --git a/packages/legacy-events/EventPluginUtils.js b/packages/legacy-events/EventPluginUtils.js
@@ -7,7 +7,7 @@
 
 import {invokeGuardedCallbackAndCatchFirstError} from 'shared/ReactErrorUtils';
 import invariant from 'shared/invariant';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 export let getFiberCurrentPropsFromNode = null;
 export let getInstanceFromNode = null;
@@ -23,7 +23,7 @@ export function setComponentTree(
   getNodeFromInstance = getNodeFromInstanceImpl;
   if (__DEV__) {
     if (!getNodeFromInstance || !getInstanceFromNode) {
-      warningWithoutStack(
+      warning(
         'EventPluginUtils.setComponentTree(...): Injected ' +
           'module is missing getNodeFromInstance or getInstanceFromNode.',
       );
@@ -52,7 +52,7 @@ if (__DEV__) {
         : 0;
 
     if (instancesIsArr !== listenersIsArr || instancesLen !== listenersLen) {
-      warningWithoutStack('EventPluginUtils: Invalid `event`.');
+      warning('EventPluginUtils: Invalid `event`.');
     }
   };
 }

diff --git a/packages/legacy-events/EventPropagators.js b/packages/legacy-events/EventPropagators.js
@@ -10,7 +10,7 @@ import {
   traverseTwoPhase,
   traverseEnterLeave,
 } from 'shared/ReactTreeTraversal';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 import {getListener} from './EventPluginHub';
 import accumulateInto from './accumulateInto';
@@ -47,7 +47,7 @@ function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {
 function accumulateDirectionalDispatches(inst, phase, event) {
   if (__DEV__) {
     if (!inst) {
-      warningWithoutStack('Dispatching inst must not be null');
+      warning('Dispatching inst must not be null');
     }
   }
   const listener = listenerAtPhase(inst, event, phase);

diff --git a/packages/legacy-events/ResponderTouchHistoryStore.js b/packages/legacy-events/ResponderTouchHistoryStore.js
@@ -8,7 +8,7 @@
  */
 
 import invariant from 'shared/invariant';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 import {isStartish, isMoveish, isEndish} from './ResponderTopLevelEventTypes';
 
@@ -96,7 +96,7 @@ function getTouchIdentifier({identifier}: Touch): number {
   invariant(identifier != null, 'Touch object is missing identifier.');
   if (__DEV__) {
     if (identifier > MAX_TOUCH_BANK) {
-      warningWithoutStack(
+      warning(
         'Touch identifier %s is greater than maximum supported %s which causes ' +
           'performance issues backfilling array locations for all of the indices.',
         identifier,
@@ -202,7 +202,7 @@ const ResponderTouchHistoryStore = {
         if (__DEV__) {
           const activeRecord = touchBank[touchHistory.indexOfSingleActiveTouch];
           if (activeRecord == null || !activeRecord.touchActive) {
-            warningWithoutStack('Cannot find single active touch.');
+            warning('Cannot find single active touch.');
           }
         }
       }

diff --git a/packages/legacy-events/SyntheticEvent.js b/packages/legacy-events/SyntheticEvent.js
@@ -8,7 +8,7 @@
 /* eslint valid-typeof: 0 */
 
 import invariant from 'shared/invariant';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 const EVENT_POOL_SIZE = 10;
 
@@ -284,7 +284,7 @@ function getPooledWarningPropertyDefinition(propName, getVal) {
 
   function warn(action, result) {
     if (__DEV__) {
-      warningWithoutStack(
+      warning(
         "This synthetic event is reused for performance reasons. If you're seeing this, " +
           "you're %s `%s` on a released/nullified synthetic event. %s. " +
           'If you must keep the original synthetic event around, use event.persist(). ' +

diff --git a/packages/react-cache/src/ReactCache.js b/packages/react-cache/src/ReactCache.js
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import warningWithoutStack from 'shared/warningWithoutStack';
+import warning from 'shared/warning';
 
 import {createLRU} from './LRU';
 
@@ -71,7 +71,7 @@ function identityHashFn(input) {
       input !== undefined &&
       input !== null
     ) {
-      warningWithoutStack(
+      warning(
         'Invalid key type. Expected a string, number, symbol, or boolean, ' +
           'but instead received: %s' +
           '\n\nTo use non-primitive values as keys, you must pass a hash ' +

diff --git a/packages/react-cache/src/__tests__/ReactCache-test.internal.js b/packages/react-cache/src/__tests__/ReactCache-test.internal.js
@@ -172,15 +172,12 @@ describe('ReactCache', () => {
     if (__DEV__) {
       expect(() => {
         expect(Scheduler).toFlushAndYield(['App', 'Loading...']);
-      }).toWarnDev(
-        [
-          'Invalid key type. Expected a string, number, symbol, or ' +
-            'boolean, but instead received: Hi,100\n\n' +
-            'To use non-primitive values as keys, you must pass a hash ' +
-            'function as the second argument to createResource().',
-        ],
-        {withoutStack: true},
-      );
+      }).toWarnDev([
+        'Invalid key type. Expected a string, number, symbol, or ' +
+          'boolean, but instead received: Hi,100\n\n' +
+          'To use non-primitive values as keys, you must pass a hash ' +
+          'function as the second argument to createResource().',
+      ]);
     } else {
       expect(Scheduler).toFlushAndYield(['App', 'Loading...']);
     }

diff --git a/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js b/packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
@@ -215,7 +215,6 @@ describe('ReactComponentLifeCycle', () => {
       'StatefulComponent: It is not recommended to assign props directly to state ' +
         "because updates to props won't be reflected in state. " +
         'In most cases, it is better to use props directly.',
-      {withoutStack: true},
     );
   });
 
@@ -240,7 +239,6 @@ describe('ReactComponentLifeCycle', () => {
         'This is a no-op, but it might indicate a bug in your application. ' +
         'Instead, assign to `this.state` directly or define a `state = {};` ' +
         'class property with the desired state in the StatefulComponent component.',
-      {withoutStack: true},
     );
 
     // Check deduplication; (no extra warnings should be logged).
@@ -271,9 +269,7 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => {
       const instance = ReactTestUtils.renderIntoDocument(element);
       expect(instance._isMounted()).toBeTruthy();
-    }).toWarnDev('Component is accessing isMounted inside its render()', {
-      withoutStack: true,
-    });
+    }).toWarnDev('Component is accessing isMounted inside its render()');
   });
 
   it('should correctly determine if a null component is mounted', () => {
@@ -300,9 +296,7 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => {
       const instance = ReactTestUtils.renderIntoDocument(element);
       expect(instance._isMounted()).toBeTruthy();
-    }).toWarnDev('Component is accessing isMounted inside its render()', {
-      withoutStack: true,
-    });
+    }).toWarnDev('Component is accessing isMounted inside its render()');
   });
 
   it('isMounted should return false when unmounted', () => {
@@ -340,9 +334,7 @@ describe('ReactComponentLifeCycle', () => {
 
     expect(() => {
       ReactTestUtils.renderIntoDocument(<Component />);
-    }).toWarnDev('Component is accessing findDOMNode inside its render()', {
-      withoutStack: true,
-    });
+    }).toWarnDev('Component is accessing findDOMNode inside its render()');
   });
 
   it('should carry through each of the phases of setup', () => {
@@ -408,7 +400,6 @@ describe('ReactComponentLifeCycle', () => {
       instance = ReactDOM.render(<LifeCycleComponent />, container);
     }).toWarnDev(
       'LifeCycleComponent is accessing isMounted inside its render() function',
-      {withoutStack: true},
     );
 
     // getInitialState
@@ -705,7 +696,6 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => {
       expect(() => ReactDOM.render(<Component />, container)).toWarnDev(
         'Unsafe legacy lifecycles will not be called for components using new component APIs.',
-        {withoutStack: true},
       );
     }).toLowPriorityWarnDev(
       [
@@ -744,7 +734,6 @@ describe('ReactComponentLifeCycle', () => {
         ReactDOM.render(<Component value={1} />, container),
       ).toWarnDev(
         'Unsafe legacy lifecycles will not be called for components using new component APIs.',
-        {withoutStack: true},
       );
     }).toLowPriorityWarnDev(
       [
@@ -780,7 +769,6 @@ describe('ReactComponentLifeCycle', () => {
     const container = document.createElement('div');
     expect(() => ReactDOM.render(<Component value={1} />, container)).toWarnDev(
       'Unsafe legacy lifecycles will not be called for components using new component APIs.',
-      {withoutStack: true},
     );
     ReactDOM.render(<Component value={2} />, container);
   });
@@ -812,7 +800,6 @@ describe('ReactComponentLifeCycle', () => {
           '  componentWillUpdate\n\n' +
           'The above lifecycles should be removed. Learn more about this warning here:\n' +
           'https://fb.me/react-unsafe-component-lifecycles',
-        {withoutStack: true},
       );
     }).toLowPriorityWarnDev(
       [
@@ -839,7 +826,6 @@ describe('ReactComponentLifeCycle', () => {
         '  UNSAFE_componentWillMount\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-unsafe-component-lifecycles',
-      {withoutStack: true},
     );
 
     class WillMountAndUpdate extends React.Component {
@@ -864,7 +850,6 @@ describe('ReactComponentLifeCycle', () => {
           '  UNSAFE_componentWillUpdate\n\n' +
           'The above lifecycles should be removed. Learn more about this warning here:\n' +
           'https://fb.me/react-unsafe-component-lifecycles',
-        {withoutStack: true},
       );
     }).toLowPriorityWarnDev(['componentWillMount has been renamed'], {
       withoutStack: true,
@@ -888,7 +873,6 @@ describe('ReactComponentLifeCycle', () => {
           '  componentWillReceiveProps\n\n' +
           'The above lifecycles should be removed. Learn more about this warning here:\n' +
           'https://fb.me/react-unsafe-component-lifecycles',
-        {withoutStack: true},
       );
     }).toLowPriorityWarnDev(['componentWillReceiveProps has been renamed'], {
       withoutStack: true,
@@ -921,7 +905,6 @@ describe('ReactComponentLifeCycle', () => {
           '  componentWillUpdate\n\n' +
           'The above lifecycles should be removed. Learn more about this warning here:\n' +
           'https://fb.me/react-unsafe-component-lifecycles',
-        {withoutStack: true},
       );
     }).toLowPriorityWarnDev(
       [
@@ -947,7 +930,6 @@ describe('ReactComponentLifeCycle', () => {
         '  UNSAFE_componentWillMount\n\n' +
         'The above lifecycles should be removed. Learn more about this warning here:\n' +
         'https://fb.me/react-unsafe-component-lifecycles',
-      {withoutStack: true},
     );
 
     class WillMountAndUpdate extends React.Component {
@@ -971,7 +953,6 @@ describe('ReactComponentLifeCycle', () => {
           '  UNSAFE_componentWillUpdate\n\n' +
           'The above lifecycles should be removed. Learn more about this warning here:\n' +
           'https://fb.me/react-unsafe-component-lifecycles',
-        {withoutStack: true},
       );
     }).toLowPriorityWarnDev(['componentWillMount has been renamed'], {
       withoutStack: true,
@@ -994,7 +975,6 @@ describe('ReactComponentLifeCycle', () => {
           '  componentWillReceiveProps\n\n' +
           'The above lifecycles should be removed. Learn more about this warning here:\n' +
           'https://fb.me/react-unsafe-component-lifecycles',
-        {withoutStack: true},
       );
     }).toLowPriorityWarnDev(['componentWillReceiveProps has been renamed'], {
       withoutStack: true,
@@ -1045,7 +1025,6 @@ describe('ReactComponentLifeCycle', () => {
         "If you can't use a class try assigning the prototype on the function as a workaround. " +
         '`Parent.prototype = React.Component.prototype`. ' +
         "Don't use an arrow function since it cannot be called with `new` by React.",
-      {withoutStack: true},
     );
     ReactDOM.render(<Parent ref={c => c && log.push('ref')} />, div);
 
@@ -1074,7 +1053,6 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => ReactDOM.render(<MyComponent />, div)).toWarnDev(
       'MyComponent.getDerivedStateFromProps(): A valid state object (or null) must ' +
         'be returned. You have returned undefined.',
-      {withoutStack: true},
     );
 
     // De-duped
@@ -1097,7 +1075,6 @@ describe('ReactComponentLifeCycle', () => {
         'undefined. This is not recommended. Instead, define the initial state by ' +
         'assigning an object to `this.state` in the constructor of `MyComponent`. ' +
         'This ensures that `getDerivedStateFromProps` arguments have a consistent shape.',
-      {withoutStack: true},
     );
 
     // De-duped
@@ -1366,7 +1343,6 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => ReactDOM.render(<MyComponent value="bar" />, div)).toWarnDev(
       'MyComponent.getSnapshotBeforeUpdate(): A snapshot value (or null) must ' +
         'be returned. You have returned undefined.',
-      {withoutStack: true},
     );
 
     // De-duped
@@ -1387,7 +1363,6 @@ describe('ReactComponentLifeCycle', () => {
     expect(() => ReactDOM.render(<MyComponent />, div)).toWarnDev(
       'MyComponent: getSnapshotBeforeUpdate() should be used with componentDidUpdate(). ' +
         'This component defines getSnapshotBeforeUpdate() only.',
-      {withoutStack: true},
     );
 
     // De-duped