diff --git a/packages/react-native-web/src/exports/StyleSheet/StyleSheet.js b/packages/react-native-web/src/exports/StyleSheet/StyleSheet.js index 6ca8dab7..c967e0ed 100644 --- a/packages/react-native-web/src/exports/StyleSheet/StyleSheet.js +++ b/packages/react-native-web/src/exports/StyleSheet/StyleSheet.js @@ -9,6 +9,7 @@ import ReactNativePropRegistry from './ReactNativePropRegistry'; import flattenStyle from './flattenStyle'; +import validate from './validate'; const absoluteFillObject = { position: 'absolute', @@ -47,9 +48,7 @@ const StyleSheet = { const result = {}; Object.keys(styles).forEach(key => { if (process.env.NODE_ENV !== 'production') { - const validate = require('./validate'); - const interopValidate = validate.default ? validate.default : validate; - interopValidate(key, styles); + validate(key, styles); } const id = styles[key] && ReactNativePropRegistry.register(styles[key]); result[key] = id; diff --git a/packages/react-native-web/src/vendor/react-native/emitter/mixInEventEmitter.js b/packages/react-native-web/src/vendor/react-native/emitter/mixInEventEmitter.js index 65278e2d..2492a66d 100644 --- a/packages/react-native-web/src/vendor/react-native/emitter/mixInEventEmitter.js +++ b/packages/react-native-web/src/vendor/react-native/emitter/mixInEventEmitter.js @@ -13,6 +13,7 @@ import EventEmitter from './EventEmitter'; import EventEmitterWithHolding from './EventEmitterWithHolding'; import EventHolder from './EventHolder'; +import EventValidator from './EventValidator'; import invariant from 'fbjs/lib/invariant'; import keyOf from 'fbjs/lib/keyOf'; @@ -121,7 +122,6 @@ const EventEmitterMixin = { if (!this.__eventEmitter) { let emitter = new EventEmitter(); if (__DEV__) { - const EventValidator = require('./EventValidator').default; emitter = EventValidator.addValidation(emitter, this.__types); }