Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for out-of-tree platform plugins #20825

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jest/__tests__/hasteImpl-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ it('returns the correct haste name for a RN library file', () => {
});

it('returns the correct haste name for a file with a platform suffix', () => {
for (const platform of ['android', 'ios', 'native', 'web', 'windows']) {
for (const platform of ['android', 'ios', 'native']) {
expect(
getHasteName(
getPath(
Expand Down
29 changes: 22 additions & 7 deletions jest/hasteImpl.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,25 @@
'use strict';

const path = require('path');
const findPlugins = require('../local-cli/core/findPlugins');

const ROOTS = [
path.resolve(__dirname, '..') + path.sep,
path.resolve(__dirname, '../../react-native-windows') + path.sep,
path.resolve(__dirname, '../../react-native-dom') + path.sep,
];
const plugins = findPlugins([path.resolve(__dirname, '../../../')]);

// Detect out-of-tree platforms and add them to the whitelists
const pluginRoots /*: Array<
string,
> */ = plugins.haste.providesModuleNodeModules.map(
name => path.resolve(__dirname, '../../', name) + path.sep,
);

const pluginNameReducers /*: Array<
[RegExp, string],
> */ = plugins.haste.platforms.map(name => [
new RegExp(`^(.*)\.(${name})$`),
'$1',
]);

const ROOTS = [path.resolve(__dirname, '..') + path.sep, ...pluginRoots];

const BLACKLISTED_PATTERNS /*: Array<RegExp> */ = [
/.*[\\\/]__(mocks|tests)__[\\\/].*/,
Expand All @@ -36,8 +49,10 @@ const NAME_REDUCERS /*: Array<[RegExp, string]> */ = [
[/^(?:.*[\\\/])?([a-zA-Z0-9$_.-]+)$/, '$1'],
// strip .js/.js.flow suffix
[/^(.*)\.js(\.flow)?$/, '$1'],
// strip .android/.ios/.native/.web suffix
[/^(.*)\.(android|ios|native|web|windows|dom)$/, '$1'],
// strip platform suffix
[/^(.*)\.(android|ios|native)$/, '$1'],
// strip plugin platform suffixes

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prettier/prettier: Insert ,

...pluginNameReducers,
];

const haste = {
Expand Down
67 changes: 49 additions & 18 deletions local-cli/core/findPlugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,36 +47,61 @@ const findPlatformsInPackage = pjson => {
return path.join(pjson.name, pjson.rnpm.platform);
};

const getEmptyPluginConfig = () => ({
commands: [],
platforms: [],
haste: {
platforms: [],
providesModuleNodeModules: [],
},
});

const findHasteConfigInPackageAndConcat = (pjson, haste) => {
if (!pjson.rnpm || !pjson.rnpm.haste) {
return;
}
let pkgHaste = pjson.rnpm.haste;

if (pkgHaste.platforms) {
haste.platforms = haste.platforms.concat(pkgHaste.platforms);
}

if (pkgHaste.providesModuleNodeModules) {
haste.providesModuleNodeModules = haste.providesModuleNodeModules.concat(
pkgHaste.providesModuleNodeModules,
);
}
};

const findPluginInFolder = folder => {
const pjson = readPackage(folder);

if (!pjson) {
return {commands: [], platforms: []};
return getEmptyPluginConfig();
}

const deps = union(
Object.keys(pjson.dependencies || {}),
Object.keys(pjson.devDependencies || {}),
);

return deps.reduce(
(acc, pkg) => {
let commands = acc.commands;
let platforms = acc.platforms;
if (isRNPMPlugin(pkg)) {
commands = commands.concat(pkg);
}
if (isReactNativePlugin(pkg)) {
const pkgJson = readPackage(path.join(folder, 'node_modules', pkg));
if (pkgJson) {
commands = commands.concat(findPluginsInReactNativePackage(pkgJson));
platforms = platforms.concat(findPlatformsInPackage(pkgJson));
}
return deps.reduce((acc, pkg) => {
let commands = acc.commands;
let platforms = acc.platforms;
let haste = acc.haste;
if (isRNPMPlugin(pkg)) {
commands = commands.concat(pkg);
}
if (isReactNativePlugin(pkg)) {
const pkgJson = readPackage(path.join(folder, 'node_modules', pkg));
if (pkgJson) {
commands = commands.concat(findPluginsInReactNativePackage(pkgJson));
platforms = platforms.concat(findPlatformsInPackage(pkgJson));
findHasteConfigInPackageAndConcat(pkgJson, haste);
}
return {commands: commands, platforms: platforms};
},
{commands: [], platforms: []},
);
}
return {commands: commands, platforms: platforms, haste: haste};
}, getEmptyPluginConfig());
};

/**
Expand All @@ -89,5 +114,11 @@ module.exports = function findPlugins(folders) {
return {
commands: uniq(flatten(plugins.map(p => p.commands))),
platforms: uniq(flatten(plugins.map(p => p.platforms))),
haste: {
platforms: uniq(flatten(plugins.map(p => p.haste.platforms))),
providesModuleNodeModules: uniq(
flatten(plugins.map(p => p.haste.providesModuleNodeModules)),
),
},
};
};
18 changes: 13 additions & 5 deletions local-cli/core/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ const defaultConfig = {
hasteImplModulePath: require.resolve('../../jest/hasteImpl'),

getPlatforms(): Array<string> {
return ['ios', 'android', 'windows', 'web', 'dom'];
return ['ios', 'android', 'native', ...plugins.haste.platforms];
},

getProvidesModuleNodeModules(): Array<string> {
return ['react-native', 'react-native-windows', 'react-native-dom'];
return ['react-native', ...plugins.haste.providesModuleNodeModules];

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prettier/prettier: Insert ⏎···

},

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prettier/prettier: Replace ·config.resolver.providesModuleNodeModules·|| with ⏎····config.resolver.providesModuleNodeModules·||⏎···

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prettier/prettier: Replace ·config.resolver.providesModuleNodeModules·|| with ⏎····config.resolver.providesModuleNodeModules·||⏎···

};

Expand Down Expand Up @@ -132,9 +132,17 @@ async function getCliConfig(): Promise<RNConfig> {
);

config.transformer.assetRegistryPath = ASSET_REGISTRY_PATH;
config.resolver.hasteImplModulePath = config.resolver.hasteImplModulePath || defaultConfig.hasteImplModulePath;
config.resolver.platforms = config.resolver.platforms || defaultConfig.getPlatforms();
config.resolver.providesModuleNodeModules = config.resolver.providesModuleNodeModules || defaultConfig.getProvidesModuleNodeModules();
config.resolver.hasteImplModulePath =
config.resolver.hasteImplModulePath || defaultConfig.hasteImplModulePath;
config.resolver.platforms = config.resolver.platforms
? config.resolver.platforms.concat(defaultConfig.getPlatforms())
: defaultConfig.getPlatforms();
config.resolver.providesModuleNodeModules = config.resolver
.providesModuleNodeModules
? config.resolver.providesModuleNodeModules.concat(
defaultConfig.getProvidesModuleNodeModules(),
)
: defaultConfig.getProvidesModuleNodeModules();

return {...defaultRNConfig, ...config};
}
Expand Down