status-im
/
metro
mirror of https://github.com/status-im/metro.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add default option for Platform.select 

Summary:
satya164 asked me to take over fixes for [this PR](https://github.com/facebook/react-native/pull/11608), so here we go!
Closes https://github.com/facebook/react-native/pull/12218

Differential Revision: D4515285

Pulled By: davidaurelio

fbshipit-source-id: 8987c518401fc67093dfe93bbbb63b934c20f6f9
This commit is contained in:
Alexey Kureev 2017-02-07 04:26:45 -08:00 committed by Facebook Github Bot
parent 23d2a66cb1
commit a317b9da6c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/metro-bundler/src/JSTransformer/worker/__tests__/inline-test.js
View File

@ -150,6 +150,15 @@ describe('inline constants', () => {
expect(toString(ast)).toEqual(normalize(code.replace(/Platform\.select[^;]+/, '1'))); expect(toString(ast)).toEqual(normalize(code.replace(/Platform\.select[^;]+/, '1')));
}); });
it('inlines Platform.select in the code if Platform is a global and the argument doesn\'t have target platform in it\'s keys', () => {
const code = `function a() {
var a = Platform.select({ios: 1, default: 2});
var b = a.Platform.select({ios: 1, default: 2});
}`;
const {ast} = inline('arbitrary.js', {code}, {platform: 'android'});
expect(toString(ast)).toEqual(normalize(code.replace(/Platform\.select[^;]+/, '2')));
});
it('replaces Platform.select in the code if Platform is a top level import', () => { it('replaces Platform.select in the code if Platform is a top level import', () => {
const code = ` const code = `
var Platform = require('Platform'); var Platform = require('Platform');

8
packages/metro-bundler/src/JSTransformer/worker/inline.js
View File

@ -96,9 +96,9 @@ const isDev = (node, parent, scope) =>
isGlobal(scope.getBinding(dev.name)) && isGlobal(scope.getBinding(dev.name)) &&
!(t.isMemberExpression(parent)); !(t.isMemberExpression(parent));
function findProperty(objectExpression, key) { function findProperty(objectExpression, key, fallback) {
const property = objectExpression.properties.find(p => p.key.name === key); const property = objectExpression.properties.find(p => p.key.name === key);
return property ? property.value : t.identifier('undefined'); return property ? property.value : fallback();
} }
const inlinePlugin = { const inlinePlugin = {
@ -133,8 +133,10 @@ const inlinePlugin = {
isPlatformSelect(node, scope, opts.isWrapped) || isPlatformSelect(node, scope, opts.isWrapped) ||
isReactPlatformSelect(node, scope, opts.isWrapped) isReactPlatformSelect(node, scope, opts.isWrapped)
) { ) {
const fallback = () =>
findProperty(arg, 'default', () => t.identifier('undefined'));
const replacement = t.isObjectExpression(arg) const replacement = t.isObjectExpression(arg)
? findProperty(arg, opts.platform) ? findProperty(arg, opts.platform, fallback)
: node; : node;
path.replaceWith(replacement); path.replaceWith(replacement);