Replace all feature flag bindings (not just specific scenarios).

Author: Robert Jackson

fixtures/inline-feature-flags/expectation.js

@@ -5,4 +5,14 @@ if (false) {
   a = () => console.log('hello');
 } else if (true) {
   a = () => console.log('bye');
+}
+
+if (!false) {
+  console.log('stuff');
+}
+
+a = false ? 'hello' : 'bye';
+
+if (false && window.foo && window.bar) {
+  console.log('wheeee');
 }

fixtures/inline-feature-flags/sample.js

@@ -6,3 +6,13 @@ if (FEATURE_A) {
 } else if (FEATURE_B) {
   a = () => console.log('bye');
 }
+
+if (!FEATURE_A) {
+  console.log('stuff');
+}
+
+a = FEATURE_A ? 'hello' : 'bye';
+
+if (FEATURE_A && window.foo && window.bar) {
+  console.log('wheeee');
+}

src/lib/utils/macros.js

@@ -52,15 +52,12 @@ export default class Macros {
     if (this.envFlags.DEBUG) { return; }
     Object.keys(featuresMap).forEach((source) => {
       Object.keys(featuresMap[source]).forEach((flag) => {
+        let flagValue = featuresMap[source][flag];
         let binding = path.scope.getBinding(flag);
-        if (binding && featuresMap[source][flag] !== null) {
-          binding.referencePaths.forEach(p => {
-            if (p.parentPath.isIfStatement() ||
-              (p.parentPath.isLogicalExpression() &&
-               p.parentPath.parentPath &&
-               p.parentPath.parentPath.isIfStatement())) {
-              p.replaceWith(builder.t.booleanLiteral(featuresMap[source][flag]))
-            }
+
+        if (binding && flagValue !== null) {
+          binding.referencePaths.forEach(referencePath => {
+            referencePath.replaceWith(builder.t.booleanLiteral(flagValue));
           });
 
           if (binding.path.parentPath.isImportDeclaration()) {