mirror of
https://github.com/facebook/react.git
synced 2025-11-01 09:12:30 +00:00
Merge branch 'rollup' of github.com:trueadm/react into rollup
This commit is contained in:
@@ -34,7 +34,8 @@ ruleTester.run('eslint-rules/no-primitive-constructors', rule, {
|
||||
code: 'String(obj)',
|
||||
errors: [
|
||||
{
|
||||
message: 'Do not use the String constructor. To cast a value to a string, concat it with the empty string (unless it\'s a symbol, which has different semantics): \'\' + value',
|
||||
message: 'Do not use the String constructor. To cast a value to a string, ' +
|
||||
'concat it with the empty string (unless it\'s a symbol, which has different semantics): \'\' + value',
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"use strict";
|
||||
'use strict';
|
||||
|
||||
const { rollup } = require('rollup');
|
||||
const babel = require('rollup-plugin-babel');
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"use strict";
|
||||
'use strict';
|
||||
|
||||
const { resolve, basename } = require('path');
|
||||
const { sync } = require('glob');
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*
|
||||
* @providesModule ReactElement
|
||||
*/
|
||||
"use strict";
|
||||
'use strict';
|
||||
|
||||
const {
|
||||
createElement,
|
||||
|
||||
@@ -17,4 +17,3 @@ const {
|
||||
} = require('ReactNative');
|
||||
|
||||
module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.NativeMethodsMixin;
|
||||
|
||||
@@ -16,4 +16,3 @@ const {
|
||||
} = require('ReactNative');
|
||||
|
||||
module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDebugTool;
|
||||
|
||||
@@ -16,4 +16,3 @@ const {
|
||||
} = require('ReactNative');
|
||||
|
||||
module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactErrorUtils;
|
||||
|
||||
@@ -16,4 +16,3 @@ const {
|
||||
} = require('ReactNative');
|
||||
|
||||
module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.TouchHistoryMath;
|
||||
|
||||
@@ -17,4 +17,3 @@ const {
|
||||
} = require('ReactNative');
|
||||
|
||||
module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.createReactNativeComponentClass;
|
||||
|
||||
+2
-3
@@ -21,11 +21,10 @@ let realFindNodeHandle = null;
|
||||
|
||||
function findNodeHandle(componentOrHandle: any): ?number {
|
||||
if (realFindNodeHandle === null) {
|
||||
realFindNodeHandle = require('ReactNative').
|
||||
__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.findNodeHandle;
|
||||
realFindNodeHandle = require('ReactNative')
|
||||
.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.findNodeHandle;
|
||||
}
|
||||
return realFindNodeHandle(componentOrHandle);
|
||||
}
|
||||
|
||||
module.exports = findNodeHandle;
|
||||
|
||||
@@ -98,7 +98,7 @@ function logCapturedError(capturedError: CapturedError): void {
|
||||
|
||||
exports.injection = {
|
||||
/**
|
||||
* Display custom dialog for lifecycle errors.
|
||||
* Display custom dialog for lifecycle errors.
|
||||
* Return false to prevent default behavior of logging to console.error.
|
||||
*/
|
||||
injectDialog(fn: (e: CapturedError) => boolean) {
|
||||
|
||||
Reference in New Issue
Block a user