From 34dcdbdc25851455109a35b388d49c2e828a4c6a Mon Sep 17 00:00:00 2001 From: James Ide Date: Fri, 10 May 2019 10:51:25 -0700 Subject: [PATCH] [standards] Migrate vendored code from Haste to path-based imports This is the next step in moving RN towards standard path-based requires. All the requires in `Libraries/vendor` have been rewritten to use relative requires. Talking to cpojer, the vendored code in RN can be modified directly. This commit uses relative requires instead of `react-native/...` so that if Facebook were to stop syncing out certain folders and therefore remove code from the react-native package, internal code at Facebook would not need to change. Test Plan: Prettier/Lint, Flow, Jest tests, loaded RNTester --- Libraries/vendor/core/Map.js | 6 +++--- Libraries/vendor/core/Set.js | 6 +++--- Libraries/vendor/core/merge.js | 2 +- Libraries/vendor/core/mergeInto.js | 2 +- .../document/selection/DocumentSelectionState.js | 2 +- Libraries/vendor/emitter/EmitterSubscription.js | 6 +++--- Libraries/vendor/emitter/EventEmitter.js | 4 ++-- Libraries/vendor/emitter/EventEmitterWithHolding.js | 6 +++--- Libraries/vendor/emitter/EventSubscription.js | 2 +- Libraries/vendor/emitter/EventSubscriptionVendor.js | 2 +- Libraries/vendor/emitter/mixInEventEmitter.js | 10 +++++----- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Libraries/vendor/core/Map.js b/Libraries/vendor/core/Map.js index 76f27534ac651c..4f23b1f4783ab8 100644 --- a/Libraries/vendor/core/Map.js +++ b/Libraries/vendor/core/Map.js @@ -13,9 +13,9 @@ 'use strict'; -const _shouldPolyfillES6Collection = require('_shouldPolyfillES6Collection'); -const guid = require('guid'); -const toIterator = require('toIterator'); +const _shouldPolyfillES6Collection = require('./_shouldPolyfillES6Collection'); +const guid = require('./guid'); +const toIterator = require('./toIterator'); module.exports = (function(global, undefined) { // Since our implementation is spec-compliant for the most part we can safely diff --git a/Libraries/vendor/core/Set.js b/Libraries/vendor/core/Set.js index 7d713dc84d1d3a..564f530b9afd8a 100644 --- a/Libraries/vendor/core/Set.js +++ b/Libraries/vendor/core/Set.js @@ -13,10 +13,10 @@ 'use strict'; -const Map = require('Map'); +const Map = require('./Map'); -const _shouldPolyfillES6Collection = require('_shouldPolyfillES6Collection'); -const toIterator = require('toIterator'); +const _shouldPolyfillES6Collection = require('./_shouldPolyfillES6Collection'); +const toIterator = require('./toIterator'); module.exports = (function(global) { // Since our implementation is spec-compliant for the most part we can safely diff --git a/Libraries/vendor/core/merge.js b/Libraries/vendor/core/merge.js index 7dee5a09679230..a294d4af6d9d66 100644 --- a/Libraries/vendor/core/merge.js +++ b/Libraries/vendor/core/merge.js @@ -7,7 +7,7 @@ "use strict"; -const mergeInto = require('mergeInto'); +const mergeInto = require('./mergeInto'); /** * Shallow merges two structures into a return value, without mutating either. diff --git a/Libraries/vendor/core/mergeInto.js b/Libraries/vendor/core/mergeInto.js index 024289f67533f7..877c827f70d4ef 100644 --- a/Libraries/vendor/core/mergeInto.js +++ b/Libraries/vendor/core/mergeInto.js @@ -7,7 +7,7 @@ "use strict"; -var mergeHelpers = require('mergeHelpers'); +var mergeHelpers = require('./mergeHelpers'); var checkMergeObjectArg = mergeHelpers.checkMergeObjectArg; var checkMergeIntoObjectArg = mergeHelpers.checkMergeIntoObjectArg; diff --git a/Libraries/vendor/document/selection/DocumentSelectionState.js b/Libraries/vendor/document/selection/DocumentSelectionState.js index c57483dc8e31e8..577f192f50824f 100644 --- a/Libraries/vendor/document/selection/DocumentSelectionState.js +++ b/Libraries/vendor/document/selection/DocumentSelectionState.js @@ -10,7 +10,7 @@ 'use strict'; -const mixInEventEmitter = require('mixInEventEmitter'); +const mixInEventEmitter = require('../../emitter/mixInEventEmitter'); /** * DocumentSelectionState is responsible for maintaining selection information diff --git a/Libraries/vendor/emitter/EmitterSubscription.js b/Libraries/vendor/emitter/EmitterSubscription.js index c3793684164bf4..cc3138305b3490 100644 --- a/Libraries/vendor/emitter/EmitterSubscription.js +++ b/Libraries/vendor/emitter/EmitterSubscription.js @@ -10,10 +10,10 @@ 'use strict'; -const EventSubscription = require('EventSubscription'); +const EventSubscription = require('./EventSubscription'); -import type EventEmitter from 'EventEmitter'; -import type EventSubscriptionVendor from 'EventSubscriptionVendor'; +import type EventEmitter from './EventEmitter'; +import type EventSubscriptionVendor from './EventSubscriptionVendor'; /** * EmitterSubscription represents a subscription with listener and context data. diff --git a/Libraries/vendor/emitter/EventEmitter.js b/Libraries/vendor/emitter/EventEmitter.js index bd9a7cc83da11a..f3c18c91058d8e 100644 --- a/Libraries/vendor/emitter/EventEmitter.js +++ b/Libraries/vendor/emitter/EventEmitter.js @@ -11,8 +11,8 @@ 'use strict'; -const EmitterSubscription = require('EmitterSubscription'); -const EventSubscriptionVendor = require('EventSubscriptionVendor'); +const EmitterSubscription = require('./EmitterSubscription'); +const EventSubscriptionVendor = require('./EventSubscriptionVendor'); const invariant = require('invariant'); diff --git a/Libraries/vendor/emitter/EventEmitterWithHolding.js b/Libraries/vendor/emitter/EventEmitterWithHolding.js index 34e6d3d90d8aa9..945506e3c0f182 100644 --- a/Libraries/vendor/emitter/EventEmitterWithHolding.js +++ b/Libraries/vendor/emitter/EventEmitterWithHolding.js @@ -10,9 +10,9 @@ 'use strict'; -import type EmitterSubscription from 'EmitterSubscription'; -import type EventEmitter from 'EventEmitter'; -import type EventHolder from 'EventHolder'; +import type EmitterSubscription from './EmitterSubscription'; +import type EventEmitter from './EventEmitter'; +import type EventHolder from './EventHolder'; /** * @class EventEmitterWithHolding diff --git a/Libraries/vendor/emitter/EventSubscription.js b/Libraries/vendor/emitter/EventSubscription.js index b226fec6b83de8..8f767e060c405b 100644 --- a/Libraries/vendor/emitter/EventSubscription.js +++ b/Libraries/vendor/emitter/EventSubscription.js @@ -10,7 +10,7 @@ 'use strict'; -import type EventSubscriptionVendor from 'EventSubscriptionVendor'; +import type EventSubscriptionVendor from './EventSubscriptionVendor'; /** * EventSubscription represents a subscription to a particular event. It can diff --git a/Libraries/vendor/emitter/EventSubscriptionVendor.js b/Libraries/vendor/emitter/EventSubscriptionVendor.js index c82d15aca5a1e9..db44c6f3ec7adb 100644 --- a/Libraries/vendor/emitter/EventSubscriptionVendor.js +++ b/Libraries/vendor/emitter/EventSubscriptionVendor.js @@ -12,7 +12,7 @@ const invariant = require('invariant'); -import type EventSubscription from 'EventSubscription'; +import type EventSubscription from './EventSubscription'; /** * EventSubscriptionVendor stores a set of EventSubscriptions that are diff --git a/Libraries/vendor/emitter/mixInEventEmitter.js b/Libraries/vendor/emitter/mixInEventEmitter.js index d7edfe1d3cc0f5..32c2c3e7fc3a45 100644 --- a/Libraries/vendor/emitter/mixInEventEmitter.js +++ b/Libraries/vendor/emitter/mixInEventEmitter.js @@ -10,14 +10,14 @@ 'use strict'; -const EventEmitter = require('EventEmitter'); -const EventEmitterWithHolding = require('EventEmitterWithHolding'); -const EventHolder = require('EventHolder'); +const EventEmitter = require('./EventEmitter'); +const EventEmitterWithHolding = require('./EventEmitterWithHolding'); +const EventHolder = require('./EventHolder'); const invariant = require('invariant'); const keyOf = require('fbjs/lib/keyOf'); -import type EmitterSubscription from 'EmitterSubscription'; +import type EmitterSubscription from './EmitterSubscription'; const TYPES_KEY = keyOf({__types: true}); @@ -120,7 +120,7 @@ const EventEmitterMixin = { if (!this.__eventEmitter) { let emitter = new EventEmitter(); if (__DEV__) { - const EventValidator = require('EventValidator'); + const EventValidator = require('./EventValidator'); emitter = EventValidator.addValidation(emitter, this.__types); }