ember-source 4.0.0-beta.3 → 4.0.0-beta.7

package/dist/ember-template-compiler.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   4.0.0-beta.3
+ * @version   4.0.0-beta.7
  */
 
 /* eslint-disable no-var */
@@ -2539,25 +2539,6 @@ define("@glimmer/compiler", ["exports", "@glimmer/syntax", "@glimmer/util"], fun
 
   }
 
-  var __classPrivateFieldSet = undefined && undefined.__classPrivateFieldSet || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to set private field on non-instance");
-    }
-
-    privateMap.set(receiver, value);
-    return value;
-  };
-
-  var __classPrivateFieldGet = undefined && undefined.__classPrivateFieldGet || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to get private field on non-instance");
-    }
-
-    return privateMap.get(receiver);
-  };
-
-  var _keywords, _type;
-
   class KeywordImpl {
     constructor(keyword, type, delegate) {
       this.keyword = keyword;
@@ -2646,21 +2627,18 @@ define("@glimmer/compiler", ["exports", "@glimmer/syntax", "@glimmer/util"], fun
 
   class Keywords {
     constructor(type) {
-      _keywords.set(this, []);
-
-      _type.set(this, void 0);
-
-      __classPrivateFieldSet(this, _type, type);
+      this._keywords = [];
+      this._type = type;
     }
 
     kw(name, delegate) {
-      __classPrivateFieldGet(this, _keywords).push(keyword(name, __classPrivateFieldGet(this, _type), delegate));
+      this._keywords.push(keyword(name, this._type, delegate));
 
       return this;
     }
 
     translate(node$$1, state) {
-      for (var _keyword of __classPrivateFieldGet(this, _keywords)) {
+      for (var _keyword of this._keywords) {
         var result = _keyword.translate(node$$1, state);
 
         if (result !== null) {
@@ -2674,9 +2652,7 @@ define("@glimmer/compiler", ["exports", "@glimmer/syntax", "@glimmer/util"], fun
         var {
           name
         } = path.ref;
-
-        var usedType = __classPrivateFieldGet(this, _type);
-
+        var usedType = this._type;
         var validTypes = _syntax.KEYWORDS_TYPES[name];
 
         if (validTypes.indexOf(usedType) === -1) {
@@ -2689,7 +2665,6 @@ define("@glimmer/compiler", ["exports", "@glimmer/syntax", "@glimmer/util"], fun
 
   }
 
-  _keywords = new WeakMap(), _type = new WeakMap();
   var typesToReadableName = {
     Append: 'an append statement',
     Block: 'a block statement',
@@ -4272,66 +4247,37 @@ define("@glimmer/compiler", ["exports", "@glimmer/syntax", "@glimmer/util"], fun
   }
 
   var VISIT_STMTS = new NormalizationStatements();
-
-  var __classPrivateFieldSet$1 = undefined && undefined.__classPrivateFieldSet || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to set private field on non-instance");
-    }
-
-    privateMap.set(receiver, value);
-    return value;
-  };
-
-  var __classPrivateFieldGet$1 = undefined && undefined.__classPrivateFieldGet || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to get private field on non-instance");
-    }
-
-    return privateMap.get(receiver);
-  };
-
-  var _currentScope, _cursorCount;
   /**
    * This is the mutable state for this compiler pass.
    */
 
-
   class NormalizationState {
     constructor(block, isStrict) {
       this.isStrict = isStrict;
-
-      _currentScope.set(this, void 0);
-
-      _cursorCount.set(this, 0);
-
-      __classPrivateFieldSet$1(this, _currentScope, block);
+      this._cursorCount = 0;
+      this._currentScope = block;
     }
 
     generateUniqueCursor() {
-      var _a;
-
-      return "%cursor:" + (__classPrivateFieldSet$1(this, _cursorCount, (_a = +__classPrivateFieldGet$1(this, _cursorCount)) + 1), _a) + "%";
+      return "%cursor:" + this._cursorCount++ + "%";
     }
 
     get scope() {
-      return __classPrivateFieldGet$1(this, _currentScope);
+      return this._currentScope;
     }
 
     visitBlock(block) {
-      var oldBlock = __classPrivateFieldGet$1(this, _currentScope);
-
-      __classPrivateFieldSet$1(this, _currentScope, block.scope);
+      var oldBlock = this._currentScope;
+      this._currentScope = block.scope;
 
       try {
         return VISIT_STMTS.visitList(block.body, this);
       } finally {
-        __classPrivateFieldSet$1(this, _currentScope, oldBlock);
+        this._currentScope = oldBlock;
       }
     }
 
   }
-
-  _currentScope = new WeakMap(), _cursorCount = new WeakMap();
   /**
    * Normalize the AST from @glimmer/syntax into the HIR. The HIR has special
    * instructions for keywords like `{{yield}}`, `(has-block)` and
@@ -4371,6 +4317,7 @@ define("@glimmer/compiler", ["exports", "@glimmer/syntax", "@glimmer/util"], fun
    * ```
    */
 
+
   function normalize$1(source, root, isStrict) {
     // create a new context for the normalization pass
     var state = new NormalizationState(root.table, isStrict);
@@ -5446,18 +5393,16 @@ define("@glimmer/compiler", ["exports", "@glimmer/syntax", "@glimmer/util"], fun
       isStrictMode: (_b = options.strictMode) !== null && _b !== void 0 ? _b : false
     };
 
-    if (!options.strictMode) {
+    if (usedLocals.length === 0) {
       delete templateJSONObject.scope;
     } // JSON is javascript
 
 
     var stringified = JSON.stringify(templateJSONObject);
 
-    if (options.strictMode && usedLocals.length > 0) {
+    if (usedLocals.length > 0) {
       var scopeFn = "()=>[" + usedLocals.join(',') + "]";
       stringified = stringified.replace("\"" + SCOPE_PLACEHOLDER + "\"", scopeFn);
-    } else {
-      stringified = stringified.replace("\"" + SCOPE_PLACEHOLDER + "\"", 'null');
     }
 
     return stringified;
@@ -7084,27 +7029,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     }
 
   }
-
-  _exports.SourceSlice = SourceSlice;
-
-  var __classPrivateFieldSet = undefined && undefined.__classPrivateFieldSet || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to set private field on non-instance");
-    }
-
-    privateMap.set(receiver, value);
-    return value;
-  };
-
-  var __classPrivateFieldGet = undefined && undefined.__classPrivateFieldGet || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to get private field on non-instance");
-    }
-
-    return privateMap.get(receiver);
-  };
-
-  var _whens, _map, _whens_1;
   /**
    * This file implements the DSL used by span and offset in places where they need to exhaustively
    * consider all combinations of states (Handlebars offsets, character offsets and invisible/broken
@@ -7115,18 +7039,17 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
    */
 
 
+  _exports.SourceSlice = SourceSlice;
   var MatchAny = 'MATCH_ANY';
   var IsInvisible = 'IS_INVISIBLE';
 
   class WhenList {
     constructor(whens) {
-      _whens.set(this, void 0);
-
-      __classPrivateFieldSet(this, _whens, whens);
+      this._whens = whens;
     }
 
     first(kind) {
-      for (var when of __classPrivateFieldGet(this, _whens)) {
+      for (var when of this._whens) {
         var value = when.match(kind);
 
         if ((0, _util.isPresent)(value)) {
@@ -7139,15 +7062,13 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
   }
 
-  _whens = new WeakMap();
-
   class When {
     constructor() {
-      _map.set(this, new Map());
+      this._map = new Map();
     }
 
     get(pattern, or) {
-      var value = __classPrivateFieldGet(this, _map).get(pattern);
+      var value = this._map.get(pattern);
 
       if (value) {
         return value;
@@ -7155,22 +7076,22 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
       value = or();
 
-      __classPrivateFieldGet(this, _map).set(pattern, value);
+      this._map.set(pattern, value);
 
       return value;
     }
 
     add(pattern, out) {
-      __classPrivateFieldGet(this, _map).set(pattern, out);
+      this._map.set(pattern, out);
     }
 
     match(kind) {
       var pattern = patternFor(kind);
       var out = [];
 
-      var exact = __classPrivateFieldGet(this, _map).get(pattern);
+      var exact = this._map.get(pattern);
 
-      var fallback = __classPrivateFieldGet(this, _map).get(MatchAny);
+      var fallback = this._map.get(MatchAny);
 
       if (exact) {
         out.push(exact);
@@ -7185,15 +7106,13 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
   }
 
-  _map = new WeakMap();
-
   function match(callback) {
     return callback(new Matcher()).check();
   }
 
   class Matcher {
     constructor() {
-      _whens_1.set(this, new When());
+      this._whens = new When();
     }
     /**
      * You didn't exhaustively match all possibilities.
@@ -7205,7 +7124,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     }
 
     matchFor(left, right) {
-      var nesteds = __classPrivateFieldGet(this, _whens_1).match(left);
+      var nesteds = this._whens.match(left);
 
       var callback = new WhenList(nesteds).first(right);
       return callback;
@@ -7213,15 +7132,13 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
     when(left, right, // eslint-disable-next-line @typescript-eslint/no-explicit-any
     callback) {
-      __classPrivateFieldGet(this, _whens_1).get(left, () => new When()).add(right, callback);
+      this._whens.get(left, () => new When()).add(right, callback);
 
       return this;
     }
 
   }
 
-  _whens_1 = new WeakMap();
-
   function patternFor(kind) {
     switch (kind) {
       case "Broken"
@@ -7238,26 +7155,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       default:
         return kind;
     }
-  }
-
-  var __classPrivateFieldGet$1 = undefined && undefined.__classPrivateFieldGet || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to get private field on non-instance");
-    }
-
-    return privateMap.get(receiver);
-  };
-
-  var __classPrivateFieldSet$1 = undefined && undefined.__classPrivateFieldSet || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to set private field on non-instance");
-    }
-
-    privateMap.set(receiver, value);
-    return value;
-  };
-
-  var _locPos, _charPos; // eslint-disable-next-line import/no-extraneous-dependencies
+  } // eslint-disable-next-line import/no-extraneous-dependencies
 
   /**
    * Used to indicate that an attempt to convert a `SourcePosition` to a character offset failed. It
@@ -7392,7 +7290,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       ;
       /** Computed from char offset */
 
-      _locPos.set(this, null);
+      this._locPos = null;
     }
     /**
      * This is already a `CharPosition`.
@@ -7439,15 +7337,15 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
 
     toHbsPos() {
-      var locPos = __classPrivateFieldGet$1(this, _locPos);
+      var locPos = this._locPos;
 
       if (locPos === null) {
         var hbsPos = this.source.hbsPosFor(this.charPos);
 
         if (hbsPos === null) {
-          __classPrivateFieldSet$1(this, _locPos, locPos = BROKEN);
+          this._locPos = locPos = BROKEN;
         } else {
-          __classPrivateFieldSet$1(this, _locPos, locPos = new HbsPosition(this.source, hbsPos, this.charPos));
+          this._locPos = locPos = new HbsPosition(this.source, hbsPos, this.charPos);
         }
       }
 
@@ -7456,8 +7354,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
   }
 
-  _locPos = new WeakMap();
-
   class HbsPosition {
     constructor(source, hbsPos, charPos = null) {
       this.source = source;
@@ -7465,10 +7361,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       this.kind = "HbsPosition"
       /* HbsPosition */
       ;
-
-      _charPos.set(this, void 0);
-
-      __classPrivateFieldSet$1(this, _charPos, charPos === null ? null : new CharPosition(source, charPos));
+      this._charPos = charPos === null ? null : new CharPosition(source, charPos);
     }
     /**
      * Lazily compute the character offset from the {@see SourcePosition}. Once an `HbsPosition` has
@@ -7481,15 +7374,15 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
 
     toCharPos() {
-      var charPos = __classPrivateFieldGet$1(this, _charPos);
+      var charPos = this._charPos;
 
       if (charPos === null) {
         var charPosNumber = this.source.charPosFor(this.hbsPos);
 
         if (charPosNumber === null) {
-          __classPrivateFieldSet$1(this, _charPos, charPos = BROKEN);
+          this._charPos = charPos = BROKEN;
         } else {
-          __classPrivateFieldSet$1(this, _charPos, charPos = new CharPosition(this.source, charPosNumber));
+          this._charPos = charPos = new CharPosition(this.source, charPosNumber);
         }
       }
 
@@ -7523,8 +7416,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
   }
 
-  _charPos = new WeakMap();
-
   class InvisiblePosition {
     constructor(kind, // whatever was provided, possibly broken
     pos) {
@@ -7604,26 +7495,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     var _a;
 
     return ((_a = left.toCharPos()) === null || _a === void 0 ? void 0 : _a.offset) === right;
-  }).when(MatchAny, MatchAny, () => false));
-
-  var __classPrivateFieldGet$2 = undefined && undefined.__classPrivateFieldGet || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to get private field on non-instance");
-    }
-
-    return privateMap.get(receiver);
-  };
-
-  var __classPrivateFieldSet$2 = undefined && undefined.__classPrivateFieldSet || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to set private field on non-instance");
-    }
-
-    privateMap.set(receiver, value);
-    return value;
-  };
-
-  var _locPosSpan, _charPosSpan, _providedHbsLoc; // eslint-disable-next-line import/no-extraneous-dependencies
+  }).when(MatchAny, MatchAny, () => false)); // eslint-disable-next-line import/no-extraneous-dependencies
 
   /**
    * A `SourceSpan` object represents a span of characters inside of a template source.
@@ -7660,7 +7532,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
    * The goal is to avoid creating any problems for use-cases like AST Explorer.
    */
 
-
   class SourceSpan {
     constructor(data) {
       this.data = data;
@@ -7916,8 +7787,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       this.kind = "CharPosition"
       /* CharPosition */
       ;
-
-      _locPosSpan.set(this, null);
+      this._locPosSpan = null;
     }
 
     wrap() {
@@ -7943,19 +7813,19 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     locDidUpdate() {}
 
     toHbsSpan() {
-      var locPosSpan = __classPrivateFieldGet$2(this, _locPosSpan);
+      var locPosSpan = this._locPosSpan;
 
       if (locPosSpan === null) {
         var start = this.charPositions.start.toHbsPos();
         var end = this.charPositions.end.toHbsPos();
 
         if (start === null || end === null) {
-          locPosSpan = __classPrivateFieldSet$2(this, _locPosSpan, BROKEN);
+          locPosSpan = this._locPosSpan = BROKEN;
         } else {
-          locPosSpan = __classPrivateFieldSet$2(this, _locPosSpan, new HbsSpan(this.source, {
+          locPosSpan = this._locPosSpan = new HbsSpan(this.source, {
             start,
             end
-          }));
+          });
         }
       }
 
@@ -7985,8 +7855,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
   }
 
-  _locPosSpan = new WeakMap();
-
   class HbsSpan {
     constructor(source, hbsPositions, providedHbsLoc = null) {
       this.source = source;
@@ -7994,13 +7862,8 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       this.kind = "HbsPosition"
       /* HbsPosition */
       ;
-
-      _charPosSpan.set(this, null); // the source location from Handlebars + AST Plugins -- could be wrong
-
-
-      _providedHbsLoc.set(this, void 0);
-
-      __classPrivateFieldSet$2(this, _providedHbsLoc, providedHbsLoc);
+      this._charPosSpan = null;
+      this._providedHbsLoc = providedHbsLoc;
     }
 
     serialize() {
@@ -8015,17 +7878,16 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     }
 
     updateProvided(pos, edge) {
-      if (__classPrivateFieldGet$2(this, _providedHbsLoc)) {
-        __classPrivateFieldGet$2(this, _providedHbsLoc)[edge] = pos;
+      if (this._providedHbsLoc) {
+        this._providedHbsLoc[edge] = pos;
       } // invalidate computed character offsets
 
 
-      __classPrivateFieldSet$2(this, _charPosSpan, null);
-
-      __classPrivateFieldSet$2(this, _providedHbsLoc, {
+      this._charPosSpan = null;
+      this._providedHbsLoc = {
         start: pos,
         end: pos
-      });
+      };
     }
 
     locDidUpdate({
@@ -8072,19 +7934,19 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     }
 
     toCharPosSpan() {
-      var charPosSpan = __classPrivateFieldGet$2(this, _charPosSpan);
+      var charPosSpan = this._charPosSpan;
 
       if (charPosSpan === null) {
         var start = this.hbsPositions.start.toCharPos();
         var end = this.hbsPositions.end.toCharPos();
 
         if (start && end) {
-          charPosSpan = __classPrivateFieldSet$2(this, _charPosSpan, new CharPositionSpan(this.source, {
+          charPosSpan = this._charPosSpan = new CharPositionSpan(this.source, {
             start,
             end
-          }));
+          });
         } else {
-          charPosSpan = __classPrivateFieldSet$2(this, _charPosSpan, BROKEN);
+          charPosSpan = this._charPosSpan = BROKEN;
           return null;
         }
       }
@@ -8094,8 +7956,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
   }
 
-  _charPosSpan = new WeakMap(), _providedHbsLoc = new WeakMap();
-
   class InvisibleSpan {
     constructor(kind, // whatever was provided, possibly broken
     loc, // if the span represents a synthetic string
@@ -8322,7 +8182,9 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       this.loc = loc;
       this.type = 'PathExpression';
       this.this = false;
-      this.data = false;
+      this.data = false; // Cache for the head value.
+
+      this._head = undefined;
       var parts = tail.slice();
 
       if (head.type === 'ThisHead') {
@@ -8338,6 +8200,10 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     }
 
     get head() {
+      if (this._head) {
+        return this._head;
+      }
+
       var firstPart;
 
       if (this.this) {
@@ -8351,7 +8217,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       var firstPartLoc = this.loc.collapse('start').sliceStartChars({
         chars: firstPart.length
       }).loc;
-      return publicBuilder.head(firstPart, firstPartLoc);
+      return this._head = publicBuilder.head(firstPart, firstPartLoc);
     }
 
     get tail() {
@@ -9110,8 +8976,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
           return class {
             constructor(fields) {
               this.type = type;
-              this.loc = fields.loc;
-              copy(fields, this);
+              (0, _util.assign)(this, fields);
             }
 
           };
@@ -9123,8 +8988,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
         fields() {
           return class {
             constructor(fields) {
-              this.loc = fields.loc;
-              copy(fields, this);
+              (0, _util.assign)(this, fields);
             }
 
           };
@@ -9133,16 +8997,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       };
     }
   }
-
-  function keys(object) {
-    return Object.keys(object);
-  }
-
-  function copy(object1, object2) {
-    for (var key of keys(object1)) {
-      object2[key] = object1[key];
-    }
-  }
   /**
    * Corresponds to syntaxes with positional and named arguments:
    *
@@ -9302,30 +9156,9 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
 
   class ElementModifier extends node('ElementModifier').fields() {}
 
-  var __classPrivateFieldSet$3 = undefined && undefined.__classPrivateFieldSet || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to set private field on non-instance");
-    }
-
-    privateMap.set(receiver, value);
-    return value;
-  };
-
-  var __classPrivateFieldGet$3 = undefined && undefined.__classPrivateFieldGet || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to get private field on non-instance");
-    }
-
-    return privateMap.get(receiver);
-  };
-
-  var _span;
-
   class SpanList {
     constructor(span = []) {
-      _span.set(this, void 0);
-
-      __classPrivateFieldSet$3(this, _span, span);
+      this._span = span;
     }
 
     static range(span, fallback = SourceSpan.NON_EXISTENT) {
@@ -9333,17 +9166,15 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     }
 
     add(offset) {
-      __classPrivateFieldGet$3(this, _span).push(offset);
+      this._span.push(offset);
     }
 
     getRangeOffset(fallback) {
-      if (__classPrivateFieldGet$3(this, _span).length === 0) {
+      if (this._span.length === 0) {
         return fallback;
       } else {
-        var first = __classPrivateFieldGet$3(this, _span)[0];
-
-        var last = __classPrivateFieldGet$3(this, _span)[__classPrivateFieldGet$3(this, _span).length - 1];
-
+        var first = this._span[0];
+        var last = this._span[this._span.length - 1];
         return first.extend(last);
       }
     }
@@ -9351,7 +9182,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
   }
 
   _exports.SpanList = SpanList;
-  _span = new WeakMap();
 
   function loc(span) {
     if (Array.isArray(span)) {
@@ -10343,160 +10173,11 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     return new TraversalError('Replacing and removing in key handlers is not yet supported.', node, null, key);
   }
 
-  function getLocalName(node) {
-    switch (node.type) {
-      case 'ElementNode':
-        // unfortunately the ElementNode stores `tag` as a string
-        // if that changes in glimmer-vm this will need to be updated
-        return node.tag.split('.')[0];
-
-      case 'SubExpression':
-      case 'MustacheStatement':
-      case 'BlockStatement':
-        return getLocalName(node.path);
-
-      case 'UndefinedLiteral':
-      case 'NullLiteral':
-      case 'BooleanLiteral':
-      case 'StringLiteral':
-      case 'NumberLiteral':
-      case 'TextNode':
-      case 'Template':
-      case 'Block':
-      case 'CommentStatement':
-      case 'MustacheCommentStatement':
-      case 'PartialStatement':
-      case 'ElementModifierStatement':
-      case 'AttrNode':
-      case 'ConcatStatement':
-      case 'Program':
-      case 'Hash':
-      case 'HashPair':
-        return undefined;
-
-      case 'PathExpression':
-      default:
-        return node.parts.length ? node.parts[0] : undefined;
-    }
-  }
-
-  function getLocals(node) {
-    switch (node.type) {
-      case 'ElementNode':
-      case 'Program':
-      case 'Block':
-      case 'Template':
-        return node.blockParams;
-
-      case 'BlockStatement':
-        return node.program.blockParams;
-
-      default:
-        return undefined;
-    }
-  }
-
-  class TransformScope {
-    constructor(locals) {
-      this.locals = locals;
-      this.hasPartial = false;
-      this.usedLocals = {};
-
-      for (var local of locals) {
-        this.usedLocals[local] = false;
-      }
-    }
-
-    child(node) {
-      var locals = getLocals(node);
-      return locals ? new ChildTransformScope(locals, this) : this;
-    }
-
-    usePartial() {
-      this.hasPartial = true;
-    }
-
-  }
-
-  class RootTransformScope extends TransformScope {
-    constructor(node) {
-      var _a;
-
-      var locals = (_a = getLocals(node)) !== null && _a !== void 0 ? _a : [];
-      super(locals);
-    }
-
-    useLocal(node) {
-      var name = getLocalName(node);
-
-      if (name && name in this.usedLocals) {
-        this.usedLocals[name] = true;
-      }
-    }
-
-    isLocal(name) {
-      return this.locals.indexOf(name) !== -1;
-    }
-
-    currentUnusedLocals() {
-      if (!this.hasPartial && this.locals.length > 0) {
-        return this.locals.filter(local => !this.usedLocals[local]);
-      }
-
-      return false;
-    }
-
-  }
-
-  class ChildTransformScope extends TransformScope {
-    constructor(locals, parent) {
-      super(locals);
-      this.parent = parent;
-    }
-
-    useLocal(node) {
-      var name = getLocalName(node);
-
-      if (name && name in this.usedLocals) {
-        this.usedLocals[name] = true;
-      } else {
-        this.parent.useLocal(node);
-      }
-    }
-
-    isLocal(name) {
-      return this.locals.indexOf(name) !== -1 || this.parent.isLocal(name);
-    }
-
-    currentUnusedLocals() {
-      if (!this.hasPartial && this.locals.length > 0) {
-        // We only care about the last local, because if it is used then it implies
-        // usage of the others (specifically when in a child block, |foo bar|)
-        if (!this.usedLocals[this.locals[this.locals.length - 1]]) {
-          return [this.locals[this.locals.length - 1]];
-        }
-      }
-
-      return false;
-    }
-
-  }
-
   class WalkerPath {
     constructor(node, parent = null, parentKey = null) {
       this.node = node;
       this.parent = parent;
       this.parentKey = parentKey;
-      this.scope = parent ? parent.scope.child(node) : new RootTransformScope(node); // Consume in scope values
-
-      if (node.type === 'PathExpression') {
-        this.scope.useLocal(node);
-      }
-
-      if (node.type === 'ElementNode') {
-        this.scope.useLocal(node);
-        node.children.forEach(node => this.scope.useLocal(node));
-      }
     }
 
     get parentNode() {
@@ -10616,10 +10297,10 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     }
 
     if (result === undefined) {
-      var _keys = visitorKeys[node.type];
+      var keys = visitorKeys[node.type];
 
-      for (var i = 0; i < _keys.length; i++) {
-        var key = _keys[i]; // we know if it has child keys we can widen to a ParentNode
+      for (var i = 0; i < keys.length; i++) {
+        var key = keys[i]; // we know if it has child keys we can widen to a ParentNode
 
         visitKey(visitor, handler, path, key);
       }
@@ -12249,25 +11930,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     return program;
   }
 
-  var __classPrivateFieldSet$4 = undefined && undefined.__classPrivateFieldSet || function (receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to set private field on non-instance");
-    }
-
-    privateMap.set(receiver, value);
-    return value;
-  };
-
-  var __classPrivateFieldGet$4 = undefined && undefined.__classPrivateFieldGet || function (receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-      throw new TypeError("attempted to get private field on non-instance");
-    }
-
-    return privateMap.get(receiver);
-  };
-
-  var _hasEval;
-
   class SymbolTable {
     static top(locals, customizeComponentName) {
       return new ProgramSymbolTable(locals, customizeComponentName);
@@ -12293,8 +11955,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       this.named = (0, _util.dict)();
       this.blocks = (0, _util.dict)();
       this.usedTemplateLocals = [];
-
-      _hasEval.set(this, false);
+      this._hasEval = false;
     }
 
     getUsedTemplateLocals() {
@@ -12302,11 +11963,11 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
     }
 
     setHasEval() {
-      __classPrivateFieldSet$4(this, _hasEval, true);
+      this._hasEval = true;
     }
 
     get hasEval() {
-      return __classPrivateFieldGet$4(this, _hasEval);
+      return this._hasEval;
     }
 
     has(name) {
@@ -12386,7 +12047,6 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
   }
 
   _exports.ProgramSymbolTable = ProgramSymbolTable;
-  _hasEval = new WeakMap();
 
   class BlockSymbolTable extends SymbolTable {
     constructor(parent, symbols, slots) {
@@ -12903,7 +12563,7 @@ define("@glimmer/syntax", ["exports", "@glimmer/util", "simple-html-tokenizer",
       strictMode: false,
       locals: []
     }, options);
-    var top = SymbolTable.top(normalizeOptions.strictMode ? normalizeOptions.locals : [], (_a = // eslint-disable-next-line @typescript-eslint/unbound-method
+    var top = SymbolTable.top(normalizeOptions.locals, (_a = // eslint-disable-next-line @typescript-eslint/unbound-method
     options.customizeComponentName) !== null && _a !== void 0 ? _a : name => name);
     var block = new BlockContext(source, normalizeOptions, top);
     var normalizer = new StatementNormalizer(block);
@@ -18883,7 +18543,16 @@ define("ember-template-compiler/lib/system/compile-options", ["exports", "@ember
     ) {
         options.strictMode = false;
         options.locals = undefined;
-      } // move `moduleName` into `meta` property
+      }
+
+    if ('locals' in options && !options.locals) {
+      // Glimmer's precompile options declare `locals` like:
+      //    locals?: string[]
+      // but many in-use versions of babel-plugin-htmlbars-inline-precompile will
+      // set locals to `null`. This used to work but only because glimmer was
+      // ignoring locals for non-strict templates, and now it supports that case.
+      delete options.locals;
+    } // move `moduleName` into `meta` property
 
 
     if (options.moduleName) {
@@ -19056,7 +18725,7 @@ define("ember/version", ["exports"], function (_exports) {
     value: true
   });
   _exports.default = void 0;
-  var _default = "4.0.0-beta.3";
+  var _default = "4.0.0-beta.7";
   _exports.default = _default;
 });
 define("simple-html-tokenizer", ["exports"], function (_exports) {