Further RNPM integration

Summary:
This commit removes `rnpm` folder that we left during initial merge to keep the diff cleaner. The `core`, `link` and `install` have now the same directory structure as any other command to make development more natural for all of us.

From most notable differences:
1) the `src` folder is now gone. The new structure should make it easier for people to work with the stuff and also move us closer to 100% rnpm integration,
2) There's also no `package.json` present in any of the `rnpm` packages, since they are no longer standalone modules,
3) There's no `bugs.url` in link.js since main package.json of React doesn't specify it. Decided to hardcode it to facebook/react-native since it's really unlikely to change. If one would prefer to use pkg.bugs.url as before, a separate PR modifying package.json should be sent.
Closes https://github.com/facebook/react-native/pull/9509

Differential Revision: D3751115

fbshipit-source-id: 74ae8330f7634df0887ad676808f47eee4b8de85
This commit is contained in:
Mike Grabowski
2016-08-22 08:56:14 -07:00
committed by Facebook Github Bot 3
parent 25f2a26ce9
commit 0af640bfae
134 changed files with 101 additions and 226 deletions

View File

@@ -0,0 +1,28 @@
/**
* Copyright (c) 2013-present, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*/
'use strict';
jest.autoMockOff();
const applyParams = require('../../android/patches/applyParams');
describe('applyParams', () => {
it('apply params to the string', () => {
expect(
applyParams('${foo}', {foo: 'foo'}, 'react-native')
).toEqual('getResources().getString(R.string.reactNative_foo)');
});
it('use null if no params provided', () => {
expect(
applyParams('${foo}', {}, 'react-native')
).toEqual('null');
});
});

View File

@@ -0,0 +1,20 @@
'use strict';
jest.autoMockOff();
const path = require('path');
const isInstalled = require('../../android/isInstalled');
const projectConfig = {
buildGradlePath: path.join(__dirname, '../../__fixtures__/android/patchedBuild.gradle'),
};
describe('android::isInstalled', () => {
it('should return true when project is already in build.gradle', () =>
expect(isInstalled(projectConfig, 'test')).toBeTruthy()
);
it('should return false when project is not in build.gradle', () =>
expect(isInstalled(projectConfig, 'test2')).toBeFalsy()
);
});

View File

@@ -0,0 +1,18 @@
'use strict';
jest.autoMockOff();
const makeBuildPatch = require('../../android/patches/makeBuildPatch');
const name = 'test';
describe('makeBuildPatch', () => {
it('should build a patch function', () => {
expect(Object.prototype.toString(makeBuildPatch(name)))
.toBe('[object Object]');
});
it('should make a correct patch', () => {
const {patch} = makeBuildPatch(name);
expect(patch).toBe(` compile project(':${name}')\n`);
});
});

View File

@@ -0,0 +1,20 @@
'use strict';
jest.autoMockOff();
const makeImportPatch = require('../../android/patches/makeImportPatch');
const packageImportPath = 'import some.example.project';
describe('makeImportPatch', () => {
it('should build a patch', () => {
expect(Object.prototype.toString(makeImportPatch(packageImportPath)))
.toBe('[object Object]');
});
it('MainActivity contains a correct import patch', () => {
const {patch} = makeImportPatch(packageImportPath);
expect(patch).toBe('\n' + packageImportPath);
});
});

View File

@@ -0,0 +1,28 @@
'use strict';
jest.autoMockOff();
const makePackagePatch = require('../../android/patches/makePackagePatch');
const applyParams = require('../../android/patches/applyParams');
const packageInstance = 'new SomeLibrary(${foo}, ${bar}, \'something\')';
const name = 'some-library';
const params = {
foo: 'foo',
bar: 'bar',
};
describe('makePackagePatch@0.20', () => {
it('should build a patch', () => {
const packagePatch = makePackagePatch(packageInstance, params, name);
expect(Object.prototype.toString(packagePatch))
.toBe('[object Object]');
});
it('MainActivity contains a correct 0.20 import patch', () => {
const {patch} = makePackagePatch(packageInstance, params, name);
const processedInstance = applyParams(packageInstance, params, name);
expect(patch).toBe(',\n ' + processedInstance);
});
});

View File

@@ -0,0 +1,39 @@
'use strict';
jest.autoMockOff();
const path = require('path');
const makeSettingsPatch = require('../../android/patches/makeSettingsPatch');
const name = 'test';
const projectConfig = {
sourceDir: '/home/project/android/app',
settingsGradlePath: '/home/project/android/settings.gradle',
};
const dependencyConfig = {
sourceDir: `/home/project/node_modules/${name}/android`,
};
describe('makeSettingsPatch', () => {
it('should build a patch function', () => {
expect(Object.prototype.toString(
makeSettingsPatch(name, dependencyConfig, projectConfig)
)).toBe('[object Object]');
});
it('should make a correct patch', () => {
const projectDir = path.relative(
path.dirname(projectConfig.settingsGradlePath),
dependencyConfig.sourceDir
);
const {patch} = makeSettingsPatch(name, dependencyConfig, projectConfig);
expect(patch)
.toBe(
`include ':${name}'\n` +
`project(':${name}').projectDir = ` +
`new File(rootProject.projectDir, '${projectDir}')\n`
);
});
});