Skip to content

Commit 346417c

Browse files
idefacebook-github-bot
authored andcommitted
Migrate vendored code from Haste to path-based imports (#24807)
Summary: 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. Closes #24769. [General] [Changed] - Migrate vendored code from Haste to path-based imports Pull Request resolved: #24807 Differential Revision: D15316831 Pulled By: cpojer fbshipit-source-id: 19475823ce9f506600bd09b001156e306bff4db8
1 parent f0770b6 commit 346417c

11 files changed

+24
-24
lines changed

Libraries/vendor/core/Map.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
'use strict';
1515

16-
const _shouldPolyfillES6Collection = require('_shouldPolyfillES6Collection');
17-
const guid = require('guid');
18-
const toIterator = require('toIterator');
16+
const _shouldPolyfillES6Collection = require('./_shouldPolyfillES6Collection');
17+
const guid = require('./guid');
18+
const toIterator = require('./toIterator');
1919

2020
module.exports = (function(global, undefined) {
2121
// Since our implementation is spec-compliant for the most part we can safely

Libraries/vendor/core/Set.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
'use strict';
1515

16-
const Map = require('Map');
16+
const Map = require('./Map');
1717

18-
const _shouldPolyfillES6Collection = require('_shouldPolyfillES6Collection');
19-
const toIterator = require('toIterator');
18+
const _shouldPolyfillES6Collection = require('./_shouldPolyfillES6Collection');
19+
const toIterator = require('./toIterator');
2020

2121
module.exports = (function(global) {
2222
// Since our implementation is spec-compliant for the most part we can safely

Libraries/vendor/core/merge.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
"use strict";
99

10-
const mergeInto = require('mergeInto');
10+
const mergeInto = require('./mergeInto');
1111

1212
/**
1313
* Shallow merges two structures into a return value, without mutating either.

Libraries/vendor/core/mergeInto.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
"use strict";
99

10-
var mergeHelpers = require('mergeHelpers');
10+
var mergeHelpers = require('./mergeHelpers');
1111

1212
var checkMergeObjectArg = mergeHelpers.checkMergeObjectArg;
1313
var checkMergeIntoObjectArg = mergeHelpers.checkMergeIntoObjectArg;

Libraries/vendor/document/selection/DocumentSelectionState.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
const mixInEventEmitter = require('mixInEventEmitter');
13+
const mixInEventEmitter = require('../../emitter/mixInEventEmitter');
1414

1515
/**
1616
* DocumentSelectionState is responsible for maintaining selection information

Libraries/vendor/emitter/EmitterSubscription.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
'use strict';
1212

13-
const EventSubscription = require('EventSubscription');
13+
const EventSubscription = require('./EventSubscription');
1414

15-
import type EventEmitter from 'EventEmitter';
16-
import type EventSubscriptionVendor from 'EventSubscriptionVendor';
15+
import type EventEmitter from './EventEmitter';
16+
import type EventSubscriptionVendor from './EventSubscriptionVendor';
1717

1818
/**
1919
* EmitterSubscription represents a subscription with listener and context data.

Libraries/vendor/emitter/EventEmitter.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
'use strict';
1313

14-
const EmitterSubscription = require('EmitterSubscription');
15-
const EventSubscriptionVendor = require('EventSubscriptionVendor');
14+
const EmitterSubscription = require('./EmitterSubscription');
15+
const EventSubscriptionVendor = require('./EventSubscriptionVendor');
1616

1717
const invariant = require('invariant');
1818

Libraries/vendor/emitter/EventEmitterWithHolding.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
'use strict';
1212

13-
import type EmitterSubscription from 'EmitterSubscription';
14-
import type EventEmitter from 'EventEmitter';
15-
import type EventHolder from 'EventHolder';
13+
import type EmitterSubscription from './EmitterSubscription';
14+
import type EventEmitter from './EventEmitter';
15+
import type EventHolder from './EventHolder';
1616

1717
/**
1818
* @class EventEmitterWithHolding

Libraries/vendor/emitter/EventSubscription.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
import type EventSubscriptionVendor from 'EventSubscriptionVendor';
13+
import type EventSubscriptionVendor from './EventSubscriptionVendor';
1414

1515
/**
1616
* EventSubscription represents a subscription to a particular event. It can

Libraries/vendor/emitter/EventSubscriptionVendor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
const invariant = require('invariant');
1414

15-
import type EventSubscription from 'EventSubscription';
15+
import type EventSubscription from './EventSubscription';
1616

1717
/**
1818
* EventSubscriptionVendor stores a set of EventSubscriptions that are

Libraries/vendor/emitter/mixInEventEmitter.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
'use strict';
1212

13-
const EventEmitter = require('EventEmitter');
14-
const EventEmitterWithHolding = require('EventEmitterWithHolding');
15-
const EventHolder = require('EventHolder');
13+
const EventEmitter = require('./EventEmitter');
14+
const EventEmitterWithHolding = require('./EventEmitterWithHolding');
15+
const EventHolder = require('./EventHolder');
1616

1717
const invariant = require('invariant');
1818
const keyOf = require('fbjs/lib/keyOf');
1919

20-
import type EmitterSubscription from 'EmitterSubscription';
20+
import type EmitterSubscription from './EmitterSubscription';
2121

2222
const TYPES_KEY = keyOf({__types: true});
2323

@@ -120,7 +120,7 @@ const EventEmitterMixin = {
120120
if (!this.__eventEmitter) {
121121
let emitter = new EventEmitter();
122122
if (__DEV__) {
123-
const EventValidator = require('EventValidator');
123+
const EventValidator = require('./EventValidator');
124124
emitter = EventValidator.addValidation(emitter, this.__types);
125125
}
126126

0 commit comments

Comments
 (0)