status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-05 06:04:15 +00:00
Code Issues Projects Releases Wiki Activity

Allow flow-declared variables when inlining

Browse Source 
Summary: The logic of the `inline` babel transform regarded identifiers as global if no binding exists for them. We extend that logic to also accept flow-declared variables.

Reviewed By: arcanis

Differential Revision: D4737620

fbshipit-source-id: e71cfdf77c7b7751265cfa4412430b4f29e9e853
This commit is contained in:
David Aurelio 2017-03-20 07:57:58 -07:00 committed by Facebook Github Bot
parent 2f92ee8a9c
commit 68c77395b1
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/package.json
View File

@ -1,5 +1,5 @@
{
"version": "0.5.0",
"version": "0.5.1",
"name": "react-native-packager",
"description": "Build native apps with React!",
"repository": {

28
packager/src/JSTransformer/worker/__tests__/inline-test.js
View File

@ -306,4 +306,32 @@ describe('inline constants', () => {
expect(toString(ast)).toEqual(
normalize(code.replace(/require\([^)]+\)\.Platform\.OS/, '"android"')));
});
it('works with flow-declared variables', () => {
const stripFlow = require('babel-plugin-transform-flow-strip-types');
const code = `declare var __DEV__;
const a: boolean = __DEV__;`;
const transformed = transform(
code,
{...babelOptions, plugins: [stripFlow, [inline.plugin, {dev: false}]]},
).code;
expect(transformed).toEqual('const a=false;');
});
it('works with flow-declared variables in wrapped modules', () => {
const stripFlow = require('babel-plugin-transform-flow-strip-types');
const code = `__d(() => {
declare var __DEV__;
const a: boolean = __DEV__;
});`;
const transformed = transform(
code,
{...babelOptions, plugins: [stripFlow, [inline.plugin, {dev: true}]]},
).code;
expect(transformed).toEqual('__d(()=>{const a=true;});');
});
});

8
packager/src/JSTransformer/worker/inline.js
View File

@ -34,6 +34,12 @@ const importMap = new Map([['ReactNative', 'react-native']]);
const isGlobal = binding => !binding;
const isFlowDeclared = binding =>
t.isDeclareVariable(binding.path);
const isGlobalOrFlowDeclared = binding =>
isGlobal(binding) || isFlowDeclared(binding);
const isToplevelBinding = (binding, isWrappedModule) =>
isGlobal(binding) ||
!binding.scope.parent ||
@ -93,7 +99,7 @@ const isReactPlatformSelect = (node, scope, isWrappedModule) =>
const isDev = (node, parent, scope) =>
t.isIdentifier(node, dev) &&
isGlobal(scope.getBinding(dev.name)) &&
isGlobalOrFlowDeclared(scope.getBinding(dev.name)) &&
!(t.isMemberExpression(parent));
function findProperty(objectExpression, key, fallback) {