Skip to content

Commit a2c84d1

Browse files
cpojerfacebook-github-bot
authored andcommitted
Remove react-packager indirection.
Summary: This moves the `src` directory one level up and removes the `react-packager` folder. Personally, I always disliked this indirection. I'm reorganizing some things in RNP, so this seems to make sense. Not sure if I forgot to update any paths. Can anyone advice if there are more places that need change? Reviewed By: jeanlauliac Differential Revision: D4487867 fbshipit-source-id: d63f9c79d6238300df9632d2e6a4e6a4196d5ccb
1 parent 0ecc404 commit a2c84d1

File tree

156 files changed

+122
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+122
-82
lines changed

Libraries/Image/RelativeImageStub.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'use strict';
1313

1414
// This is a stub for flow to make it understand require('./icon.png')
15-
// See packager/react-packager/src/Bundler/index.js
15+
// See packager/src/Bundler/index.js
1616

1717
var AssetRegistry = require('AssetRegistry');
1818

jest/preprocessor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const path = require('path');
1515

1616
const nodeFiles = RegExp([
1717
'/local-cli/',
18-
'/packager/(?!react-packager/src/Resolver/polyfills/)',
18+
'/packager/(?!src/Resolver/polyfills/)',
1919
].join('|'));
2020
const nodeOptions = babelRegisterOnly.config([nodeFiles]);
2121

jest/setup.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
const mockComponent = require.requireActual('./mockComponent');
1212

13-
require.requireActual('../packager/react-packager/src/Resolver/polyfills/babelHelpers.js');
14-
require.requireActual('../packager/react-packager/src/Resolver/polyfills/Object.es7.js');
15-
require.requireActual('../packager/react-packager/src/Resolver/polyfills/error-guard');
13+
require.requireActual('../packager/src/Resolver/polyfills/babelHelpers.js');
14+
require.requireActual('../packager/src/Resolver/polyfills/Object.es7.js');
15+
require.requireActual('../packager/src/Resolver/polyfills/error-guard');
1616

1717
global.__DEV__ = true;
1818

local-cli/bundle/buildBundle.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
'use strict';
1313

1414
const log = require('../util/log').out('bundle');
15-
const Server = require('../../packager/react-packager/src/Server');
16-
const TerminalReporter = require('../../packager/react-packager/src/lib/TerminalReporter');
15+
const Server = require('../../packager/src/Server');
16+
const TerminalReporter = require('../../packager/src/lib/TerminalReporter');
1717

1818
const outputBundle = require('./output/bundle');
1919
const path = require('path');

local-cli/bundle/output/bundle.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
'use strict';
1212

1313
const meta = require('./meta');
14-
const relativizeSourceMap = require('../../../packager/react-packager/src/lib/relativizeSourceMap');
14+
const relativizeSourceMap = require('../../../packager/src//lib/relativizeSourceMap');
1515
const writeFile = require('./writeFile');
1616

17-
import type Bundle from '../../../packager/react-packager/src/Bundler/Bundle';
18-
import type Server from '../../../packager/react-packager/src/Server';
17+
import type Bundle from '../../../packager/src//Bundler/Bundle';
18+
import type Server from '../../../packager/src//Server';
1919
import type {OutputOptions, RequestOptions} from '../types.flow';
2020

2121
function buildBundle(packagerClient: Server, requestOptions: RequestOptions) {

local-cli/bundle/output/unbundle/as-assets.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ const MAGIC_UNBUNDLE_NUMBER = require('./magic-number');
1515
const buildSourceMapWithMetaData = require('./build-unbundle-sourcemap-with-metadata');
1616
const mkdirp = require('mkdirp');
1717
const path = require('path');
18-
const relativizeSourceMap = require('../../../../packager/react-packager/src/lib/relativizeSourceMap');
18+
const relativizeSourceMap = require('../../../../packager/src//lib/relativizeSourceMap');
1919
const writeFile = require('../writeFile');
2020
const writeSourceMap = require('./write-sourcemap');
2121

2222
const {joinModules} = require('./util');
2323

24-
import type Bundle from '../../../../packager/react-packager/src/Bundler/Bundle';
24+
import type Bundle from '../../../../packager/src//Bundler/Bundle';
2525
import type {OutputOptions} from '../../types.flow';
2626

2727
// must not start with a dot, as that won't go into the apk

local-cli/bundle/output/unbundle/as-indexed-file.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ const MAGIC_UNBUNDLE_FILE_HEADER = require('./magic-number');
1414

1515
const buildSourceMapWithMetaData = require('./build-unbundle-sourcemap-with-metadata');
1616
const fs = require('fs');
17-
const relativizeSourceMap = require('../../../../packager/react-packager/src/lib/relativizeSourceMap');
17+
const relativizeSourceMap = require('../../../../packager/src//lib/relativizeSourceMap');
1818
const writeSourceMap = require('./write-sourcemap');
1919

2020
const {joinModules} = require('./util');
2121

22-
import type ModuleTransport from '../../../../packager/react-packager/src/lib/ModuleTransport';
22+
import type ModuleTransport from '../../../../packager/src//lib/ModuleTransport';
2323
import type {Bundle, ModuleGroups, OutputOptions} from '../../types.flow';
2424

2525
const SIZEOF_UINT32 = 4;

local-cli/bundle/output/unbundle/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
const asAssets = require('./as-assets');
1414
const asIndexedFile = require('./as-indexed-file');
1515

16-
import type Bundle from '../../../../packager/react-packager/src/Bundler/Bundle';
17-
import type Server from '../../../../packager/react-packager/src/Server';
16+
import type Bundle from '../../../../packager/src//Bundler/Bundle';
17+
import type Server from '../../../../packager/src//Server';
1818
import type {OutputOptions, RequestOptions} from '../../types.flow';
1919

2020
function buildBundle(packagerClient: Server, requestOptions: RequestOptions) {

local-cli/bundle/types.flow.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
*/
1111
'use strict';
1212

13-
import type Bundle from '../../packager/react-packager/src/Bundler/Bundle';
14-
import type {Unbundle} from '../../packager/react-packager/src/Bundler/Bundle';
15-
import type ModuleTransport from '../../packager/react-packager/src/lib/ModuleTransport';
16-
import type {MixedSourceMap} from '../../packager/react-packager/src/lib/SourceMap';
13+
import type Bundle from '../../packager/src/Bundler/Bundle';
14+
import type {Unbundle} from '../../packager/src/Bundler/Bundle';
15+
import type ModuleTransport from '../../packager/src/lib/ModuleTransport';
16+
import type {MixedSourceMap} from '../../packager/src/lib/SourceMap';
1717

1818
export type {Bundle, ModuleTransport, MixedSourceMap as SourceMap, Unbundle};
1919

local-cli/core/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const Config = require('../util/Config');
1515
const defaultConfig = require('./default.config');
1616
const minimist = require('minimist');
1717

18-
import type {GetTransformOptions} from '../../packager/react-packager/src/Bundler';
18+
import type {GetTransformOptions} from '../../packager/src/Bundler';
1919
import type {CommandT} from '../commands';
2020

2121
/**

0 commit comments

Comments
 (0)