Merge pull request #17283 from rwjblue/add-feature-flagging-for-array

[BUGFIX beta] [FEATURE EMBER_GLIMMER_ARRAY_HELPER] Add feature flagging.
emberjs · Dec 7, 2018 · 5f66d54 · 5f66d54
2 parents 8f7da77 + df90713
commit 5f66d54
Show file tree

Hide file tree

Showing 3 changed files with 186 additions and 177 deletions.
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -3,6 +3,7 @@ import { ENV } from '@ember/-internals/environment';
 import { LookupOptions, Owner, setOwner } from '@ember/-internals/owner';
 import { lookupComponent, lookupPartial, OwnedTemplateMeta } from '@ember/-internals/views';
 import {
+  EMBER_GLIMMER_ARRAY_HELPER,
   EMBER_MODULE_UNIFICATION,
   GLIMMER_CUSTOM_COMPONENT_MANAGER,
   GLIMMER_MODIFIER_MANAGER,
@@ -66,7 +67,6 @@ const BUILTINS_HELPERS = {
   concat,
   get,
   hash,
-  array,
   log,
   mut,
   'query-params': queryParams,
@@ -84,6 +84,10 @@ const BUILTINS_HELPERS = {
   '-assert-implicit-component-helper-argument': componentAssertionHelper,
 };
 
+if (EMBER_GLIMMER_ARRAY_HELPER) {
+  BUILTINS_HELPERS['array'] = array;
+}
+
 const BUILTIN_MODIFIERS = {
   action: { manager: new ActionModifierManager(), state: null },
 };