From c32ca4bac6317c6e539a1edea059d345508a22ca Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 24 Mar 2021 13:22:10 -0700
Subject: [PATCH] Update Glimmer.js to the latest

Updates Glimmer.js to the latest, and also updates a number of APIs:

\## Breaking Changes

- Removes `@glimmerx/babel-plugin-component-templates`, replaces it with
  `@glimmerx/babel-preset` which wraps `@glimmer/babel-preset`. This
  uses `babel-plugin-htmlbars-inline-precompile`, which is the same
  inline precompiler used by Ember.js now, so we are synced between the
  two frameworks.
- Removes support for Ember < 3.25, `@glimmerx/component` will only work
  with versions of Ember that support strict mode.
- Adds `@glimmerx/webpack-loader`, which is now required to run before
  the Babel loader.
- Removes `TemplateArgs` export as a type.

\## Other Changes

- Adds support for `.gts` and `.gjs`
- Re-exports `fn` and `on` from Ember for usage in the Ember version of
  the addons
- Implements `helper()` for use in defining helpers in Ember
---
 .eslintignore                                 |    8 +-
 .eslintrc.js                                  |   39 +-
 .github/workflows/ci.yml                      |    2 +-
 .prettierignore                               |    2 +-
 README.md                                     |    6 +-
 package.json                                  |    9 +-
 .../babel-plugin-component-templates/index.js |  369 -----
 .../package.json                              |   31 -
 .../class-declaration/code.js                 |    5 -
 .../class-declaration/output.js               |   10 -
 .../class-expression/code.js                  |    5 -
 .../class-expression/output.js                |    8 -
 .../template-only-component/code.js           |    6 -
 .../template-only-component/output.js         |   16 -
 .../fixtures-compat/class-declaration/code.js |    5 -
 .../class-declaration/output.js               |   13 -
 .../fixtures-compat/class-expression/code.js  |    5 -
 .../class-expression/output.js                |   11 -
 .../template-only-component/code.js           |    3 -
 .../template-only-component/output.js         |   11 -
 .../precompile/ast-transform-hbs/code.js      |    3 -
 .../precompile/ast-transform-hbs/options.js   |   27 -
 .../precompile/ast-transform-hbs/output.js    |   10 -
 .../precompile/ast-transform/code.js          |    5 -
 .../precompile/ast-transform/options.js       |   27 -
 .../precompile/ast-transform/output.js        |   12 -
 .../precompile/custom/code.js                 |    5 -
 .../precompile/custom/options.js              |    8 -
 .../precompile/custom/output.js               |    6 -
 .../test/fixtures/class-declaration/code.js   |    8 -
 .../test/fixtures/class-declaration/output.js |   16 -
 .../test/fixtures/class-expression/code.js    |    5 -
 .../test/fixtures/class-expression/output.js  |   10 -
 .../test/fixtures/custom-imports/code.js      |   23 -
 .../test/fixtures/custom-imports/options.json |    8 -
 .../test/fixtures/custom-imports/output.js    |   47 -
 .../test/fixtures/ember/code.js               |    8 -
 .../test/fixtures/ember/options.json          |    3 -
 .../test/fixtures/ember/output.js             |   16 -
 .../test/fixtures/glimmer-env/.babelrc        |    5 -
 .../test/fixtures/glimmer-env/code.js         |   14 -
 .../test/fixtures/glimmer-env/output.js       |   21 -
 .../multiple-classes-commonjs/.babelrc        |    5 -
 .../multiple-classes-commonjs/code.js         |   21 -
 .../multiple-classes-commonjs/output.js       |   41 -
 .../.babelrc                                  |    5 -
 .../code.js                                   |   11 -
 .../output.js                                 |   29 -
 .../test/fixtures/multiple-classes/code.js    |   21 -
 .../test/fixtures/multiple-classes/output.js  |   38 -
 .../test/fixtures/multiscope-tokens/code.js   |   16 -
 .../test/fixtures/multiscope-tokens/output.js |   15 -
 .../test/fixtures/nested-classes/code.js      |   12 -
 .../test/fixtures/nested-classes/output.js    |   24 -
 .../test/fixtures/phantom-scope/code.js       |    8 -
 .../test/fixtures/phantom-scope/output.js     |   14 -
 .../precompile-disabled-commonjs/.babelrc     |    5 -
 .../precompile-disabled-commonjs/code.js      |   11 -
 .../precompile-disabled-commonjs/options.json |    5 -
 .../precompile-disabled-commonjs/output.js    |   20 -
 .../fixtures/precompile-disabled-hbs/code.js  |    6 -
 .../precompile-disabled-hbs/options.json      |    5 -
 .../precompile-disabled-hbs/output.js         |   13 -
 .../test/fixtures/precompile-disabled/code.js |   11 -
 .../fixtures/precompile-disabled/options.json |    5 -
 .../fixtures/precompile-disabled/output.js    |   15 -
 .../private-local-declarations/code.js        |   13 -
 .../private-local-declarations/output.js      |   26 -
 .../test/fixtures/scoped-tokens-hbs/code.js   |   17 -
 .../test/fixtures/scoped-tokens-hbs/output.js |   13 -
 .../test/fixtures/scoped-tokens/code.js       |   19 -
 .../test/fixtures/scoped-tokens/output.js     |   15 -
 .../code.js                                   |    9 -
 .../output.js                                 |   16 -
 .../test/fixtures/template-only-hbs/code.js   |    9 -
 .../test/fixtures/template-only-hbs/output.js |   15 -
 .../test/fixtures/typescript/.babelrc         |    5 -
 .../test/fixtures/typescript/code.ts          |   13 -
 .../test/fixtures/typescript/output.ts        |   17 -
 .../test/index.js                             |   88 --
 packages/@glimmerx/babel-preset/index.js      |   30 +
 packages/@glimmerx/babel-preset/package.json  |   25 +
 .../babel-preset/test/fixtures/debug/.babelrc |    5 +
 .../babel-preset/test/fixtures/debug/code.js  |   18 +
 .../test/fixtures/debug/output.js             |   50 +
 .../test/fixtures/production/.babelrc         |    5 +
 .../test/fixtures/production/code.js          |   18 +
 .../test/fixtures/production/output.js        |   50 +
 packages/@glimmerx/babel-preset/test/index.js |   19 +
 packages/@glimmerx/blueprint/files/.babelrc   |    3 +
 .../@glimmerx/blueprint/files/.babelrc.js     |   11 -
 .../@glimmerx/blueprint/files/package.json    |   16 +-
 .../blueprint/files/src/{App.js => App.gjs}   |    6 +-
 .../@glimmerx/blueprint/files/tests/util.ts   |    3 +-
 .../blueprint/files/webpack.config.js         |   72 +
 packages/@glimmerx/blueprint/package.json     |    2 +-
 .../@glimmerx/component/ember-addon-main.js   |   65 +-
 packages/@glimmerx/component/package.json     |   12 +-
 packages/@glimmerx/core/index.ts              |    3 +-
 packages/@glimmerx/core/package.json          |    6 +-
 .../core/src/functional-helper-manager.ts     |    2 +-
 .../core/src/functional-modifier-manager.ts   |    6 +-
 packages/@glimmerx/core/src/owner.ts          |    2 +-
 .../@glimmerx/core/src/renderComponent.ts     |    2 +-
 .../@glimmerx/core/tests/modifier-tests.ts    |    5 +-
 packages/@glimmerx/core/tests/render-tests.ts |   10 +-
 .../eslint-plugin/lib/rules/template-vars.js  |   15 +-
 packages/@glimmerx/eslint-plugin/package.json |    4 +-
 .../@glimmerx/helper/addon/-private/helper.js |   47 +-
 packages/@glimmerx/helper/addon/index.js      |    7 +-
 packages/@glimmerx/helper/package.json        |    6 +-
 packages/@glimmerx/helper/src/helper.ts       |   20 +-
 packages/@glimmerx/modifier/addon/index.js    |    7 +-
 packages/@glimmerx/modifier/package.json      |    6 +-
 packages/@glimmerx/service/index.ts           |    2 +-
 packages/@glimmerx/service/package.json       |    3 +-
 packages/@glimmerx/service/src/decorator.ts   |   10 +-
 packages/@glimmerx/ssr/package.json           |    4 +-
 packages/@glimmerx/ssr/src/render.ts          |    4 +-
 .../ssr/tests/render-options-tests.ts         |   10 +-
 packages/@glimmerx/storybook/package.json     |    6 +-
 .../src/server/framework-preset-glimmer.ts    |   72 +-
 packages/@glimmerx/webpack-loader/index.js    |   68 +
 .../@glimmerx/webpack-loader/package.json     |   32 +
 .../{simple-button.js => simple-button.gjs}   |    6 +-
 .../examples/basic-addon/config/ember-try.js  |    4 +-
 packages/examples/basic-addon/package.json    |    8 +-
 packages/examples/basic/.storybook/main.js    |    2 +-
 packages/examples/basic/index.ts              |    2 +
 packages/examples/basic/package.json          |    2 +-
 packages/examples/basic/src/GtsComponent.gts  |    7 +
 .../examples/basic/src/MyComponent.stories.ts |    2 +
 packages/examples/basic/src/MyComponent.ts    |   14 +-
 ....stories.ts => OtherComponent.stories.gts} |    4 +-
 packages/examples/ember-app/package.json      |    8 +-
 .../examples/partial-rehydration/server.ts    |    2 +-
 packages/examples/playground/.babelrc         |    3 +
 packages/examples/playground/.babelrc.js      |   11 -
 packages/examples/playground/package.json     |   15 +-
 packages/examples/playground/src/App.ts       |    2 +-
 packages/examples/playground/src/Editor.ts    |    2 +-
 packages/examples/playground/src/index.ts     |    2 +-
 .../examples/playground/src/utils/compile.ts  |   16 +-
 .../playground/src/utils/eval-snippet.ts      |    2 +-
 packages/examples/playground/tests/util.ts    |    2 +-
 .../examples/playground/webpack.config.js     |    9 +-
 packages/examples/rehydration/server.ts       |    2 +-
 tsconfig.json                                 |    2 +-
 webpack.config.js                             |   58 +-
 yarn.lock                                     | 1246 +++++++++++++----
 150 files changed, 1713 insertions(+), 1971 deletions(-)
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/index.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/package.json
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-declaration/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-declaration/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-expression/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-expression/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/template-only-component/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/template-only-component/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-declaration/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-declaration/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-expression/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-expression/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/template-only-component/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/template-only-component/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/options.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/options.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/options.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-declaration/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-declaration/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-expression/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-expression/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/options.json
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/options.json
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/.babelrc
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/.babelrc
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/.babelrc
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiscope-tokens/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiscope-tokens/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/nested-classes/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/nested-classes/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/phantom-scope/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/phantom-scope/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/.babelrc
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/options.json
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/options.json
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/options.json
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/private-local-declarations/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/private-local-declarations/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens-hbs/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens-hbs/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs-with-component-import/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs-with-component-import/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs/code.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs/output.js
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/.babelrc
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/code.ts
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/output.ts
 delete mode 100644 packages/@glimmerx/babel-plugin-component-templates/test/index.js
 create mode 100644 packages/@glimmerx/babel-preset/index.js
 create mode 100644 packages/@glimmerx/babel-preset/package.json
 create mode 100644 packages/@glimmerx/babel-preset/test/fixtures/debug/.babelrc
 create mode 100644 packages/@glimmerx/babel-preset/test/fixtures/debug/code.js
 create mode 100644 packages/@glimmerx/babel-preset/test/fixtures/debug/output.js
 create mode 100644 packages/@glimmerx/babel-preset/test/fixtures/production/.babelrc
 create mode 100644 packages/@glimmerx/babel-preset/test/fixtures/production/code.js
 create mode 100644 packages/@glimmerx/babel-preset/test/fixtures/production/output.js
 create mode 100644 packages/@glimmerx/babel-preset/test/index.js
 create mode 100644 packages/@glimmerx/blueprint/files/.babelrc
 delete mode 100644 packages/@glimmerx/blueprint/files/.babelrc.js
 rename packages/@glimmerx/blueprint/files/src/{App.js => App.gjs} (81%)
 create mode 100644 packages/@glimmerx/blueprint/files/webpack.config.js
 create mode 100644 packages/@glimmerx/webpack-loader/index.js
 create mode 100644 packages/@glimmerx/webpack-loader/package.json
 rename packages/examples/basic-addon/addon/components/{simple-button.js => simple-button.gjs} (69%)
 create mode 100644 packages/examples/basic/src/GtsComponent.gts
 rename packages/examples/basic/src/{OtherComponent.stories.ts => OtherComponent.stories.gts} (68%)
 create mode 100644 packages/examples/playground/.babelrc
 delete mode 100644 packages/examples/playground/.babelrc.js

diff --git a/.eslintignore b/.eslintignore
index efc19ddc..c2f4d856 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -10,7 +10,7 @@
 **/bower_components/**
 
 # Fixtures
-**/packages/@glimmerx/babel-plugin-component-templates/test/**/code.js
-**/packages/@glimmerx/babel-plugin-component-templates/test/**/output.js
-**/packages/@glimmerx/babel-plugin-component-templates/test/**/code.ts
-**/packages/@glimmerx/babel-plugin-component-templates/test/**/output.ts
+**/packages/@glimmerx/babel-preset/test/**/code.js
+**/packages/@glimmerx/babel-preset/test/**/output.js
+**/packages/@glimmerx/babel-preset/test/**/code.ts
+**/packages/@glimmerx/babel-preset/test/**/output.ts
diff --git a/.eslintrc.js b/.eslintrc.js
index 9003e132..9171fa82 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,6 +5,9 @@ module.exports = {
     ecmaVersion: 2019,
     sourceType: 'module',
   },
+  env: {
+    es6: true,
+  },
   extends: [
     'eslint:recommended',
     'plugin:prettier/recommended',
@@ -30,7 +33,6 @@ module.exports = {
         '**/scripts/**/*.js',
         '**/blueprints/**/*.js',
         'webpack.config.js',
-        'packages/babel-plugins/**/*.js',
         'packages/@glimmerx/blueprint/index.js',
       ],
       env: {
@@ -40,19 +42,9 @@ module.exports = {
     },
     {
       files: [
-        'packages/@glimmerx/babel-plugin-component-templates/**/*.js',
+        'packages/@glimmerx/babel-preset/**/*.js',
         'packages/@glimmerx/eslint-plugin/**/*.js',
-      ],
-      env: {
-        es6: true,
-        node: true,
-        mocha: true,
-      },
-    },
-    {
-      files: [
-        'packages/@glimmerx/babel-plugin-component-templates/test/**/code.js',
-        'packages/@glimmerx/babel-plugin-component-templates/test/**/output.js',
+        'packages/@glimmerx/webpack-loader/**/*.js',
       ],
       env: {
         es6: true,
@@ -67,17 +59,6 @@ module.exports = {
         'no-process-exit': 'off',
       },
     },
-    // source Js
-    {
-      files: ['**/src/**/*.js', '**/test/**/*.js'],
-      env: {
-        es2020: true,
-        browser: true,
-      },
-      parserOptions: {
-        sourceType: 'module',
-      },
-    },
     // TypeScript source
     {
       files: ['**/*.ts'],
@@ -91,9 +72,19 @@ module.exports = {
         '@typescript-eslint/explicit-function-return-type': 'error',
         '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
 
+        '@typescript-eslint/ban-types': ['error', {
+          types: {
+            // we currently use `object` as "valid WeakMap key" in a lot of APIs
+            object: false,
+          }
+        }],
+
         // We should try to remove this eventually
         '@typescript-eslint/explicit-function-return-type': 'off',
 
+        // We should also try to remove this eventually
+        '@typescript-eslint/ban-ts-ignore': 'off',
+
         // disabling this one because of DEBUG APIs, if we ever find a better
         // way to suport those we should re-enable it
         '@typescript-eslint/no-non-null-assertion': 'off',
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95ae07c3..3963f089 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
 
       strategy:
         matrix:
-          ember-version: [default, release, beta, canary, lts-3.16]
+          ember-version: [default, release, beta, canary, "3.25"]
 
       steps:
         - uses: actions/checkout@v2
diff --git a/.prettierignore b/.prettierignore
index a5987a63..dc5198e9 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1 @@
-packages/@glimmerx/babel-plugin-component-templates/test/
\ No newline at end of file
+packages/@glimmerx/babel-preset/test/
diff --git a/README.md b/README.md
index ee299bb0..132857ad 100644
--- a/README.md
+++ b/README.md
@@ -54,11 +54,11 @@ npm:
 yarn add @glimmerx/core @glimmerx/component
 ```
 
-You will also need to install a Babel plugin that compiles templates with the
-Glimmer compiler:
+You will also need to install a Babel preset that handles Glimmer templates and
+other language features, such as decorators and class fields:
 
 ```
-yarn add -D @glimmerx/babel-plugin-component-templates
+yarn add -D @glimmerx/babel-preset
 ```
 
 If using ESLint, you will also want to install / use the plugin provided, as the `no-unused-vars` core rule will fail without it
diff --git a/package.json b/package.json
index b132d515..19a40e53 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "start": "webpack-dev-server",
     "storybook": "yarn build && yarn workspace basic-example-app storybook",
     "test": "yarn lint && testem ci && yarn test:babel-plugins",
-    "test:babel-plugins": "mocha -r esm --timeout 5000 packages/@glimmerx/babel-plugin-component-templates/test packages/@glimmerx/eslint-plugin/test/lib/rules",
+    "test:babel-plugins": "mocha -r esm --timeout 5000 packages/@glimmerx/babel-preset/test packages/@glimmerx/eslint-plugin/test/lib/rules",
     "test:ember": "yarn workspace basic-addon ember try:one",
     "test:playground": "yarn workspace glimmerx-playground test",
     "test:watch": "testem"
@@ -44,10 +44,9 @@
     "@babel/plugin-proposal-decorators": "^7.8.3",
     "@babel/preset-env": "^7.9.5",
     "@babel/preset-typescript": "^7.9.0",
-    "@glimmer/babel-plugin-glimmer-env": "2.0.0-beta.12",
     "@types/qunit": "^2.9.1",
-    "@typescript-eslint/eslint-plugin": "^2.27.0",
-    "@typescript-eslint/parser": "^2.27.0",
+    "@typescript-eslint/eslint-plugin": "^4.18.0",
+    "@typescript-eslint/parser": "^4.18.0",
     "babel-loader": "^8.0.6",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
@@ -62,7 +61,7 @@
     "testem": "^3.0.3",
     "ts-loader": "^6.2.2",
     "tsconfig-paths-webpack-plugin": "^3.2.0",
-    "typescript": "~3.8.3",
+    "typescript": "~4.2.3",
     "webpack": "^4.42.1",
     "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.10.3"
diff --git a/packages/@glimmerx/babel-plugin-component-templates/index.js b/packages/@glimmerx/babel-plugin-component-templates/index.js
deleted file mode 100644
index a90a0cf0..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/index.js
+++ /dev/null
@@ -1,369 +0,0 @@
-const glimmerPrecompileTemplate = require('@glimmer/babel-plugin-strict-template-precompile')
-  .precompileTemplate;
-const { addNamed } = require('@babel/helper-module-imports');
-const { traverse, preprocess } = require('@glimmer/syntax');
-const { precompile } = require('@glimmer/compiler');
-
-/* AST.Node reference: https://github.com/glimmerjs/glimmer-vm/blob/master/packages/%40glimmer/syntax/lib/types/nodes.ts#L268 */
-
-/**
- * Gets the correct Token from the Node based on it's type
- * @param {AST.Node} node - the node to extract tokens from
- * @param {string[]} scopedTokens - An array of scoped tokens
- * @returns {string} A tag to add to the list of tokens
- */
-function tokensFromType(node, scopedTokens) {
-  const tokensMap = {
-    PathExpression: (node) => {
-      if (node.data === true || node.this === true) {
-        return;
-      }
-      const [possbleToken] = node.parts;
-      if (!scopedTokens.includes(possbleToken)) {
-        return possbleToken;
-      }
-    },
-    ElementNode: ({ tag }) => {
-      const char = tag.charAt(0);
-      if (char !== char.toUpperCase() || char === ':') {
-        return;
-      }
-      if (scopedTokens.includes(tag)) {
-        return;
-      }
-      return tag;
-    },
-  };
-  if (node.type in tokensMap) {
-    return tokensMap[node.type](node);
-  }
-}
-
-/**
- * Adds tokens to the tokensSet based on their node.type
- *
- * @param {Set<string>} tokensSet The current Set of unique tokens
- * @param {AST.Node} node - the node to extract tokens from
- * @param {string | string[]} scopedTokens - a list, or single string of tokens
- * @param {string[]} [nativeTokens] - An optional param of nativeTokens to exclude from the list (ex. ['if', 'each'])
- */
-function addTokens(tokensSet, node, scopedTokens, nativeTokens = []) {
-  const maybeTokens = tokensFromType(node, scopedTokens);
-  (Array.isArray(maybeTokens) ? maybeTokens : [maybeTokens]).forEach((maybeToken) => {
-    if (
-      maybeToken !== undefined &&
-      !nativeTokens.includes(maybeToken) &&
-      !maybeToken.startsWith('@')
-    ) {
-      tokensSet.add(maybeToken);
-    }
-  });
-}
-
-/**
- * Parses and traverses a given handlebars html template to extract all tokens referenced
- * that will come from the parent scope
- *
- * @param {string} html The handlebars html to process into an AST and traverse
- * @param {string[]} [nativeTokens] - An optional param of nativeTokens to exclude from the list (ex. ['if', 'each'])
- * @returns {string[]} The list of token names
- */
-function getTemplateTokens(html, nativeTokens) {
-  const ast = preprocess(html);
-  const tokensSet = new Set();
-  const scopedTokens = [];
-
-  traverse(ast, {
-    Block: {
-      enter({ blockParams }) {
-        blockParams.forEach((param) => {
-          scopedTokens.push(param);
-        });
-      },
-      exit({ blockParams }) {
-        blockParams.forEach(() => {
-          scopedTokens.pop();
-        });
-      },
-    },
-    ElementNode: {
-      enter(node) {
-        node.blockParams.forEach((param) => {
-          scopedTokens.push(param);
-        });
-        addTokens(tokensSet, node, scopedTokens);
-      },
-      exit({ blockParams }) {
-        blockParams.forEach(() => {
-          scopedTokens.pop();
-        });
-      },
-    },
-    All(node) {
-      addTokens(tokensSet, node, scopedTokens, nativeTokens);
-    },
-  });
-  return Array.from(tokensSet);
-}
-
-module.exports = function (babel, options) {
-  const { types: t, parse } = babel;
-  const {
-    // Whether or not we'ret targeting Ember. If so, we use the Ember global
-    // instead of adding imports, and we use different default import paths.
-    ember = false,
-
-    setTemplatePath = '@glimmer/core',
-    setTemplateName = ember ? '_setComponentTemplate' : 'setComponentTemplate',
-
-    createTemplatePath = '@glimmer/core',
-    createTemplateName = 'createTemplate',
-
-    templateOnlyComponentPath = '@glimmer/core',
-    templateOnlyComponentName = ember ? '_templateOnlyComponent' : 'templateOnlyComponent',
-
-    precompile: precompileOptions = {},
-
-    // Users can pass a custom precompile function. This is used by Ember.
-    precompileTemplate = glimmerPrecompileTemplate,
-  } = options || {};
-
-  const shouldPrecompile = precompileOptions.disabled !== true;
-
-  function maybeAddImport(state, programPath, name, importPath) {
-    let stateKey = `__import__${name}`;
-
-    if (!state[stateKey]) {
-      if (ember) {
-        // In Ember, we destructure the value from the Ember global
-        const globalImport = t.variableDeclaration('var', [
-          t.variableDeclarator(
-            t.identifier(name),
-            t.memberExpression(t.identifier('Ember'), t.identifier(name))
-          ),
-        ]);
-
-        programPath.get('body.0').insertBefore(globalImport);
-
-        state[stateKey] = name;
-      } else {
-        state[stateKey] = addNamed(programPath, name, importPath, {
-          importedType: 'es6',
-        }).name;
-      }
-    }
-
-    return state[stateKey];
-  }
-
-  function maybeAddSetTemplateImport(state, programPath) {
-    return maybeAddImport(state, programPath, setTemplateName, setTemplatePath);
-  }
-
-  function maybeAddCreateTemplateImport(state, programPath) {
-    return maybeAddImport(state, programPath, createTemplateName, createTemplatePath);
-  }
-
-  function maybeAddTemplateOnlyComponentImport(state, programPath) {
-    return maybeAddImport(state, programPath, templateOnlyComponentName, templateOnlyComponentPath);
-  }
-
-  return {
-    name: '@glimmerx/babel-plugin-component-templates',
-    manipulateOptions({ parserOpts }) {
-      parserOpts.plugins.push(['classProperties']);
-    },
-    visitor: {
-      // This visitor exists to add an extra reference to all template bindings
-      // so they don't get removed eagerly. This is because we may end up using
-      // them later on and adding a reference ourselves.
-      Program: {
-        enter(path, state) {
-          const parentScope = path.scope.getProgramParent();
-
-          // Get the bindings and filter out any that are typescript types
-          const bindings = Object.values(parentScope.bindings).filter(
-            (b) => !b.referencePaths.some((p) => p.parent.type === 'TSTypeReference')
-          );
-
-          if (bindings.length === 0) return;
-
-          // create a new empty node to add a reference to in the binding
-          let firstNode = path.get('body.0');
-          firstNode.insertBefore(t.noop());
-          firstNode = path.get('body.0');
-
-          bindings.forEach((b) => b.reference(firstNode));
-
-          // save the node and original bindings off to remove on exit
-          state.originalBindings = bindings;
-          state.emptyPath = firstNode;
-        },
-
-        exit(path, state) {
-          if (state.originalBindings) {
-            // dereference all the original bindings, and remove the empty path
-            state.originalBindings.forEach((b) => b.dereference(state.emptyPath));
-            state.emptyPath.remove();
-          }
-        },
-      },
-
-      ImportDefaultSpecifier(path, state) {
-        if (state.glimmerComponentImportId || path.parent.source.value !== '@glimmerx/component') {
-          return;
-        }
-        const localName = path.node.local.name;
-        state.glimmerComponentImportId = localName;
-      },
-
-      ImportSpecifier(path, state) {
-        if (state.hbsImportId || path.parent.source.value !== '@glimmerx/component') {
-          return;
-        }
-        const importedName = path.node.imported.name;
-        const localName = path.node.local.name;
-        if (importedName === 'hbs') {
-          state.hbsImportId = localName;
-          // remove the hbs named import
-          if (path.parentPath.node.specifiers.length > 1) {
-            path.remove();
-          } else {
-            path.parentPath.remove();
-          }
-        }
-      },
-
-      ClassExpression(path, state) {
-        const classBody = path.get('body').get('body');
-        const templateProp = findTemplateProperty(classBody, state.hbsImportId);
-
-        if (templateProp) {
-          insertTemplateWrapper(path.scope.getProgramParent().path, path, templateProp, state);
-          templateProp.remove();
-        }
-      },
-
-      ClassDeclaration(path, state) {
-        const classBody = path.get('body').get('body');
-        const templateProp = findTemplateProperty(classBody, state.hbsImportId);
-
-        if (templateProp) {
-          insertTemplateWrapper(path.scope.getProgramParent().path, path, templateProp, state);
-          templateProp.remove();
-        }
-      },
-
-      TaggedTemplateExpression(path, state) {
-        if (path.node.tag.name !== state.hbsImportId) {
-          return;
-        }
-
-        let programPath = path.scope.getProgramParent().path;
-
-        const setTemplateId = maybeAddSetTemplateImport(state, programPath);
-        const templateOnlyId = maybeAddTemplateOnlyComponentImport(state, programPath);
-
-        const templateNode = shouldPrecompile
-          ? buildTemplate(path)
-          : buildCreateTemplate(path, programPath, state);
-
-        path.replaceWith(
-          t.callExpression(t.identifier(setTemplateId), [
-            templateNode,
-            t.callExpression(t.identifier(templateOnlyId), []),
-          ])
-        );
-      },
-    },
-  };
-
-  function findTemplateProperty(classBody, hbsImportId) {
-    return classBody.find((propPath) => {
-      return (
-        propPath.node.static &&
-        propPath.node.key.name === 'template' &&
-        propPath.node.value.type === 'TaggedTemplateExpression' &&
-        propPath.node.value.tag.name === hbsImportId
-      );
-    });
-  }
-
-  function insertTemplateWrapper(programPath, classPath, templatePath, state) {
-    const setTemplateId = maybeAddSetTemplateImport(state, programPath);
-
-    const template = shouldPrecompile
-      ? buildTemplate(templatePath)
-      : buildCreateTemplate(templatePath, programPath, state);
-
-    if (classPath.isClassExpression()) {
-      classPath.replaceWith(
-        t.callExpression(t.identifier(setTemplateId), [template, classPath.node])
-      );
-    } else {
-      const classId = classPath.node.id;
-
-      classPath.insertAfter(t.callExpression(t.identifier(setTemplateId), [template, classId]));
-    }
-  }
-
-  function getFilteredTemplateTokens(path, templateSource) {
-    const templateScopeTokens = getTemplateTokens(templateSource);
-
-    const filtered = [];
-    templateScopeTokens.forEach((token) => {
-      const binding = path.scope.getBinding(token);
-      if (binding) {
-        binding.reference(path);
-        filtered.push(binding.identifier.name);
-      }
-    });
-
-    return filtered;
-  }
-
-  function buildTemplate(path) {
-    const templateSource = getTemplateString(path);
-    const templateScopeTokens = getFilteredTemplateTokens(path, templateSource);
-
-    const compiledTemplate = precompileTemplate(
-      templateSource,
-      templateScopeTokens,
-      precompileOptions
-    );
-
-    let ast = parse(compiledTemplate);
-
-    return ast.program.body[0].expression;
-  }
-
-  function buildCreateTemplate(path, programPath, state) {
-    const createTemplateId = maybeAddCreateTemplateImport(state, programPath);
-    const templateSource = getTemplateString(path);
-    const tokens = getFilteredTemplateTokens(path, templateSource);
-
-    const scopeObject = t.objectExpression(
-      tokens.map((token) =>
-        t.objectProperty(t.identifier(token), t.identifier(token), false, false)
-      )
-    );
-
-    return t.callExpression(t.identifier(createTemplateId), [
-      scopeObject,
-      t.templateLiteral([t.templateElement({ raw: templateSource })], []),
-    ]);
-  }
-
-  function getTemplateString(path) {
-    const stringNode = path.node.value || path.node;
-
-    if (t.isTaggedTemplateExpression(stringNode)) {
-      return stringNode.quasi.quasis[0].value.raw;
-    }
-    return path.node.value.quasis[0].value.raw;
-  }
-};
-
-module.exports.getTemplateTokens = getTemplateTokens;
-// Reexport the precompile function from @glimmer/compiler for any other babel plugins so that they have consistent versioning for the compiler
-module.exports.precompile = precompile;
diff --git a/packages/@glimmerx/babel-plugin-component-templates/package.json b/packages/@glimmerx/babel-plugin-component-templates/package.json
deleted file mode 100644
index a9831456..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "@glimmerx/babel-plugin-component-templates",
-  "version": "0.5.0",
-  "description": "Compiles Glimmer component templates",
-  "repository": "https://github.com/glimmerjs/glimmer-experimental",
-  "author": "Tom Dale <tom@tomdale.net>",
-  "license": "MIT",
-  "private": false,
-  "files": [
-    "index.js"
-  ],
-  "scripts": {
-    "test": "mocha -r esm"
-  },
-  "dependencies": {
-    "@babel/core": "^7.9.0",
-    "@babel/helper-module-imports": "^7.8.3",
-    "@glimmer/babel-plugin-strict-template-precompile": "2.0.0-beta.12",
-    "@glimmer/syntax": "0.73.0"
-  },
-  "devDependencies": {
-    "@babel/preset-env": "^7.9.5",
-    "babel-plugin-tester": "^6.4.0",
-    "esm": "^3.2.25",
-    "mocha": "^7.1.1"
-  },
-  "volta": {
-    "node": "12.10.0",
-    "yarn": "1.22.4"
-  }
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-declaration/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-declaration/code.js
deleted file mode 100644
index ba1e6ed7..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-declaration/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-class MyComponent extends Component {
-  static template = hbs`<h1>{{_t "foo"}}</h1>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-declaration/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-declaration/output.js
deleted file mode 100644
index a7be0a91..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-declaration/output.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { createTemplate as _createTemplate } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import { t as _t } from "t-helper";
-import Component from '@glimmerx/component';
-
-class MyComponent extends Component {}
-
-_setComponentTemplate(_createTemplate({
-  _t: _t
-}, `<h1>{{_t "foo"}}</h1>`), MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-expression/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-expression/code.js
deleted file mode 100644
index e512830e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-expression/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-const MyComponent = class extends Component {
-  static template = hbs`<h1>{{_t "foo"}}</h1>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-expression/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-expression/output.js
deleted file mode 100644
index dfb43ed8..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/class-expression/output.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createTemplate as _createTemplate } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import { t as _t } from "t-helper";
-import Component from '@glimmerx/component';
-
-const MyComponent = _setComponentTemplate(_createTemplate({
-  _t: _t
-}, `<h1>{{_t "foo"}}</h1>`), class extends Component {});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/template-only-component/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/template-only-component/code.js
deleted file mode 100644
index 2644d301..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/template-only-component/code.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import YetAnotherComponent from './YetAnotherComponent';
-
-const template1 = hbs`{{_t "bar"}}<h1>Hello world</h1><OtherComponent/>`;
-const template2 = hbs`{{_t "foo"}}<YetAnotherComponent/>`;
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/template-only-component/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/template-only-component/output.js
deleted file mode 100644
index f06fd087..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat-options/template-only-component/output.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { createTemplate as _createTemplate } from "@glimmer/core";
-import { templateOnlyComponent as _templateOnlyComponent } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import { t as _t } from "t-helper";
-import OtherComponent from './OtherComponent';
-import YetAnotherComponent from './YetAnotherComponent';
-
-const template1 = _setComponentTemplate(_createTemplate({
-  _t: _t,
-  OtherComponent: OtherComponent
-}, `{{_t "bar"}}<h1>Hello world</h1><OtherComponent/>`), _templateOnlyComponent());
-
-const template2 = _setComponentTemplate(_createTemplate({
-  _t: _t,
-  YetAnotherComponent: YetAnotherComponent
-}, `{{_t "foo"}}<YetAnotherComponent/>`), _templateOnlyComponent());
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-declaration/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-declaration/code.js
deleted file mode 100644
index ba1e6ed7..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-declaration/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-class MyComponent extends Component {
-  static template = hbs`<h1>{{_t "foo"}}</h1>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-declaration/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-declaration/output.js
deleted file mode 100644
index 22b8c5d2..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-declaration/output.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import { t as _t } from "t-helper";
-import Component from '@glimmerx/component';
-
-class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "BFMB8fiz",
-  "block": "[[[10,\"h1\"],[12],[1,[28,[32,0],[\"foo\"],null]],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [_t],
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-expression/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-expression/code.js
deleted file mode 100644
index e512830e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-expression/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-const MyComponent = class extends Component {
-  static template = hbs`<h1>{{_t "foo"}}</h1>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-expression/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-expression/output.js
deleted file mode 100644
index 8f4e311e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/class-expression/output.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import { t as _t } from "t-helper";
-import Component from '@glimmerx/component';
-
-const MyComponent = _setComponentTemplate({
-  "id": "BFMB8fiz",
-  "block": "[[[10,\"h1\"],[12],[1,[28,[32,0],[\"foo\"],null]],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [_t],
-  "isStrictMode": true
-}, class extends Component {});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/template-only-component/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/template-only-component/code.js
deleted file mode 100644
index dbb50cbc..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/template-only-component/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { hbs } from '@glimmerx/component';
-
-const someTemplate = hbs`<h1>{{_t "foo"}}</h1>`;
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/template-only-component/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/template-only-component/output.js
deleted file mode 100644
index 928c143e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-compat/template-only-component/output.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { templateOnlyComponent as _templateOnlyComponent } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import { t as _t } from "t-helper";
-
-const someTemplate = _setComponentTemplate({
-  "id": "BFMB8fiz",
-  "block": "[[[10,\"h1\"],[12],[1,[28,[32,0],[\"foo\"],null]],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [_t],
-  "isStrictMode": true
-}, _templateOnlyComponent());
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/code.js
deleted file mode 100644
index a8005ed8..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/code.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { hbs } from '@glimmerx/component';
-
-const template = hbs`{{bad}}<h1>Hello world</h1>`;
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/options.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/options.js
deleted file mode 100644
index 5434570f..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/options.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// babel-plugin-test only supports options as an options.json file,
-// so we have to manually pass this through to our fixture.
-
-const precompileOptions = {
-  meta: {},
-  plugins: {
-    ast: [
-      () => {
-        return {
-          name: 'remove-bad-helper',
-          visitor: {
-            MustacheStatement(node) {
-              if (node.path.original == 'bad') {
-                return null;
-              }
-            },
-          },
-        };
-      },
-    ],
-  },
-  mode: 'precompile',
-};
-
-export default {
-  precompile: precompileOptions,
-};
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/output.js
deleted file mode 100644
index f7b573a1..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform-hbs/output.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { templateOnlyComponent as _templateOnlyComponent } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-
-const template = _setComponentTemplate({
-  "id": "iQBI6eOx",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, _templateOnlyComponent());
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/code.js
deleted file mode 100644
index 9d79ffb7..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-class MyComponent extends Component {
-  static template = hbs`{{bad}}<h1>Hello world</h1>`;
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/options.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/options.js
deleted file mode 100644
index 5434570f..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/options.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// babel-plugin-test only supports options as an options.json file,
-// so we have to manually pass this through to our fixture.
-
-const precompileOptions = {
-  meta: {},
-  plugins: {
-    ast: [
-      () => {
-        return {
-          name: 'remove-bad-helper',
-          visitor: {
-            MustacheStatement(node) {
-              if (node.path.original == 'bad') {
-                return null;
-              }
-            },
-          },
-        };
-      },
-    ],
-  },
-  mode: 'precompile',
-};
-
-export default {
-  precompile: precompileOptions,
-};
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/output.js
deleted file mode 100644
index 58262d0a..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/ast-transform/output.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-
-class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "iQBI6eOx",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/code.js
deleted file mode 100644
index 9d79ffb7..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-class MyComponent extends Component {
-  static template = hbs`{{bad}}<h1>Hello world</h1>`;
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/options.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/options.js
deleted file mode 100644
index bec3a33f..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/options.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// babel-plugin-test only supports options as an options.json file,
-// so we have to manually pass this through to our fixture.
-
-export default {
-  precompileTemplate(template) {
-    return `CUSTOM_COMPILER("${template}")`;
-  },
-};
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/output.js
deleted file mode 100644
index 2f3901b7..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures-options/precompile/custom/output.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-
-class MyComponent extends Component {}
-
-_setComponentTemplate(CUSTOM_COMPILER("{{bad}}<h1>Hello world</h1>"), MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-declaration/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-declaration/code.js
deleted file mode 100644
index 7758dc83..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-declaration/code.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-const unknownValue = null;
-const MaybeComponent = null;
-const maybeModifier = null;
-class MyComponent extends Component {
-  static template = hbs`<h1 {{maybeModifier}}>Hello world {{unknownValue}}<MaybeComponent /></h1>`;
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-declaration/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-declaration/output.js
deleted file mode 100644
index d8c18ac1..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-declaration/output.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-const unknownValue = null;
-const MaybeComponent = null;
-const maybeModifier = null;
-
-class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "jFBJ3iUu",
-  "block": "[[[11,\"h1\"],[4,[32,0],null,null],[12],[1,\"Hello world \"],[1,[32,1]],[8,[32,2],null,null,null],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [maybeModifier, unknownValue, MaybeComponent],
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-expression/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-expression/code.js
deleted file mode 100644
index 887393b3..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-expression/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-const MyComponent = class extends Component {
-  static template = hbs`<h1>Hello world</h1>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-expression/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-expression/output.js
deleted file mode 100644
index 6ba63592..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/class-expression/output.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-
-const MyComponent = _setComponentTemplate({
-  "id": "UnWFMClF",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, class extends Component {});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/code.js
deleted file mode 100644
index db3a795f..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/code.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-class Class1Declaration extends Component {
-  static template = hbs`<h1>Hello world</h1>`;
-}
-
-const Class1Expression = class extends Component {
-  static template = hbs`<h1>Hello world</h1>`;
-}
-
-class Class2Declaration extends Component {
-  static template = hbs`<h2>
-    Goodbye world
-  </h2>`;
-}
-
-const Class2Expression = class extends Component {
-  static template = hbs`<h2>
-    Goodbye world<Class2Declaration />
-  </h2>`;
-}
-
-const TOComponent = hbs`<h3>Hello again world<Class2Expression/></h3>`
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/options.json b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/options.json
deleted file mode 100644
index 1fa081f9..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/options.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "setTemplatePath": "@glimmerx/other-package",
-  "setTemplateName": "dangerouslySetComponentTemplate",
-  "createTemplatePath": "@glimmerx/some-other-package",
-  "createTemplateName": "createStrictTemplate",
-  "templateOnlyComponentPath": "@glimmerx/some-component-path",
-  "templateOnlyComponentName": "TOComponent"
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/output.js
deleted file mode 100644
index 527c85fc..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/custom-imports/output.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import { TOComponent as _TOComponent } from "@glimmerx/some-component-path";
-import { dangerouslySetComponentTemplate as _dangerouslySetComponentTemplate } from "@glimmerx/other-package";
-import Component from '@glimmerx/component';
-
-class Class1Declaration extends Component {}
-
-_dangerouslySetComponentTemplate({
-  "id": "UnWFMClF",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, Class1Declaration)
-
-const Class1Expression = _dangerouslySetComponentTemplate({
-  "id": "UnWFMClF",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, class extends Component {});
-
-class Class2Declaration extends Component {}
-
-_dangerouslySetComponentTemplate({
-  "id": "PN1+SdGD",
-  "block": "[[[10,\"h2\"],[12],[1,\"\\n    Goodbye world\\n  \"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, Class2Declaration)
-
-const Class2Expression = _dangerouslySetComponentTemplate({
-  "id": "E/B0dLEA",
-  "block": "[[[10,\"h2\"],[12],[1,\"\\n    Goodbye world\"],[8,[32,0],null,null,null],[1,\"\\n  \"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [Class2Declaration],
-  "isStrictMode": true
-}, class extends Component {});
-
-const TOComponent = _dangerouslySetComponentTemplate({
-  "id": "fyKZX1dI",
-  "block": "[[[10,\"h3\"],[12],[1,\"Hello again world\"],[8,[32,0],null,null,null],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [Class2Expression],
-  "isStrictMode": true
-}, _TOComponent());
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/code.js
deleted file mode 100644
index 7758dc83..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/code.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-const unknownValue = null;
-const MaybeComponent = null;
-const maybeModifier = null;
-class MyComponent extends Component {
-  static template = hbs`<h1 {{maybeModifier}}>Hello world {{unknownValue}}<MaybeComponent /></h1>`;
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/options.json b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/options.json
deleted file mode 100644
index 46ff5e82..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/options.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "ember": true
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/output.js
deleted file mode 100644
index 842108dc..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/ember/output.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var _setComponentTemplate = Ember._setComponentTemplate;
-import Component from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-const unknownValue = null;
-const MaybeComponent = null;
-const maybeModifier = null;
-
-class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "jFBJ3iUu",
-  "block": "[[[11,\"h1\"],[4,[32,0],null,null],[12],[1,\"Hello world \"],[1,[32,1]],[8,[32,2],null,null,null],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [maybeModifier, unknownValue, MaybeComponent],
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/.babelrc b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/.babelrc
deleted file mode 100644
index bf9a68af..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "plugins": [
-    "@glimmer/babel-plugin-glimmer-env"
-  ]
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/code.js
deleted file mode 100644
index 1175602d..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/code.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-const unknownValue = null;
-const MaybeComponent = null;
-const maybeModifier = null;
-import { DEBUG } from '@glimmer/env';
-
-if (DEBUG) {
-  // do a thing
-}
-
-class MyComponent extends Component {
-  static template = hbs`<h1 {{maybeModifier}}>Hello world {{unknownValue}}<MaybeComponent /></h1>`;
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/output.js
deleted file mode 100644
index 3c20b72e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/glimmer-env/output.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-const unknownValue = null;
-const MaybeComponent = null;
-const maybeModifier = null;
-
-if (true
-/* DEBUG */
-) {// do a thing
-}
-
-class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "jFBJ3iUu",
-  "block": "[[[11,\"h1\"],[4,[32,0],null,null],[12],[1,\"Hello world \"],[1,[32,1]],[8,[32,2],null,null,null],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [maybeModifier, unknownValue, MaybeComponent],
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/.babelrc b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/.babelrc
deleted file mode 100644
index 65f8b13e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "plugins": [
-    "@babel/plugin-transform-modules-commonjs"
-  ]
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/code.js
deleted file mode 100644
index a5850712..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/code.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-class Class1Declaration extends Component {
-  static template = hbs`<h1>Hello world</h1>`;
-}
-
-const Class1Expression = class extends Component {
-  static template = hbs`<h1>Hello world</h1>`;
-}
-
-class Class2Declaration extends Component {
-  static template = hbs`<h2>
-    Goodbye world
-  </h2>`;
-}
-
-const Class2Expression = class extends Component {
-  static template = hbs`<h2>
-    Goodbye world<Class1Expression/>
-  </h2>`;
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/output.js
deleted file mode 100644
index c102fc07..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-commonjs/output.js
+++ /dev/null
@@ -1,41 +0,0 @@
-"use strict";
-
-var _core = require("@glimmer/core");
-
-var _component = _interopRequireDefault(require("@glimmerx/component"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class Class1Declaration extends _component.default {}
-
-(0, _core.setComponentTemplate)({
-  "id": "UnWFMClF",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, Class1Declaration)
-const Class1Expression = (0, _core.setComponentTemplate)({
-  "id": "UnWFMClF",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, class extends _component.default {});
-
-class Class2Declaration extends _component.default {}
-
-(0, _core.setComponentTemplate)({
-  "id": "PN1+SdGD",
-  "block": "[[[10,\"h2\"],[12],[1,\"\\n    Goodbye world\\n  \"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, Class2Declaration)
-const Class2Expression = (0, _core.setComponentTemplate)({
-  "id": "E/B0dLEA",
-  "block": "[[[10,\"h2\"],[12],[1,\"\\n    Goodbye world\"],[8,[32,0],null,null,null],[1,\"\\n  \"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [Class1Expression],
-  "isStrictMode": true
-}, class extends _component.default {});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/.babelrc b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/.babelrc
deleted file mode 100644
index 65f8b13e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "plugins": [
-    "@babel/plugin-transform-modules-commonjs"
-  ]
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/code.js
deleted file mode 100644
index 17f023be..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/code.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import { OtherComponent as ExternalComponent } from 'somewhere';
-
-class MyComponent extends Component {
-  static template = hbs`<h1>Hello <ExternalComponent/></h1>`
-}
-
-class OtherComponent extends Component {
-  static template = hbs`<h1>Hello <ExternalComponent/></h1>`
-}
-
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/output.js
deleted file mode 100644
index fd8401b6..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes-same-scope-var-commonjs/output.js
+++ /dev/null
@@ -1,29 +0,0 @@
-"use strict";
-
-var _core = require("@glimmer/core");
-
-var _component = _interopRequireDefault(require("@glimmerx/component"));
-
-var _somewhere = require("somewhere");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class MyComponent extends _component.default {}
-
-(0, _core.setComponentTemplate)({
-  "id": "rUcvMrKh",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello \"],[8,[32,0],null,null,null],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [_somewhere.OtherComponent],
-  "isStrictMode": true
-}, MyComponent)
-
-class OtherComponent extends _component.default {}
-
-(0, _core.setComponentTemplate)({
-  "id": "rUcvMrKh",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello \"],[8,[32,0],null,null,null],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [_somewhere.OtherComponent],
-  "isStrictMode": true
-}, OtherComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes/code.js
deleted file mode 100644
index 684580c8..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes/code.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-class Class1Declaration extends Component {
-  static template = hbs`<h1>Hello world</h1>`;
-}
-
-const Class1Expression = class extends Component {
-  static template = hbs`<h1>Hello world</h1>`;
-}
-
-class Class2Declaration extends Component {
-  static template = hbs`<h2>
-    Goodbye world
-  </h2>`;
-}
-
-const Class2Expression = class extends Component {
-  static template = hbs`<h2>
-    Goodbye world<Class1Expression/>
-  </h2>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes/output.js
deleted file mode 100644
index a5111d33..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiple-classes/output.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-
-class Class1Declaration extends Component {}
-
-_setComponentTemplate({
-  "id": "UnWFMClF",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, Class1Declaration)
-
-const Class1Expression = _setComponentTemplate({
-  "id": "UnWFMClF",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, class extends Component {});
-
-class Class2Declaration extends Component {}
-
-_setComponentTemplate({
-  "id": "PN1+SdGD",
-  "block": "[[[10,\"h2\"],[12],[1,\"\\n    Goodbye world\\n  \"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, Class2Declaration)
-
-const Class2Expression = _setComponentTemplate({
-  "id": "E/B0dLEA",
-  "block": "[[[10,\"h2\"],[12],[1,\"\\n    Goodbye world\"],[8,[32,0],null,null,null],[1,\"\\n  \"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [Class1Expression],
-  "isStrictMode": true
-}, class extends Component {});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiscope-tokens/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiscope-tokens/code.js
deleted file mode 100644
index 09761daf..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiscope-tokens/code.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import PhantomComponent from './PhantomComponent';
-import SecondPhantomComponent from './SecondPhantomComponent'
-
-
-class MyComponent extends Component {
-  static template = hbs`
-    <h1>Hello world 
-        {{#OtherComponent as  |SecondPhantomComponent|}}
-            <SecondPhantomComponent />
-            {{SecondPhantomComponent}}
-        {{/OtherComponent}}
-        <SecondPhantomComponent />
-    </h1>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiscope-tokens/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiscope-tokens/output.js
deleted file mode 100644
index eee21b42..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/multiscope-tokens/output.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import PhantomComponent from './PhantomComponent';
-import SecondPhantomComponent from './SecondPhantomComponent';
-
-class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "k3C9+Wms",
-  "block": "[[[1,\"\\n    \"],[10,\"h1\"],[12],[1,\"Hello world \\n\"],[6,[32,0],null,null,[[\"default\"],[[[[1,\"            \"],[8,[30,1],null,null,null],[1,\"\\n            \"],[1,[30,1]],[1,\"\\n\"]],[1]]]]],[1,\"        \"],[8,[32,1],null,null,null],[1,\"\\n    \"],[13]],[\"SecondPhantomComponent\"],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [OtherComponent, SecondPhantomComponent],
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/nested-classes/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/nested-classes/code.js
deleted file mode 100644
index 9068a52d..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/nested-classes/code.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-
-class MyComponent extends Component {
-  static template = hbs`<h1>Hello world<OtherComponent/></h1>`;
-
-  get ChildComponent() {
-    return class extends Component {
-      static template = hbs`<h2>Goodbye world<MyComponent/></h2>`;
-    }
-  }
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/nested-classes/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/nested-classes/output.js
deleted file mode 100644
index fa15e1c9..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/nested-classes/output.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-
-class MyComponent extends Component {
-  get ChildComponent() {
-    return _setComponentTemplate({
-      "id": "6fvPPcRc",
-      "block": "[[[10,\"h2\"],[12],[1,\"Goodbye world\"],[8,[32,0],null,null,null],[13]],[],false,[]]",
-      "moduleName": "(unknown template module)",
-      "scope": () => [MyComponent],
-      "isStrictMode": true
-    }, class extends Component {});
-  }
-
-}
-
-_setComponentTemplate({
-  "id": "7ZfYXn5W",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world\"],[8,[32,0],null,null,null],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [OtherComponent],
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/phantom-scope/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/phantom-scope/code.js
deleted file mode 100644
index b6d35dd2..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/phantom-scope/code.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import PhantomComponent from './PhantomComponent';
-
-
-class MyComponent extends Component {
-  static template = hbs`<h1>Hello world <OtherComponent /> </h1>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/phantom-scope/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/phantom-scope/output.js
deleted file mode 100644
index 7504667f..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/phantom-scope/output.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import PhantomComponent from './PhantomComponent';
-
-class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "vVhfCDf6",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello world \"],[8,[32,0],null,null,null],[1,\" \"],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [OtherComponent],
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/.babelrc b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/.babelrc
deleted file mode 100644
index 65f8b13e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "plugins": [
-    "@babel/plugin-transform-modules-commonjs"
-  ]
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/code.js
deleted file mode 100644
index 30d27490..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/code.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import YetAnotherComponent from './YetAnotherComponent';
-
-class MyComponent extends Component {
-  static template = hbs`<h1>Hello world</h1><OtherComponent/>`;
-}
-
-const MyComponentExpression = class extends Component {
-  static template = hbs`<YetAnotherComponent/>`;
-};
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/options.json b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/options.json
deleted file mode 100644
index 160eda7c..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "precompile": {
-    "disabled": true
-  }
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/output.js
deleted file mode 100644
index 1701894f..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-commonjs/output.js
+++ /dev/null
@@ -1,20 +0,0 @@
-"use strict";
-
-var _core = require("@glimmer/core");
-
-var _component = _interopRequireDefault(require("@glimmerx/component"));
-
-var _OtherComponent = _interopRequireDefault(require("./OtherComponent"));
-
-var _YetAnotherComponent = _interopRequireDefault(require("./YetAnotherComponent"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-class MyComponent extends _component.default {}
-
-(0, _core.setComponentTemplate)((0, _core.createTemplate)({
-  OtherComponent: _OtherComponent.default
-}, `<h1>Hello world</h1><OtherComponent/>`), MyComponent)
-const MyComponentExpression = (0, _core.setComponentTemplate)((0, _core.createTemplate)({
-  YetAnotherComponent: _YetAnotherComponent.default
-}, `<YetAnotherComponent/>`), class extends _component.default {});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/code.js
deleted file mode 100644
index 8f47ea07..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/code.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import YetAnotherComponent from './YetAnotherComponent';
-
-const template1 = hbs`<h1>Hello world</h1><OtherComponent/>`;
-const template2 = hbs`<YetAnotherComponent/>`;
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/options.json b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/options.json
deleted file mode 100644
index 160eda7c..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "precompile": {
-    "disabled": true
-  }
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/output.js
deleted file mode 100644
index 7003adc6..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled-hbs/output.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { createTemplate as _createTemplate } from "@glimmer/core";
-import { templateOnlyComponent as _templateOnlyComponent } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import OtherComponent from './OtherComponent';
-import YetAnotherComponent from './YetAnotherComponent';
-
-const template1 = _setComponentTemplate(_createTemplate({
-  OtherComponent: OtherComponent
-}, `<h1>Hello world</h1><OtherComponent/>`), _templateOnlyComponent());
-
-const template2 = _setComponentTemplate(_createTemplate({
-  YetAnotherComponent: YetAnotherComponent
-}, `<YetAnotherComponent/>`), _templateOnlyComponent());
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/code.js
deleted file mode 100644
index 30d27490..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/code.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import YetAnotherComponent from './YetAnotherComponent';
-
-class MyComponent extends Component {
-  static template = hbs`<h1>Hello world</h1><OtherComponent/>`;
-}
-
-const MyComponentExpression = class extends Component {
-  static template = hbs`<YetAnotherComponent/>`;
-};
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/options.json b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/options.json
deleted file mode 100644
index 160eda7c..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/options.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "precompile": {
-    "disabled": true
-  }
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/output.js
deleted file mode 100644
index 9b73cd74..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/precompile-disabled/output.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { createTemplate as _createTemplate } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import YetAnotherComponent from './YetAnotherComponent';
-
-class MyComponent extends Component {}
-
-_setComponentTemplate(_createTemplate({
-  OtherComponent: OtherComponent
-}, `<h1>Hello world</h1><OtherComponent/>`), MyComponent)
-
-const MyComponentExpression = _setComponentTemplate(_createTemplate({
-  YetAnotherComponent: YetAnotherComponent
-}, `<YetAnotherComponent/>`), class extends Component {});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/private-local-declarations/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/private-local-declarations/code.js
deleted file mode 100644
index dcc662b2..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/private-local-declarations/code.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-
-function root() {
-  function nested() {
-    class OtherComponent extends Component {
-      static template = hbs`Hello World`;
-    }
-
-    class MyComponent extends Component {
-      static template = hbs`<h1><OtherComponent/></h1>`
-    }
-  }
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/private-local-declarations/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/private-local-declarations/output.js
deleted file mode 100644
index 8fe5dec4..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/private-local-declarations/output.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-
-function root() {
-  function nested() {
-    class OtherComponent extends Component {}
-
-    _setComponentTemplate({
-      "id": "JlcONgyA",
-      "block": "[[[1,\"Hello World\"]],[],false,[]]",
-      "moduleName": "(unknown template module)",
-      "scope": null,
-      "isStrictMode": true
-    }, OtherComponent)
-
-    class MyComponent extends Component {}
-
-    _setComponentTemplate({
-      "id": "L6QsX14w",
-      "block": "[[[10,\"h1\"],[12],[8,[32,0],null,null,null],[13]],[],false,[]]",
-      "moduleName": "(unknown template module)",
-      "scope": () => [OtherComponent],
-      "isStrictMode": true
-    }, MyComponent)
-  }
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens-hbs/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens-hbs/code.js
deleted file mode 100644
index ad03d1fc..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens-hbs/code.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import PhantomComponent from './PhantomComponent';
-import SecondPhantomComponent from './SecondPhantomComponent'
-
-
-const hbsOnlyTemplate = hbs`
-<h1>Hello world
-    {{#OtherComponent as  |SecondPhantomComponent|}}
-        <SecondPhantomComponent />
-        {{SecondPhantomComponent}}
-    {{/OtherComponent}}
-    <OtherComponent as |PhantomComponent|>
-        <PhantomComponent />
-        {{PhantomComponent}}
-    </OtherComponent>
-</h1>`;
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens-hbs/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens-hbs/output.js
deleted file mode 100644
index 149f340e..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens-hbs/output.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { templateOnlyComponent as _templateOnlyComponent } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import OtherComponent from './OtherComponent';
-import PhantomComponent from './PhantomComponent';
-import SecondPhantomComponent from './SecondPhantomComponent';
-
-const hbsOnlyTemplate = _setComponentTemplate({
-  "id": "yGo9zi+C",
-  "block": "[[[1,\"\\n\"],[10,\"h1\"],[12],[1,\"Hello world\\n\"],[6,[32,0],null,null,[[\"default\"],[[[[1,\"        \"],[8,[30,1],null,null,null],[1,\"\\n        \"],[1,[30,1]],[1,\"\\n\"]],[1]]]]],[1,\"    \"],[8,[32,0],null,null,[[\"default\"],[[[[1,\"\\n        \"],[8,[30,2],null,null,null],[1,\"\\n        \"],[1,[30,2]],[1,\"\\n    \"]],[2]]]]],[1,\"\\n\"],[13]],[\"SecondPhantomComponent\",\"PhantomComponent\"],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [OtherComponent],
-  "isStrictMode": true
-}, _templateOnlyComponent());
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens/code.js
deleted file mode 100644
index 87d6e616..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens/code.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import PhantomComponent from './PhantomComponent';
-import SecondPhantomComponent from './SecondPhantomComponent'
-
-
-class MyComponent extends Component {
-  static template = hbs`
-    <h1>Hello world 
-        {{#OtherComponent as  |SecondPhantomComponent|}}
-            <SecondPhantomComponent />
-            {{SecondPhantomComponent}}
-        {{/OtherComponent}}
-        <OtherComponent as |PhantomComponent|>
-            <PhantomComponent /> 
-            {{PhantomComponent}}
-        </OtherComponent>
-    </h1>`;
-}
\ No newline at end of file
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens/output.js
deleted file mode 100644
index 57d3fc4d..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/scoped-tokens/output.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-import OtherComponent from './OtherComponent';
-import PhantomComponent from './PhantomComponent';
-import SecondPhantomComponent from './SecondPhantomComponent';
-
-class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "msP/XLKt",
-  "block": "[[[1,\"\\n    \"],[10,\"h1\"],[12],[1,\"Hello world \\n\"],[6,[32,0],null,null,[[\"default\"],[[[[1,\"            \"],[8,[30,1],null,null,null],[1,\"\\n            \"],[1,[30,1]],[1,\"\\n\"]],[1]]]]],[1,\"        \"],[8,[32,0],null,null,[[\"default\"],[[[[1,\"\\n            \"],[8,[30,2],null,null,null],[1,\" \\n            \"],[1,[30,2]],[1,\"\\n        \"]],[2]]]]],[1,\"\\n    \"],[13]],[\"SecondPhantomComponent\",\"PhantomComponent\"],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [OtherComponent],
-  "isStrictMode": true
-}, MyComponent)
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs-with-component-import/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs-with-component-import/code.js
deleted file mode 100644
index d982d511..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs-with-component-import/code.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { renderComponent } from '@glimmer/core';
-import IamGlimmerComponent, { hbs } from '@glimmerx/component';
-
-renderComponent(hbs`<h1>Hello {{@name}}</h1>`, {
-  args: {
-    name: 'Abhishek'
-  },
-  element: document.body
-});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs-with-component-import/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs-with-component-import/output.js
deleted file mode 100644
index 04370172..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs-with-component-import/output.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { templateOnlyComponent as _templateOnlyComponent } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import { renderComponent } from '@glimmer/core';
-import IamGlimmerComponent from '@glimmerx/component';
-renderComponent(_setComponentTemplate({
-  "id": "n6RNQdbP",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello \"],[1,[30,1]],[13]],[\"@name\"],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, _templateOnlyComponent()), {
-  args: {
-    name: 'Abhishek'
-  },
-  element: document.body
-});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs/code.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs/code.js
deleted file mode 100644
index b91003ec..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs/code.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { renderComponent } from '@glimmer/core';
-import { hbs } from '@glimmerx/component';
-
-renderComponent(hbs`<h1>Hello {{@name}}</h1>`, {
-  args: {
-    name: 'Abhishek'
-  },
-  element: document.body
-});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs/output.js b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs/output.js
deleted file mode 100644
index d1779d5c..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/template-only-hbs/output.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { templateOnlyComponent as _templateOnlyComponent } from "@glimmer/core";
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import { renderComponent } from '@glimmer/core';
-renderComponent(_setComponentTemplate({
-  "id": "n6RNQdbP",
-  "block": "[[[10,\"h1\"],[12],[1,\"Hello \"],[1,[30,1]],[13]],[\"@name\"],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": null,
-  "isStrictMode": true
-}, _templateOnlyComponent()), {
-  args: {
-    name: 'Abhishek'
-  },
-  element: document.body
-});
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/.babelrc b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/.babelrc
deleted file mode 100644
index 614696c6..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/.babelrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-typescript"
-  ]
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/code.ts b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/code.ts
deleted file mode 100644
index da99e0ac..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/code.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import Component, { hbs } from '@glimmerx/component';
-import { Dict } from '@glimmer/interfaces';
-import MaybeComponent from './somewhere-else';
-const unknownValue = null;
-const maybeModifier = null;
-
-export function foo(): Dict<unknown> {
-  return {};
-}
-
-export class MyComponent extends Component {
-  static template = hbs`<h1 {{maybeModifier}}>Hello world {{unknownValue}}<MaybeComponent /></h1>`;
-}
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/output.ts b/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/output.ts
deleted file mode 100644
index a15487e6..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/fixtures/typescript/output.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { setComponentTemplate as _setComponentTemplate } from "@glimmer/core";
-import Component from '@glimmerx/component';
-import MaybeComponent from './somewhere-else';
-const unknownValue = null;
-const maybeModifier = null;
-export function foo() {
-  return {};
-}
-export class MyComponent extends Component {}
-
-_setComponentTemplate({
-  "id": "jFBJ3iUu",
-  "block": "[[[11,\"h1\"],[4,[32,0],null,null],[12],[1,\"Hello world \"],[1,[32,1]],[8,[32,2],null,null,null],[13]],[],false,[]]",
-  "moduleName": "(unknown template module)",
-  "scope": () => [maybeModifier, unknownValue, MaybeComponent],
-  "isStrictMode": true
-}, MyComponent);
diff --git a/packages/@glimmerx/babel-plugin-component-templates/test/index.js b/packages/@glimmerx/babel-plugin-component-templates/test/index.js
deleted file mode 100644
index ec1682db..00000000
--- a/packages/@glimmerx/babel-plugin-component-templates/test/index.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import plugin from '..';
-import pluginTester from 'babel-plugin-tester';
-import path from 'path';
-import astTransformTestPluginOptions from './fixtures-options/precompile/ast-transform/options';
-import customPrecompileTestPluginOptions from './fixtures-options/precompile/custom/options';
-const { addNamed } = require('@babel/helper-module-imports');
-
-
-// For correct .babelrc detection inside the fixture directory we need to force babel's cwd and root to be the package root.
-// This will ensure that the tests will run correctly from the mono repo root or package root.
-const packageRootPath = path.resolve(__dirname, '..');
-
-pluginTester({
-  plugin,
-  babelOptions: {
-    cwd: packageRootPath,
-    root: packageRootPath
-  },
-  fixtures: path.join(__dirname, 'fixtures'),
-  tests: [
-    {
-      title: 'options.precompile : ast transfrom',
-      fixture: path.join(__dirname, 'fixtures-options/precompile/ast-transform/code.js'),
-      outputFixture: path.join(__dirname, 'fixtures-options/precompile/ast-transform/output.js'),
-      pluginOptions: astTransformTestPluginOptions,
-    },
-    {
-      title: 'options.precompile : ast transfrom hbs only',
-      fixture: path.join(__dirname, 'fixtures-options/precompile/ast-transform-hbs/code.js'),
-      outputFixture: path.join(__dirname, 'fixtures-options/precompile/ast-transform-hbs/output.js'),
-      pluginOptions: astTransformTestPluginOptions,
-    },
-    {
-      title: 'options.precompile : custom precompile',
-      fixture: path.join(__dirname, 'fixtures-options/precompile/custom/code.js'),
-      outputFixture: path.join(__dirname, 'fixtures-options/precompile/custom/output.js'),
-      pluginOptions: customPrecompileTestPluginOptions,
-    },
-  ],
-});
-
-pluginTester({
-  plugin: () => { return { name: 'ordering-of-plugins', visitor: {} }},
-  babelOptions: {
-    cwd: packageRootPath,
-    root: packageRootPath,
-    plugins: [
-      [addImport],
-      [plugin],
-      ['@babel/plugin-proposal-class-properties', { loose: true }]
-    ]
-  },
-  fixtures: path.join(__dirname, 'fixtures-compat')
-})
-
-pluginTester({
-  plugin: () => { return { name: 'ordering-of-plugins-precompile-options', visitor: {} }},
-  babelOptions: {
-    cwd: packageRootPath,
-    root: packageRootPath,
-    plugins: [
-      [addImport],
-      [plugin, {
-        "precompile": {
-          "disabled": true
-        }
-      }],
-      ['@babel/plugin-proposal-class-properties', { loose: true }]
-    ]
-  },
-  fixtures: path.join(__dirname, 'fixtures-compat-options')
-})
-
-
-function addImport() {
-  return {
-    name: 'introduce-import',
-    visitor: {
-      Program(path) {
-        addNamed(path, 't', 't-helper');
-        path.get('body').forEach(declaration => {
-          declaration.isImportDeclaration() &&
-            path.scope.registerDeclaration(declaration);
-        });
-      }
-    }
-  }
-}
diff --git a/packages/@glimmerx/babel-preset/index.js b/packages/@glimmerx/babel-preset/index.js
new file mode 100644
index 00000000..ed02f52d
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/index.js
@@ -0,0 +1,30 @@
+function defaultTo(value, defaultVal) {
+  return value === undefined ? defaultVal : value;
+}
+
+module.exports = function (api, options) {
+  let __loadPlugins = defaultTo(options.__loadPlugins, false);
+
+  return {
+    presets: [
+      [
+        __loadPlugins ? require('@glimmer/babel-preset') : require.resolve('@glimmer/babel-preset'),
+        {
+          ...options,
+          __customInlineTemplateModules: {
+            '@glimmerx/component': {
+              export: 'hbs',
+              useTemplateLiteralProposalSemantics: 1,
+            },
+
+            'TEMPLATE-TAG-MODULE': {
+              export: 'GLIMMER_TEMPLATE',
+              debugName: '<template>',
+              useTemplateTagProposalSemantics: 1,
+            },
+          },
+        },
+      ],
+    ],
+  };
+};
diff --git a/packages/@glimmerx/babel-preset/package.json b/packages/@glimmerx/babel-preset/package.json
new file mode 100644
index 00000000..62616271
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@glimmerx/babel-preset",
+  "version": "0.5.0",
+  "description": "GlimmerX Babel Preset",
+  "repository": "https://github.com/glimmerjs/glimmer.js",
+  "author": "Tom Dale <tom@tomdale.net>",
+  "license": "MIT",
+  "private": false,
+  "scripts": {
+    "test": "mocha -r esm"
+  },
+  "dependencies": {
+    "@glimmer/babel-preset": "2.0.0-beta.15"
+  },
+  "devDependencies": {
+    "babel-plugin-tester": "^6.4.0",
+    "chai": "^4.2.0",
+    "esm": "^3.2.25",
+    "mocha": "^6.2.0"
+  },
+  "volta": {
+    "node": "12.16.1",
+    "yarn": "1.22.4"
+  }
+}
diff --git a/packages/@glimmerx/babel-preset/test/fixtures/debug/.babelrc b/packages/@glimmerx/babel-preset/test/fixtures/debug/.babelrc
new file mode 100644
index 00000000..c74aa0d9
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/test/fixtures/debug/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["@glimmer/babel-preset", { "isDebug": true }]
+  ]
+}
diff --git a/packages/@glimmerx/babel-preset/test/fixtures/debug/code.js b/packages/@glimmerx/babel-preset/test/fixtures/debug/code.js
new file mode 100644
index 00000000..490e5ed3
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/test/fixtures/debug/code.js
@@ -0,0 +1,18 @@
+import { DEBUG } from '@glimmer/env';
+import { assert, deprecate } from '@glimmer/debug';
+import { precompileTemplate } from '@glimmer/core';
+import { tracked } from '@glimmer/tracking';
+
+if (DEBUG) {
+  console.log('DEBUG!');
+}
+
+assert(true, 'is true');
+deprecate('this is deprecated', false, { id: 'foo' });
+
+
+class Test {
+  @tracked bar = 123;
+}
+
+precompileTemplate('Hello, world!', { strictMode: true, scope: { Test } });
diff --git a/packages/@glimmerx/babel-preset/test/fixtures/debug/output.js b/packages/@glimmerx/babel-preset/test/fixtures/debug/output.js
new file mode 100644
index 00000000..fef94e2c
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/test/fixtures/debug/output.js
@@ -0,0 +1,50 @@
+var _class, _descriptor, _temp;
+
+import { createTemplateFactory as _createTemplateFactory } from "@glimmer/core";
+
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+
+function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }
+
+import { assert, deprecate } from '@glimmer/debug';
+import { tracked } from '@glimmer/tracking';
+
+if (true
+/* DEBUG */
+) {
+  console.log('DEBUG!');
+}
+
+(true && assert(true, 'is true'));
+(true && !(false) && deprecate('this is deprecated', false, {
+  id: 'foo'
+}));
+let Test = (_class = (_temp = class Test {
+  constructor() {
+    _initializerDefineProperty(this, "bar", _descriptor, this);
+  }
+
+}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return 123;
+  }
+})), _class);
+
+_createTemplateFactory(
+/*
+  Hello, world!
+*/
+{
+  "id": null,
+  "block": "[[[1,\"Hello, world!\"]],[],false,[]]",
+  "moduleName": "(unknown template module)",
+  "scope": null,
+  "isStrictMode": true
+});
diff --git a/packages/@glimmerx/babel-preset/test/fixtures/production/.babelrc b/packages/@glimmerx/babel-preset/test/fixtures/production/.babelrc
new file mode 100644
index 00000000..3b1e4c06
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/test/fixtures/production/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["@glimmer/babel-preset", { "isDebug": false }]
+  ]
+}
diff --git a/packages/@glimmerx/babel-preset/test/fixtures/production/code.js b/packages/@glimmerx/babel-preset/test/fixtures/production/code.js
new file mode 100644
index 00000000..490e5ed3
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/test/fixtures/production/code.js
@@ -0,0 +1,18 @@
+import { DEBUG } from '@glimmer/env';
+import { assert, deprecate } from '@glimmer/debug';
+import { precompileTemplate } from '@glimmer/core';
+import { tracked } from '@glimmer/tracking';
+
+if (DEBUG) {
+  console.log('DEBUG!');
+}
+
+assert(true, 'is true');
+deprecate('this is deprecated', false, { id: 'foo' });
+
+
+class Test {
+  @tracked bar = 123;
+}
+
+precompileTemplate('Hello, world!', { strictMode: true, scope: { Test } });
diff --git a/packages/@glimmerx/babel-preset/test/fixtures/production/output.js b/packages/@glimmerx/babel-preset/test/fixtures/production/output.js
new file mode 100644
index 00000000..ee4cfde2
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/test/fixtures/production/output.js
@@ -0,0 +1,50 @@
+var _class, _descriptor, _temp;
+
+import { createTemplateFactory as _createTemplateFactory } from "@glimmer/core";
+
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+
+function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }
+
+import { assert, deprecate } from '@glimmer/debug';
+import { tracked } from '@glimmer/tracking';
+
+if (false
+/* DEBUG */
+) {
+  console.log('DEBUG!');
+}
+
+(false && assert(true, 'is true'));
+(false && !(false) && deprecate('this is deprecated', false, {
+  id: 'foo'
+}));
+let Test = (_class = (_temp = class Test {
+  constructor() {
+    _initializerDefineProperty(this, "bar", _descriptor, this);
+  }
+
+}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [tracked], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return 123;
+  }
+})), _class);
+
+_createTemplateFactory(
+/*
+  Hello, world!
+*/
+{
+  "id": null,
+  "block": "[[[1,\"Hello, world!\"]],[],false,[]]",
+  "moduleName": "(unknown template module)",
+  "scope": null,
+  "isStrictMode": true
+});
diff --git a/packages/@glimmerx/babel-preset/test/index.js b/packages/@glimmerx/babel-preset/test/index.js
new file mode 100644
index 00000000..7e770f0a
--- /dev/null
+++ b/packages/@glimmerx/babel-preset/test/index.js
@@ -0,0 +1,19 @@
+import pluginTester from 'babel-plugin-tester';
+import path from 'path';
+
+// For correct .babelrc detection inside the fixture directory we need to force babel's cwd and root to be the package root.
+// This will ensure that the tests will run correctly from the mono repo root or package root.
+const packageRootPath = path.resolve(__dirname, '..');
+
+pluginTester({
+  plugin() {
+    return {
+      name: 'dummy plugin',
+    };
+  },
+  babelOptions: {
+    cwd: packageRootPath,
+    root: packageRootPath,
+  },
+  fixtures: path.join(__dirname, 'fixtures'),
+});
diff --git a/packages/@glimmerx/blueprint/files/.babelrc b/packages/@glimmerx/blueprint/files/.babelrc
new file mode 100644
index 00000000..d3e8ccf1
--- /dev/null
+++ b/packages/@glimmerx/blueprint/files/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@glimmerx/babel-preset", "@babel/preset-env", "@babel/preset-typescript"]
+}
diff --git a/packages/@glimmerx/blueprint/files/.babelrc.js b/packages/@glimmerx/blueprint/files/.babelrc.js
deleted file mode 100644
index 911713cf..00000000
--- a/packages/@glimmerx/blueprint/files/.babelrc.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = function (api) {
-  return {
-    plugins: [
-      ['@glimmer/babel-plugin-glimmer-env', { DEBUG: !api.env('production') }],
-      '@glimmerx/babel-plugin-component-templates',
-      ['@babel/plugin-proposal-decorators', { legacy: true }],
-      '@babel/plugin-proposal-class-properties',
-    ],
-    presets: ['@babel/preset-env', '@babel/preset-typescript'],
-  };
-};
diff --git a/packages/@glimmerx/blueprint/files/package.json b/packages/@glimmerx/blueprint/files/package.json
index 69337041..fc82fdae 100644
--- a/packages/@glimmerx/blueprint/files/package.json
+++ b/packages/@glimmerx/blueprint/files/package.json
@@ -16,18 +16,16 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-decorators": "^7.8.3",
     "@babel/preset-env": "^7.9.0",
     "@babel/preset-typescript": "^7.9.0",
-    "@glimmer/babel-plugin-glimmer-env": "~2.0.0-beta.12",
     "@glimmer/env": "^0.1.7",
-    "@glimmerx/babel-plugin-component-templates": "^0.2.3",
-    "@glimmerx/component": "^0.2.3",
-    "@glimmerx/core": "^0.2.3",
-    "@glimmerx/eslint-plugin": "^0.2.3",
-    "@glimmerx/helper": "^0.2.3",
-    "@glimmerx/modifier": "^0.2.3",
+    "@glimmerx/babel-plugin-preset": "^0.5.0",
+    "@glimmerx/component": "^0.5.0",
+    "@glimmerx/core": "^0.5.0",
+    "@glimmerx/eslint-plugin": "^0.5.0",
+    "@glimmerx/helper": "^0.5.0",
+    "@glimmerx/modifier": "^0.5.0",
+    "@glimmerx/webpack-loader": "^0.5.0",
     "@types/qunit": "^2.9.1",
     "@typescript-eslint/eslint-plugin": "^2.26.0",
     "@typescript-eslint/parser": "^2.26.0",
diff --git a/packages/@glimmerx/blueprint/files/src/App.js b/packages/@glimmerx/blueprint/files/src/App.gjs
similarity index 81%
rename from packages/@glimmerx/blueprint/files/src/App.js
rename to packages/@glimmerx/blueprint/files/src/App.gjs
index fc15fb0f..581c258e 100644
--- a/packages/@glimmerx/blueprint/files/src/App.js
+++ b/packages/@glimmerx/blueprint/files/src/App.gjs
@@ -1,4 +1,4 @@
-import Component, { hbs } from '@glimmerx/component';
+import Component from '@glimmerx/component';
 
 import logo from './logo.svg';
 import './App.css';
@@ -6,7 +6,7 @@ import './App.css';
 export default class App extends Component {
   logo = logo;
 
-  static template = hbs`
+  <template>
     <div id="intro">
       <img src={{this.logo}}/>
 
@@ -16,5 +16,5 @@ export default class App extends Component {
         and run tests by visiting <a href="./tests">/tests</a>
       </h3>
     </div>
-  `;
+  </template>
 }
diff --git a/packages/@glimmerx/blueprint/files/tests/util.ts b/packages/@glimmerx/blueprint/files/tests/util.ts
index bfe8ddc8..54204228 100644
--- a/packages/@glimmerx/blueprint/files/tests/util.ts
+++ b/packages/@glimmerx/blueprint/files/tests/util.ts
@@ -12,7 +12,8 @@ import 'qunit-dom/dist/qunit-dom';
 
 QUnit.start();
 
-const getTestRoot = (): HTMLElement => document.getElementById('qunit-fixture');
+const getTestRoot = (): HTMLElement =>
+  document.getElementById('qunit-fixture')!;
 
 // Setup QUnit.dom
 Object.defineProperty(QUnit.assert.dom, 'rootElement', { get: getTestRoot });
diff --git a/packages/@glimmerx/blueprint/files/webpack.config.js b/packages/@glimmerx/blueprint/files/webpack.config.js
new file mode 100644
index 00000000..cdb549ff
--- /dev/null
+++ b/packages/@glimmerx/blueprint/files/webpack.config.js
@@ -0,0 +1,72 @@
+const path = require('path');
+const glob = require('glob');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CopyPlugin = require('copy-webpack-plugin');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+
+module.exports = () => {
+  const IS_PRODUCTION = process.env.NODE_ENV === 'production';
+
+  const entry = {
+    app: './src/index.js',
+  };
+
+  const plugins = [
+    new CleanWebpackPlugin(),
+    new HtmlWebpackPlugin({
+      template: './index.html',
+      excludeChunks: ['tests'],
+    }),
+    new CopyPlugin([{ from: 'public', to: 'public' }]),
+  ];
+
+  // Include tests in development builds
+  if (!IS_PRODUCTION) {
+    entry.tests = glob.sync('./tests/**/*.test.js');
+
+    plugins.push(
+      new HtmlWebpackPlugin({
+        filename: 'tests/index.html',
+        template: './tests/index.html',
+        inject: 'head',
+        chunks: ['tests'],
+      })
+    );
+  }
+
+  return {
+    mode: IS_PRODUCTION ? 'production' : 'development',
+    entry,
+    plugins,
+    module: {
+      rules: [
+        {
+          test: /\.(js|mjs|ts|gts|gjs)$/,
+          use: ['babel-loader', '@glimmerx/webpack-loaderg'],
+        },
+        {
+          test: /\.css$/,
+          use: ['style-loader', 'css-loader'],
+        },
+        {
+          test: /\.(png|svg|jpg|gif)$/,
+          loader: 'file-loader',
+          options: {
+            outputPath: 'images',
+          },
+        },
+      ],
+    },
+    resolve: {
+      extensions: ['.ts', '.js', '.json', '.gts', '.gjs'],
+    },
+    output: {
+      filename: '[name].bundle.js',
+      path: path.resolve(__dirname, 'dist'),
+      publicPath: '/',
+    },
+    devServer: {
+      contentBase: path.resolve(__dirname, 'dist'),
+    },
+  };
+};
diff --git a/packages/@glimmerx/blueprint/package.json b/packages/@glimmerx/blueprint/package.json
index 13993bfc..d48f28d1 100644
--- a/packages/@glimmerx/blueprint/package.json
+++ b/packages/@glimmerx/blueprint/package.json
@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/glimmerjs/glimmer-experimental#readme",
   "dependencies": {
-    "@glimmer/blueprint": "2.0.0-beta.12",
+    "@glimmer/blueprint": "2.0.0-beta.15",
     "ember-cli-string-utils": "^1.1.0",
     "walk-sync": "^2.0.2"
   },
diff --git a/packages/@glimmerx/component/ember-addon-main.js b/packages/@glimmerx/component/ember-addon-main.js
index c27c001f..2e11da40 100644
--- a/packages/@glimmerx/component/ember-addon-main.js
+++ b/packages/@glimmerx/component/ember-addon-main.js
@@ -1,37 +1,56 @@
 'use strict';
+let VersionChecker = require('ember-cli-version-checker');
 
-function makePrecompileTemplate(templateCompiler) {
-  const precompileTemplate = (templateString, templateTokens, options) => {
-    let compiled = templateCompiler.precompile(templateString, options);
+module.exports = {
+  name: require('./package').name,
 
-    return `Ember.HTMLBars.template(${compiled})`;
-  };
+  included() {
+    this._super.included.apply(this, arguments);
 
-  precompileTemplate.baseDir = () => __dirname;
+    let emberChecker = new VersionChecker(this.project).for('ember-source');
+    let htmlbarsChecker = new VersionChecker(this.parent).for('ember-cli-htmlbars');
 
-  return precompileTemplate;
-}
+    if (!emberChecker.gte('3.25.0')) {
+      throw new Error('@glimmerx/component requires ember-source 3.25.0 or higher');
+    }
 
-module.exports = {
-  name: require('./package').name,
+    if (!htmlbarsChecker.gte('5.4.0')) {
+      throw new Error(
+        '@glimmerx/component requires ember-cli-htmlbars 5.4.0 or higher as a peer dependency'
+      );
+    }
 
-  included(parent) {
-    this._super.included.apply(this, arguments);
+    let addonOptions = this._getAddonOptions();
+
+    let emberCliHtmlbarsOptions = (addonOptions['ember-cli-htmlbars'] =
+      addonOptions['ember-cli-htmlbars'] || {});
 
-    let { hasPlugin, addPlugin } = require('ember-cli-babel-plugin-helpers');
+    emberCliHtmlbarsOptions._customInlineModules = {
+      '@glimmerx/component': {
+        export: 'hbs',
+        useTemplateLiteralProposalSemantics: 1,
+      },
 
-    if (!hasPlugin(parent, '@glimmerx/babel-plugin-component-templates')) {
-      const ember = this.project.findAddonByName('ember-source');
-      const templateCompiler = require(ember.absolutePaths.templateCompiler);
+      'TEMPLATE-TAG-MODULE': {
+        export: 'GLIMMER_TEMPLATE',
+        debugName: '<template>',
+        useTemplateTagProposalSemantics: 1,
+      },
+    };
 
-      addPlugin(parent, [
-        require.resolve('@glimmerx/babel-plugin-component-templates'),
-        {
-          ember: true,
+    this.templateCompilerPath = this.parent.addons
+      .find((a) => a.name === 'ember-cli-htmlbars')
+      .templateCompilerPath();
+  },
+
+  _getAddonOptions() {
+    return (this.parent && this.parent.options) || (this.app && this.app.options) || {};
+  },
 
-          precompileTemplate: makePrecompileTemplate(templateCompiler),
-        },
-      ]);
+  setupPreprocessorRegistry(type, registry) {
+    if (type === 'parent') {
+      let TemplateImportPreprocessor = require('ember-template-imports/lib/preprocessor-plugin');
+      registry.add('js', new TemplateImportPreprocessor(() => this.templateCompilerPath));
     }
   },
 };
diff --git a/packages/@glimmerx/component/package.json b/packages/@glimmerx/component/package.json
index 95c4494d..07d9be6e 100644
--- a/packages/@glimmerx/component/package.json
+++ b/packages/@glimmerx/component/package.json
@@ -15,11 +15,13 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@glimmer/component": "2.0.0-beta.12",
-    "@glimmer/tracking": "2.0.0-beta.12",
-    "@glimmerx/babel-plugin-component-templates": "^0.5.0",
-    "ember-cli-babel": "^7.17.2",
-    "ember-cli-babel-plugin-helpers": "^1.1.0"
+    "@glimmer/component": "2.0.0-beta.15",
+    "@glimmer/tracking": "2.0.0-beta.15",
+    "ember-cli-babel": "^7.26.2",
+    "ember-cli-babel-plugin-helpers": "^1.1.0",
+    "ember-cli-htmlbars": "^5.7.1",
+    "ember-cli-version-checker": "5.1.2",
+    "ember-template-imports": "^1.1.1"
   },
   "volta": {
     "node": "12.10.0",
diff --git a/packages/@glimmerx/core/index.ts b/packages/@glimmerx/core/index.ts
index 533d78ad..53e48140 100644
--- a/packages/@glimmerx/core/index.ts
+++ b/packages/@glimmerx/core/index.ts
@@ -1,6 +1,6 @@
 import FunctionalModifierManager from './src/functional-modifier-manager';
 import FunctionalHelperManager from './src/functional-helper-manager';
-import { setModifierManager, setHelperManager } from '@glimmer/manager';
+import { setModifierManager, setHelperManager } from '@glimmer/core';
 
 const FUNCTIONAL_MODIFIER_MANAGER = new FunctionalModifierManager();
 const FUNCTIONAL_MODIFIER_MANAGER_FACTORY = () => FUNCTIONAL_MODIFIER_MANAGER;
@@ -29,6 +29,5 @@ export {
   setModifierManager,
   setOwner,
   getOwner,
-  TemplateArgs,
   didRender,
 } from '@glimmer/core';
diff --git a/packages/@glimmerx/core/package.json b/packages/@glimmerx/core/package.json
index 8ae6d2cb..14aae70c 100644
--- a/packages/@glimmerx/core/package.json
+++ b/packages/@glimmerx/core/package.json
@@ -17,9 +17,9 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@glimmer/core": "2.0.0-beta.12",
-    "@glimmer/interfaces": "0.73.0",
-    "@glimmer/manager": "0.73.0"
+    "@glimmer/core": "2.0.0-beta.15",
+    "@glimmer/interfaces": "0.77.3",
+    "@glimmer/manager": "0.77.3"
   },
   "volta": {
     "node": "12.10.0",
diff --git a/packages/@glimmerx/core/src/functional-helper-manager.ts b/packages/@glimmerx/core/src/functional-helper-manager.ts
index 3b4c4c88..660bb7dc 100644
--- a/packages/@glimmerx/core/src/functional-helper-manager.ts
+++ b/packages/@glimmerx/core/src/functional-helper-manager.ts
@@ -19,7 +19,7 @@ export default class FunctionalHelperManager implements HelperManager<Functional
     return fn(...args.positional);
   }
 
-  getDebugName(fn: Function) {
+  getDebugName(fn: { name?: string }) {
     return fn.name || '(anonymous function)';
   }
 }
diff --git a/packages/@glimmerx/core/src/functional-modifier-manager.ts b/packages/@glimmerx/core/src/functional-modifier-manager.ts
index 44504135..51c2775f 100644
--- a/packages/@glimmerx/core/src/functional-modifier-manager.ts
+++ b/packages/@glimmerx/core/src/functional-modifier-manager.ts
@@ -1,13 +1,12 @@
 import { modifierCapabilities, ModifierManager } from '@glimmer/core';
 import { Arguments } from '@glimmer/interfaces';
-import { SimpleElement } from '@simple-dom/interface';
 
 type SimpleModifierFn = (...args: unknown[]) => (() => void) | undefined;
 
 interface FunctionalModifierState {
   fn: SimpleModifierFn;
   args: Arguments;
-  element: SimpleElement | undefined;
+  element: Element | undefined;
   destructor: (() => void) | undefined;
 }
 
@@ -17,7 +16,8 @@ export default class FunctionalModifierManager implements ModifierManager<Functi
   createModifier(fn: SimpleModifierFn, args: Arguments): FunctionalModifierState {
     return { fn, args, element: undefined, destructor: undefined };
   }
-  installModifier(state: FunctionalModifierState, element: SimpleElement) {
+
+  installModifier(state: FunctionalModifierState, element: Element) {
     state.element = element;
     this.setupModifier(state);
   }
diff --git a/packages/@glimmerx/core/src/owner.ts b/packages/@glimmerx/core/src/owner.ts
index a8698b2a..6bbf9722 100644
--- a/packages/@glimmerx/core/src/owner.ts
+++ b/packages/@glimmerx/core/src/owner.ts
@@ -9,7 +9,7 @@ export interface FactoryIdentifier {
 
 const SERVICES_CACHE = Symbol('Services');
 
-function isConstructor(func) {
+function isConstructor(func: unknown): func is { new (owner: Owner): unknown } {
   return (
     (func && typeof func === 'function' && func.prototype && func.prototype.constructor) === func
   );
diff --git a/packages/@glimmerx/core/src/renderComponent.ts b/packages/@glimmerx/core/src/renderComponent.ts
index 6709ca7c..3d659868 100644
--- a/packages/@glimmerx/core/src/renderComponent.ts
+++ b/packages/@glimmerx/core/src/renderComponent.ts
@@ -28,7 +28,7 @@ export default function renderComponent(
 
   const { element, args, services, rehydrate } = optionsOrElement;
 
-  const owner = new Owner(services ?? {});
+  const owner = new Owner(services || {});
 
   return glimmerJsRenderComponent(ComponentClass, { element, args, owner, rehydrate });
 }
diff --git a/packages/@glimmerx/core/tests/modifier-tests.ts b/packages/@glimmerx/core/tests/modifier-tests.ts
index 6bb136bc..7f9fd68e 100644
--- a/packages/@glimmerx/core/tests/modifier-tests.ts
+++ b/packages/@glimmerx/core/tests/modifier-tests.ts
@@ -25,8 +25,7 @@ module('Modifier Tests', () => {
       'the component was rendered'
     );
 
-    const button = element.querySelector('button')!;
-    button.click();
+    element.querySelector('button')!.click();
 
     await didRender();
     assert.strictEqual(
@@ -39,7 +38,7 @@ module('Modifier Tests', () => {
   test('supports simple functions as modifiers', async (assert) => {
     assert.expect(3);
 
-    function myModifier(element, arg1, arg2) {
+    function myModifier(element: Element, arg1: string, arg2: string) {
       assert.equal(arg1, 'foo');
       assert.equal(arg2, 'bar');
       assert.ok(element.classList.contains('test-element'));
diff --git a/packages/@glimmerx/core/tests/render-tests.ts b/packages/@glimmerx/core/tests/render-tests.ts
index 0232fc9d..108dd1c0 100644
--- a/packages/@glimmerx/core/tests/render-tests.ts
+++ b/packages/@glimmerx/core/tests/render-tests.ts
@@ -192,17 +192,13 @@ export default function renderTests(
       });
 
       class Meta {
-        id;
-
-        constructor(id) {
-          this.id = id;
-        }
+        constructor(public id: string) {}
       }
 
       const meta = new Meta('ABC123');
 
       class Request extends Service {
-        @service context;
+        @service context: { locale: string };
 
         get locale() {
           return this.context.locale;
@@ -210,7 +206,7 @@ export default function renderTests(
       }
 
       class Locale extends Service {
-        @service request;
+        @service request: Request;
 
         get currentLocale() {
           return this.request.locale;
diff --git a/packages/@glimmerx/eslint-plugin/lib/rules/template-vars.js b/packages/@glimmerx/eslint-plugin/lib/rules/template-vars.js
index 5760aba0..0b6fbf0f 100644
--- a/packages/@glimmerx/eslint-plugin/lib/rules/template-vars.js
+++ b/packages/@glimmerx/eslint-plugin/lib/rules/template-vars.js
@@ -1,4 +1,4 @@
-const { getTemplateTokens } = require('@glimmerx/babel-plugin-component-templates');
+const { getTemplateLocals } = require('@glimmer/syntax');
 
 module.exports = {
   docs: {
@@ -21,7 +21,7 @@ module.exports = {
       {
         type: 'object',
         properties: {
-          // ['if', 'each', 'unless', 'has-block', 'yield', 'component, 'with'] will always be 'nativeTokens'
+          // keywords will will always be 'nativeTokens'
           // but you may add more via this configuration. One use-case is if a token is added to the
           // Javascript code implicitly (such as via a babel transform)
           nativeTokens: {
@@ -36,16 +36,11 @@ module.exports = {
     ],
   },
   create(context) {
-    const defaultNativeTokens = ['if', 'each', 'unless', 'has-block', 'yield', 'component', 'with'];
     let isGlimmerSfc = false;
     let hbsImportId;
 
     const [mode = 'all', configOpts] = context.options;
-    let nativeTokens = defaultNativeTokens;
-
-    if (configOpts && configOpts.nativeTokens) {
-      nativeTokens = nativeTokens.concat(configOpts.nativeTokens);
-    }
+    let nativeTokens = (configOpts && configOpts.nativeTokens) || [];
 
     return {
       ImportSpecifier(node) {
@@ -66,10 +61,10 @@ module.exports = {
         const templateElementNode = node.quasi.quasis[0];
         const templateString = templateElementNode.value.raw;
 
-        const templateScopeTokens = getTemplateTokens(templateString, nativeTokens);
+        const templateScopeTokens = getTemplateLocals(templateString);
         templateScopeTokens.forEach((token) => {
           const isTokenPresent = context.markVariableAsUsed(token);
-          if (!isTokenPresent && mode === 'all') {
+          if (!isTokenPresent && !nativeTokens.includes(token) && mode === 'all') {
             context.report({
               data: {
                 token,
diff --git a/packages/@glimmerx/eslint-plugin/package.json b/packages/@glimmerx/eslint-plugin/package.json
index dddd6718..6361cbda 100644
--- a/packages/@glimmerx/eslint-plugin/package.json
+++ b/packages/@glimmerx/eslint-plugin/package.json
@@ -19,10 +19,8 @@
     "eslint": "^6.8.0",
     "mocha": "^7.1.1"
   },
-  "dependencies": {
-    "@glimmerx/babel-plugin-component-templates": "^0.5.0"
-  },
   "peerDependencies": {
+    "@glimmer/syntax": "^0.77.5",
     "babel-eslint": "^10.1.0",
     "eslint": "^6.8.0"
   },
diff --git a/packages/@glimmerx/helper/addon/-private/helper.js b/packages/@glimmerx/helper/addon/-private/helper.js
index 7a522a80..50ddd317 100644
--- a/packages/@glimmerx/helper/addon/-private/helper.js
+++ b/packages/@glimmerx/helper/addon/-private/helper.js
@@ -1,3 +1,46 @@
-export function helper() {
-  throw new Error('helper() has not been implemented in Ember yet.');
+import { setHelperManager, capabilities } from '@ember/helper';
+
+class BasicHelperManager {
+  capabilities = capabilities('3.23', {
+    hasValue: true,
+  });
+
+  constructor(owner) {
+    this.owner = owner;
+  }
+
+  createHelper(fn, args) {
+    const { owner } = this;
+
+    const ownerProxy = new Proxy(
+      {},
+      {
+        get(_target, key) {
+          return owner && owner.lookup({ type: 'service', name: key });
+        },
+      }
+    );
+
+    return {
+      fn,
+      args,
+      ownerProxy,
+    };
+  }
+
+  getValue({ fn, args, ownerProxy }) {
+    return fn(args.positional, args.named, { services: ownerProxy });
+  }
+
+  getDebugName(fn) {
+    return fn.name || '(anonymous function)';
+  }
+}
+
+const basicHelperManagerFactory = (owner) => new BasicHelperManager(owner);
+
+export function helper(helperFunction) {
+  setHelperManager(basicHelperManagerFactory, helperFunction);
+
+  return helperFunction;
 }
diff --git a/packages/@glimmerx/helper/addon/index.js b/packages/@glimmerx/helper/addon/index.js
index f7c7cbdd..39b1ef6e 100644
--- a/packages/@glimmerx/helper/addon/index.js
+++ b/packages/@glimmerx/helper/addon/index.js
@@ -1,7 +1,2 @@
 export { helper, Helper } from './-private/helper';
-
-export function fn() {
-  throw new Error(
-    'Attempted to call {{fn}} directly. {{fn}} is built in in Ember, so it should automatically resolve. This function is for interop with Glimmer.js only.'
-  );
-}
+export { fn } from '@ember/helper';
diff --git a/packages/@glimmerx/helper/package.json b/packages/@glimmerx/helper/package.json
index f049cc4f..3fcbe225 100644
--- a/packages/@glimmerx/helper/package.json
+++ b/packages/@glimmerx/helper/package.json
@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@glimmerx/core": "0.5.0",
-    "@glimmer/helper": "2.0.0-beta.12",
-    "@glimmer/interfaces": "0.73.0",
-    "ember-cli-babel": "^7.18.0"
+    "@glimmer/helper": "2.0.0-beta.15",
+    "@glimmer/interfaces": "0.77.3",
+    "ember-cli-babel": "7.26.2"
   },
   "volta": {
     "node": "12.10.0",
diff --git a/packages/@glimmerx/helper/src/helper.ts b/packages/@glimmerx/helper/src/helper.ts
index 24f8167e..efc5124e 100644
--- a/packages/@glimmerx/helper/src/helper.ts
+++ b/packages/@glimmerx/helper/src/helper.ts
@@ -1,14 +1,8 @@
-import {
-  setHelperManager,
-  HelperManager,
-  helperCapabilities,
-  Owner,
-  TemplateArgs,
-} from '@glimmerx/core';
-import { Dict } from '@glimmer/interfaces';
+import { setHelperManager, HelperManager, helperCapabilities, Owner } from '@glimmerx/core';
+import { Arguments } from '@glimmer/interfaces';
 
 interface HelperOptions {
-  services: Dict<unknown>;
+  services: Record<string, unknown>;
 }
 
 export type Helper<T = unknown, U = unknown> = (
@@ -19,8 +13,8 @@ export type Helper<T = unknown, U = unknown> = (
 
 interface BasicHelperBucket {
   fn: Helper;
-  args: TemplateArgs;
-  ownerProxy: Dict<unknown>;
+  args: Arguments;
+  ownerProxy: Record<string, unknown>;
 }
 
 class BasicHelperManager implements HelperManager<BasicHelperBucket> {
@@ -30,7 +24,7 @@ class BasicHelperManager implements HelperManager<BasicHelperBucket> {
 
   constructor(private owner: Owner | undefined) {}
 
-  createHelper(fn: Helper, args: TemplateArgs) {
+  createHelper(fn: Helper, args: Arguments) {
     const { owner } = this;
 
     const ownerProxy = new Proxy(
@@ -53,7 +47,7 @@ class BasicHelperManager implements HelperManager<BasicHelperBucket> {
     return fn(args.positional, args.named, { services: ownerProxy });
   }
 
-  getDebugName(fn: Function) {
+  getDebugName(fn: { name: string }) {
     return fn.name || '(anonymous function)';
   }
 }
diff --git a/packages/@glimmerx/modifier/addon/index.js b/packages/@glimmerx/modifier/addon/index.js
index d6c9f1f0..4ea26448 100644
--- a/packages/@glimmerx/modifier/addon/index.js
+++ b/packages/@glimmerx/modifier/addon/index.js
@@ -1,7 +1,2 @@
 export { action } from '@ember/object';
-
-export function on() {
-  throw new Error(
-    'Attempted to call {{on}} directly. {{on}} is built in in Ember, so it should automatically resolve. This function is for interop with Glimmer.js only.'
-  );
-}
+export { on } from '@ember/modifier';
diff --git a/packages/@glimmerx/modifier/package.json b/packages/@glimmerx/modifier/package.json
index 964483ad..0e519e38 100644
--- a/packages/@glimmerx/modifier/package.json
+++ b/packages/@glimmerx/modifier/package.json
@@ -20,9 +20,9 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@glimmer/core": "2.0.0-beta.12",
-    "@glimmer/modifier": "2.0.0-beta.12",
-    "ember-cli-babel": "^7.18.0"
+    "@glimmer/core": "2.0.0-beta.15",
+    "@glimmer/modifier": "2.0.0-beta.15",
+    "ember-cli-babel": "7.26.2"
   },
   "volta": {
     "node": "12.10.0",
diff --git a/packages/@glimmerx/service/index.ts b/packages/@glimmerx/service/index.ts
index f2455ad4..d6e47787 100644
--- a/packages/@glimmerx/service/index.ts
+++ b/packages/@glimmerx/service/index.ts
@@ -3,7 +3,7 @@ export { service } from './src/decorator';
 import { setOwner } from '@glimmerx/core';
 
 export default class Service {
-  constructor(owner) {
+  constructor(owner: object) {
     setOwner(this, owner);
   }
 }
diff --git a/packages/@glimmerx/service/package.json b/packages/@glimmerx/service/package.json
index 1e42ae76..a809bf2c 100644
--- a/packages/@glimmerx/service/package.json
+++ b/packages/@glimmerx/service/package.json
@@ -21,8 +21,9 @@
   },
   "dependencies": {
     "@glimmerx/core": "0.5.0",
+    "@glimmer/debug": "2.0.0-beta.15",
     "@glimmer/env": "^0.1.7",
-    "ember-cli-babel": "^7.18.0"
+    "ember-cli-babel": "7.26.2"
   },
   "volta": {
     "node": "12.10.0",
diff --git a/packages/@glimmerx/service/src/decorator.ts b/packages/@glimmerx/service/src/decorator.ts
index 42c0fbc3..b397019f 100644
--- a/packages/@glimmerx/service/src/decorator.ts
+++ b/packages/@glimmerx/service/src/decorator.ts
@@ -1,4 +1,5 @@
 import { Owner, getOwner } from '@glimmerx/core';
+import { assert } from '@glimmer/debug';
 
 function makeServiceDecorator(
   name: string
@@ -7,7 +8,14 @@ function makeServiceDecorator(
     enumerable: true,
     configurable: false,
     get() {
-      return getOwner<Owner>(this).lookup({ type: 'service', name });
+      const owner = getOwner<Owner>(this);
+
+      assert(
+        owner,
+        `Attempted to lookup the ${name} service on an instance of ${this}, but there was no owner set on that object`
+      );
+
+      return owner.lookup({ type: 'service', name });
     },
   });
 }
diff --git a/packages/@glimmerx/ssr/package.json b/packages/@glimmerx/ssr/package.json
index f20f74b0..8fdd9aeb 100644
--- a/packages/@glimmerx/ssr/package.json
+++ b/packages/@glimmerx/ssr/package.json
@@ -15,8 +15,8 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@glimmer/interfaces": "0.73.0",
-    "@glimmer/ssr": "2.0.0-beta.12",
+    "@glimmer/interfaces": "0.77.3",
+    "@glimmer/ssr": "2.0.0-beta.15",
     "@glimmerx/core": "^0.5.0"
   },
   "volta": {
diff --git a/packages/@glimmerx/ssr/src/render.ts b/packages/@glimmerx/ssr/src/render.ts
index 2c2e6212..439b82f7 100644
--- a/packages/@glimmerx/ssr/src/render.ts
+++ b/packages/@glimmerx/ssr/src/render.ts
@@ -14,7 +14,7 @@ export function renderToString(
   definition: ComponentDefinition,
   { args, serializer, services, rehydrate }: RenderOptions = {}
 ): Promise<string> {
-  const owner = new Owner(services ?? {});
+  const owner = new Owner(services || {});
 
   return glimmerJsRenderToString(definition, { args, serializer, owner, rehydrate });
 }
@@ -24,7 +24,7 @@ export function renderToStream(
   definition: ComponentDefinition,
   { args, serializer, services, rehydrate }: RenderOptions = {}
 ): void {
-  const owner = new Owner(services ?? {});
+  const owner = new Owner(services || {});
 
   glimmerJsRenderToStream(stream, definition, { args, serializer, owner, rehydrate });
 }
diff --git a/packages/@glimmerx/ssr/tests/render-options-tests.ts b/packages/@glimmerx/ssr/tests/render-options-tests.ts
index 5a775cb0..d55de0a2 100644
--- a/packages/@glimmerx/ssr/tests/render-options-tests.ts
+++ b/packages/@glimmerx/ssr/tests/render-options-tests.ts
@@ -30,17 +30,13 @@ QUnit.module('@glimmer/ssr rendering', () => {
     });
 
     class Meta {
-      id;
-
-      constructor(id) {
-        this.id = id;
-      }
+      constructor(public id: string) {}
     }
 
     const meta = new Meta('ABC123');
 
     class Request extends Service {
-      @service context;
+      @service context: { locale: string };
 
       get locale() {
         return this.context.locale;
@@ -48,7 +44,7 @@ QUnit.module('@glimmer/ssr rendering', () => {
     }
 
     class Locale extends Service {
-      @service request;
+      @service request: Request;
 
       get currentLocale() {
         return this.request.locale;
diff --git a/packages/@glimmerx/storybook/package.json b/packages/@glimmerx/storybook/package.json
index 1522c66c..f980206d 100644
--- a/packages/@glimmerx/storybook/package.json
+++ b/packages/@glimmerx/storybook/package.json
@@ -52,12 +52,10 @@
     "global": "^4.4.0"
   },
   "peerDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-decorators": "^7.8.3",
-    "@glimmer/babel-plugin-strict-template-precompile": "2.0.0-beta.12",
-    "@glimmerx/babel-plugin-component-templates": "^0.5.0",
+    "@glimmerx/babel-preset": "^0.5.0",
     "@glimmerx/component": "^0.5.0",
     "@glimmerx/core": "^0.5.0",
+    "@glimmerx/webpack-loader": "^0.5.0",
     "babel-loader": "^8.1.0"
   },
   "engines": {
diff --git a/packages/@glimmerx/storybook/src/server/framework-preset-glimmer.ts b/packages/@glimmerx/storybook/src/server/framework-preset-glimmer.ts
index 63dbe79a..7a6671e7 100644
--- a/packages/@glimmerx/storybook/src/server/framework-preset-glimmer.ts
+++ b/packages/@glimmerx/storybook/src/server/framework-preset-glimmer.ts
@@ -12,55 +12,51 @@ export function webpack(config: Configuration) {
       rules: [
         ...configRules,
         {
-          test: /\.ts$/,
-          use: {
-            loader: 'babel-loader',
-            options: {
-              presets: [
-                [
-                  '@babel/preset-env',
-                  {
-                    modules: false,
-                  },
+          test: /\.(ts|gts)$/,
+          use: [
+            {
+              loader: 'babel-loader',
+              options: {
+                presets: [
+                  '@glimmerx/babel-preset',
+                  [
+                    '@babel/preset-env',
+                    {
+                      modules: false,
+                    },
+                  ],
+                  '@babel/preset-typescript',
                 ],
-                '@babel/preset-typescript',
-              ],
-              plugins: [
-                '@glimmerx/babel-plugin-component-templates',
-                '@glimmer/babel-plugin-strict-template-precompile',
-                ['@babel/plugin-proposal-decorators', { legacy: true }],
-                ['@babel/plugin-proposal-class-properties', { loose: true }],
-              ],
+              },
             },
-          },
+            '@glimmerx/webpack-loader',
+          ],
         },
         {
-          test: /\.(js)$/,
-          use: {
-            loader: 'babel-loader',
-            options: {
-              presets: [
-                [
-                  '@babel/preset-env',
-                  {
-                    modules: false,
-                  },
+          test: /\.(js|gjs)$/,
+          use: [
+            {
+              loader: 'babel-loader',
+              options: {
+                presets: [
+                  '@glimmerx/babel-preset',
+                  [
+                    '@babel/preset-env',
+                    {
+                      modules: false,
+                    },
+                  ],
                 ],
-              ],
-              plugins: [
-                '@glimmerx/babel-plugin-component-templates',
-                '@glimmer/babel-plugin-strict-template-precompile',
-                ['@babel/plugin-proposal-decorators', { legacy: true }],
-                ['@babel/plugin-proposal-class-properties', { loose: true }],
-              ],
+              },
             },
-          },
+            '@glimmerx/webpack-loader',
+          ],
         },
       ],
     },
     resolve: {
       plugins: [],
-      extensions: ['.js', '.ts'],
+      extensions: ['.js', '.ts', '.gjs', '.gts'],
       alias: {
         '@glimmerx/core$': require.resolve('@glimmerx/core'),
         '@glimmerx/component$': require.resolve('@glimmerx/component'),
diff --git a/packages/@glimmerx/webpack-loader/index.js b/packages/@glimmerx/webpack-loader/index.js
new file mode 100644
index 00000000..fb73c319
--- /dev/null
+++ b/packages/@glimmerx/webpack-loader/index.js
@@ -0,0 +1,68 @@
+require('validate-peer-dependencies')(__dirname);
+
+const { preprocessEmbeddedTemplates } = require('babel-plugin-htmlbars-inline-precompile');
+
+const { getOptions } = require('loader-utils');
+const { validate } = require('schema-utils');
+
+const getTemplateLocalsRequirePath = require.resolve('@glimmer/syntax');
+
+const schema = {
+  type: 'object',
+  properties: {
+    test: {
+      type: 'string',
+    },
+  },
+};
+
+const TEMPLATE_TAG_CONFIG = {
+  getTemplateLocalsRequirePath,
+  getTemplateLocalsExportPath: 'getTemplateLocals',
+
+  templateTag: 'template',
+  templateTagReplacement: 'GLIMMER_TEMPLATE',
+
+  includeSourceMaps: true,
+  includeTemplateTokens: true,
+};
+
+const TEMPLATE_LITERAL_CONFIG = {
+  getTemplateLocalsRequirePath,
+  getTemplateLocalsExportPath: 'getTemplateLocals',
+
+  importIdentifier: 'hbs',
+  importPath: '@glimmerx/component',
+
+  includeSourceMaps: true,
+  includeTemplateTokens: true,
+};
+
+module.exports = function (source) {
+  const options = getOptions(this);
+
+  validate(schema, options, {
+    name: 'Glimmer Embedded Template Loader',
+    baseDataPath: 'options',
+  });
+
+  let filename = this._module.resource;
+
+  if (filename.match(/\.(js|ts)$/)) {
+    let { output } = preprocessEmbeddedTemplates(
+      source,
+      Object.assign({ relativePath: filename }, TEMPLATE_LITERAL_CONFIG)
+    );
+
+    return output;
+  } else if (filename.match(/\.(gjs|gts)$/)) {
+    let { output } = preprocessEmbeddedTemplates(
+      source,
+      Object.assign({ relativePath: filename }, TEMPLATE_TAG_CONFIG)
+    );
+
+    return output;
+  }
+
+  return source;
+};
diff --git a/packages/@glimmerx/webpack-loader/package.json b/packages/@glimmerx/webpack-loader/package.json
new file mode 100644
index 00000000..5e351065
--- /dev/null
+++ b/packages/@glimmerx/webpack-loader/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "@glimmerx/webpack-loader",
+  "version": "0.5.0",
+  "description": "GlimmerX Webpack Loader",
+  "repository": "https://github.com/glimmerjs/glimmer.js",
+  "author": "Tom Dale <tom@tomdale.net>",
+  "license": "MIT",
+  "private": false,
+  "scripts": {
+    "test": "mocha -r esm"
+  },
+  "dependencies": {
+    "@glimmer/syntax": "0.77.5",
+    "validate-peer-dependencies": "^1.1.0",
+    "loader-utils": "2.0.0",
+    "schema-utils": "3.0.0"
+  },
+  "peerDependencies": {
+    "@glimmerx/babel-preset": "^0.5.0",
+    "babel-plugin-htmlbars-inline-precompile": "^5.2.1"
+  },
+  "devDependencies": {
+    "babel-plugin-tester": "^6.4.0",
+    "chai": "^4.2.0",
+    "esm": "^3.2.25",
+    "mocha": "^6.2.0"
+  },
+  "volta": {
+    "node": "12.16.1",
+    "yarn": "1.22.4"
+  }
+}
diff --git a/packages/examples/basic-addon/addon/components/simple-button.js b/packages/examples/basic-addon/addon/components/simple-button.gjs
similarity index 69%
rename from packages/examples/basic-addon/addon/components/simple-button.js
rename to packages/examples/basic-addon/addon/components/simple-button.gjs
index 8f0c80ee..0461d6a4 100644
--- a/packages/examples/basic-addon/addon/components/simple-button.js
+++ b/packages/examples/basic-addon/addon/components/simple-button.gjs
@@ -1,10 +1,10 @@
-import Component, { hbs } from '@glimmerx/component';
+import Component from '@glimmerx/component';
 import { on } from '@glimmerx/modifier';
 
 export default class SimpleButton extends Component {
-  static template = hbs`
+  <template>
     <button type="button" ...attributes {{on "click" @onClick}}>
       {{@count}}
     </button>
-  `;
+  </template>
 }
diff --git a/packages/examples/basic-addon/config/ember-try.js b/packages/examples/basic-addon/config/ember-try.js
index 0eeccf01..4f1ab288 100644
--- a/packages/examples/basic-addon/config/ember-try.js
+++ b/packages/examples/basic-addon/config/ember-try.js
@@ -7,10 +7,10 @@ module.exports = async function() {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.16',
+        name: 'ember-3.25',
         npm: {
           devDependencies: {
-            'ember-source': '~3.16.0'
+            'ember-source': '~3.25.0'
           }
         }
       },
diff --git a/packages/examples/basic-addon/package.json b/packages/examples/basic-addon/package.json
index 9d5d7245..941efb65 100644
--- a/packages/examples/basic-addon/package.json
+++ b/packages/examples/basic-addon/package.json
@@ -28,12 +28,12 @@
     "@glimmerx/helper": "^0.5.0",
     "@glimmerx/modifier": "^0.5.0",
     "@glimmerx/service": "^0.5.0",
-    "ember-cli-babel": "^7.19.0",
-    "ember-cli-htmlbars": "^5.3.1"
+    "ember-cli-babel": "7.26.2",
+    "ember-cli-htmlbars": "^5.7.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
-    "@glimmer/tracking": "2.0.0-beta.12",
+    "@glimmer/tracking": "2.0.0-beta.15",
     "@glimmerx/eslint-plugin": "^0.5.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
@@ -49,7 +49,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^4.6.0",
     "ember-resolver": "^7.0.0",
-    "ember-source": "~3.17.3",
+    "ember-source": "~3.26.0",
     "ember-source-channel-url": "^2.0.1",
     "ember-template-lint": "^2.4.1",
     "ember-try": "^1.4.0",
diff --git a/packages/examples/basic/.storybook/main.js b/packages/examples/basic/.storybook/main.js
index 1cf7bda9..c2809560 100644
--- a/packages/examples/basic/.storybook/main.js
+++ b/packages/examples/basic/.storybook/main.js
@@ -1,4 +1,4 @@
 module.exports = {
-  stories: ['../src/**/*.stories.@(js|ts)'],
+  stories: ['../src/**/*.stories.@(js|gjs|ts|gts)'],
   addons: ['@storybook/addon-essentials']
 }
diff --git a/packages/examples/basic/index.ts b/packages/examples/basic/index.ts
index f46844cc..f57d4bd2 100644
--- a/packages/examples/basic/index.ts
+++ b/packages/examples/basic/index.ts
@@ -1,6 +1,8 @@
 import { renderComponent } from '@glimmerx/core';
 import MyComponent from './src/MyComponent';
 import LocaleService from './src/services/LocaleService';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import { ButtonListService } from 'basic-addon';
 
 document.addEventListener(
diff --git a/packages/examples/basic/package.json b/packages/examples/basic/package.json
index f5785e82..5065fb68 100644
--- a/packages/examples/basic/package.json
+++ b/packages/examples/basic/package.json
@@ -17,7 +17,7 @@
     "basic-addon": "0.5.0"
   },
   "devDependencies": {
-    "@glimmer/interfaces": "0.73.0",
+    "@glimmer/interfaces": "0.77.3",
     "@glimmerx/storybook": "^0.5.0",
     "@storybook/addon-essentials": "^6.1.21"
   },
diff --git a/packages/examples/basic/src/GtsComponent.gts b/packages/examples/basic/src/GtsComponent.gts
new file mode 100644
index 00000000..55347df3
--- /dev/null
+++ b/packages/examples/basic/src/GtsComponent.gts
@@ -0,0 +1,7 @@
+import Component from '@glimmerx/component';
+
+export default class OtherComponent extends Component {
+  <template>
+    <b>Counter Val: {{@count}}</b>
+  </template>
+}
diff --git a/packages/examples/basic/src/MyComponent.stories.ts b/packages/examples/basic/src/MyComponent.stories.ts
index 448f0819..921dfc2b 100644
--- a/packages/examples/basic/src/MyComponent.stories.ts
+++ b/packages/examples/basic/src/MyComponent.stories.ts
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import { storiesOf } from '@glimmerx/storybook';
 import MyComponent from './MyComponent';
 import LocaleService from './services/LocaleService';
diff --git a/packages/examples/basic/src/MyComponent.ts b/packages/examples/basic/src/MyComponent.ts
index e4f6851c..f9b20bed 100644
--- a/packages/examples/basic/src/MyComponent.ts
+++ b/packages/examples/basic/src/MyComponent.ts
@@ -1,9 +1,14 @@
 import Component, { tracked, hbs } from '@glimmerx/component';
 import { helper } from '@glimmerx/helper';
 import OtherComponent from './OtherComponent';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import GtsComponent from './GtsComponent';
 import { service } from '@glimmerx/service';
 import { on, action } from '@glimmerx/modifier';
 import LocaleService from './services/LocaleService';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import { ButtonList } from 'basic-addon';
 
 const myHelper = helper(function ([name]: [string], { greeting }: { greeting: string }) {
@@ -32,7 +37,14 @@ class MyComponent extends Component {
       <p>Component is not in a CJK locale</p>
     {{/if}}
 
-    <OtherComponent @count={{this.count}} /> <br/>
+    <div>
+      Other Component:
+      <OtherComponent @count={{this.count}} />
+    </div>
+    <div>
+      Gts Component:
+      <GtsComponent @count={{this.count}} />
+    </div>
     <button {{on "click" this.increment}}>Increment</button>
     <TemplateOnlyComponent @name="For Glimmerx"/>
 
diff --git a/packages/examples/basic/src/OtherComponent.stories.ts b/packages/examples/basic/src/OtherComponent.stories.gts
similarity index 68%
rename from packages/examples/basic/src/OtherComponent.stories.ts
rename to packages/examples/basic/src/OtherComponent.stories.gts
index 14e70d41..554df418 100644
--- a/packages/examples/basic/src/OtherComponent.stories.ts
+++ b/packages/examples/basic/src/OtherComponent.stories.gts
@@ -1,9 +1,11 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import { storiesOf } from '@glimmerx/storybook';
 import OtherComponent from './OtherComponent';
 import { hbs } from '@glimmerx/component';
 
 storiesOf('OtherComponent Stories', module)
-  .add('Basic with hbs', () => hbs`<OtherComponent @count=101/>`)
+  .add('Basic with hbs', () => <template><OtherComponent @count=101/></template>)
   .add('With render options', () => ({
     componentClass: OtherComponent,
     renderOptions: {
diff --git a/packages/examples/ember-app/package.json b/packages/examples/ember-app/package.json
index 4ee234fb..8fb5757e 100644
--- a/packages/examples/ember-app/package.json
+++ b/packages/examples/ember-app/package.json
@@ -22,15 +22,15 @@
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
     "@glimmer/component": "^1.0.0",
-    "@glimmer/tracking": "2.0.0-beta.12",
+    "@glimmer/tracking": "2.0.0-beta.15",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^1.5.3",
     "ember-cli": "~3.17.0",
     "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.19.0",
+    "ember-cli-babel": "7.26.2",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-htmlbars": "^5.3.1",
+    "ember-cli-htmlbars": "^5.7.1",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-uglify": "^3.0.0",
@@ -41,7 +41,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^4.6.0",
     "ember-resolver": "^7.0.0",
-    "ember-source": "~3.17.3",
+    "ember-source": "~3.26.0",
     "ember-template-lint": "^2.4.1",
     "ember-welcome-page": "^4.0.0",
     "eslint": "^6.8.0",
diff --git a/packages/examples/partial-rehydration/server.ts b/packages/examples/partial-rehydration/server.ts
index cc460448..a63222ef 100644
--- a/packages/examples/partial-rehydration/server.ts
+++ b/packages/examples/partial-rehydration/server.ts
@@ -6,7 +6,7 @@ interface ExpressResponse {
 }
 
 export default async function handler(
-  _: {},
+  _: unknown,
   res: ExpressResponse,
   clientsideBundleLocation: string
 ): Promise<void> {
diff --git a/packages/examples/playground/.babelrc b/packages/examples/playground/.babelrc
new file mode 100644
index 00000000..d3e8ccf1
--- /dev/null
+++ b/packages/examples/playground/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@glimmerx/babel-preset", "@babel/preset-env", "@babel/preset-typescript"]
+}
diff --git a/packages/examples/playground/.babelrc.js b/packages/examples/playground/.babelrc.js
deleted file mode 100644
index 911713cf..00000000
--- a/packages/examples/playground/.babelrc.js
+++ /dev/null
@@ -1,11 +0,0 @@
-module.exports = function (api) {
-  return {
-    plugins: [
-      ['@glimmer/babel-plugin-glimmer-env', { DEBUG: !api.env('production') }],
-      '@glimmerx/babel-plugin-component-templates',
-      ['@babel/plugin-proposal-decorators', { legacy: true }],
-      '@babel/plugin-proposal-class-properties',
-    ],
-    presets: ['@babel/preset-env', '@babel/preset-typescript'],
-  };
-};
diff --git a/packages/examples/playground/package.json b/packages/examples/playground/package.json
index 0309107f..23f05c1f 100644
--- a/packages/examples/playground/package.json
+++ b/packages/examples/playground/package.json
@@ -16,22 +16,20 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-proposal-decorators": "^7.8.3",
     "@babel/preset-env": "^7.9.0",
     "@babel/preset-typescript": "^7.9.0",
-    "@glimmer/babel-plugin-glimmer-env": "~2.0.0-beta.12",
     "@glimmer/env": "^0.1.7",
-    "@glimmerx/babel-plugin-component-templates": "^0.5.0",
+    "@glimmerx/babel-preset": "^0.5.0",
     "@glimmerx/component": "^0.5.0",
     "@glimmerx/core": "^0.5.0",
     "@glimmerx/eslint-plugin": "^0.5.0",
     "@glimmerx/helper": "^0.5.0",
     "@glimmerx/modifier": "^0.5.0",
     "@glimmerx/service": "^0.5.0",
+    "@glimmerx/webpack-loader": "^0.5.0",
     "@types/qunit": "^2.9.1",
-    "@typescript-eslint/eslint-plugin": "^2.26.0",
-    "@typescript-eslint/parser": "^2.26.0",
+    "@typescript-eslint/eslint-plugin": "^4.18.0",
+    "@typescript-eslint/parser": "^4.18.0",
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^5.1.1",
@@ -125,5 +123,8 @@
   "engines": {
     "node": ">= 12.0"
   },
-  "private": true
+  "private": true,
+  "dependencies": {
+    "path-browserify": "^1.0.1"
+  }
 }
diff --git a/packages/examples/playground/src/App.ts b/packages/examples/playground/src/App.ts
index 6ff62a4e..6cccf88f 100644
--- a/packages/examples/playground/src/App.ts
+++ b/packages/examples/playground/src/App.ts
@@ -27,7 +27,7 @@ export default class HelloWorld extends Component {
 `;
 
 export default class App extends Component {
-  @tracked snippet = new URLSearchParams(location.search).get('snippet') ?? DEFAULT_SNIPPET;
+  @tracked snippet = new URLSearchParams(location.search).get('snippet') || DEFAULT_SNIPPET;
 
   @action updateSnippet(snippet: string): void {
     const params = new URLSearchParams(location.search);
diff --git a/packages/examples/playground/src/Editor.ts b/packages/examples/playground/src/Editor.ts
index 2ac8c8f0..f96e5e14 100644
--- a/packages/examples/playground/src/Editor.ts
+++ b/packages/examples/playground/src/Editor.ts
@@ -27,7 +27,7 @@ function setupEditor(
 
   const updateLayout = (): void => {
     const lineHeight = editor.getOptions().get(monaco.editor.EditorOption.lineHeight);
-    const lineCount = editor.getModel().getLineCount();
+    const lineCount = editor.getModel()!.getLineCount();
     const contentHeight = lineHeight * lineCount + 12;
 
     element.style.height = `${contentHeight}px`;
diff --git a/packages/examples/playground/src/index.ts b/packages/examples/playground/src/index.ts
index e71218cd..e0ec3475 100644
--- a/packages/examples/playground/src/index.ts
+++ b/packages/examples/playground/src/index.ts
@@ -3,4 +3,4 @@ import App from './App';
 
 const containerElement = document.getElementById('app');
 
-renderComponent(App, containerElement);
+renderComponent(App, containerElement!);
diff --git a/packages/examples/playground/src/utils/compile.ts b/packages/examples/playground/src/utils/compile.ts
index cbccfd59..10d204ad 100644
--- a/packages/examples/playground/src/utils/compile.ts
+++ b/packages/examples/playground/src/utils/compile.ts
@@ -1,19 +1,13 @@
-declare const Babel;
+declare const Babel: any;
 
-import glimmerEnvPlugin from '@glimmer/babel-plugin-glimmer-env';
-import componentTemplatesPlugin from '@glimmerx/babel-plugin-component-templates';
-
-Babel.registerPlugin('@glimmer/babel-plugin-glimmer-env', glimmerEnvPlugin);
-Babel.registerPlugin('@glimmerx/babel-plugin-component-templates', componentTemplatesPlugin);
+import glimmerXPreset from '@glimmerx/babel-preset';
+import { precompile } from '@glimmer/compiler';
 
 export default function compile(js: string): { code: string } {
   return Babel.transform(js, {
     filename: 'main.ts',
-    plugins: [
-      ['@glimmer/babel-plugin-glimmer-env', { DEBUG: true }],
-      '@glimmerx/babel-plugin-component-templates',
-    ],
     presets: [
+      [glimmerXPreset, { __loadPlugins: true, precompile }],
       [
         'env',
         {
@@ -25,8 +19,6 @@ export default function compile(js: string): { code: string } {
           ],
         },
       ],
-      ['stage-2', { decoratorsLegacy: true }],
-      'typescript',
     ],
   });
 }
diff --git a/packages/examples/playground/src/utils/eval-snippet.ts b/packages/examples/playground/src/utils/eval-snippet.ts
index 4e9959a0..ca6740a6 100644
--- a/packages/examples/playground/src/utils/eval-snippet.ts
+++ b/packages/examples/playground/src/utils/eval-snippet.ts
@@ -16,7 +16,7 @@ const modules = {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function require(moduleName: string): unknown {
+function require(moduleName: keyof typeof modules): unknown {
   return modules[moduleName];
 }
 
diff --git a/packages/examples/playground/tests/util.ts b/packages/examples/playground/tests/util.ts
index 3299903b..46105a6d 100644
--- a/packages/examples/playground/tests/util.ts
+++ b/packages/examples/playground/tests/util.ts
@@ -12,7 +12,7 @@ import 'qunit-dom/dist/qunit-dom';
 
 QUnit.start();
 
-const getTestRoot = (): HTMLElement => document.getElementById('qunit-fixture');
+const getTestRoot = (): HTMLElement => document.getElementById('qunit-fixture')!;
 
 // Setup QUnit.dom
 Object.defineProperty(QUnit.assert.dom, 'rootElement', { get: getTestRoot });
diff --git a/packages/examples/playground/webpack.config.js b/packages/examples/playground/webpack.config.js
index dacf3a2f..033cb712 100644
--- a/packages/examples/playground/webpack.config.js
+++ b/packages/examples/playground/webpack.config.js
@@ -40,11 +40,15 @@ module.exports = () => {
     mode: IS_PRODUCTION ? 'production' : 'development',
     entry,
     plugins,
+    node: {
+      fs: 'empty',
+      path: 'empty',
+    },
     module: {
       rules: [
         {
           test: /\.(js|mjs|ts)$/,
-          use: 'babel-loader',
+          use: ['babel-loader', '@glimmerx/webpack-loader'],
         },
         {
           test: /\.css$/,
@@ -61,6 +65,9 @@ module.exports = () => {
     },
     resolve: {
       extensions: ['.ts', '.js', '.json'],
+      alias: {
+        path: require.resolve('path-browserify'),
+      },
     },
     output: {
       filename: '[name].bundle.js',
diff --git a/packages/examples/rehydration/server.ts b/packages/examples/rehydration/server.ts
index e802dd67..1a605af3 100644
--- a/packages/examples/rehydration/server.ts
+++ b/packages/examples/rehydration/server.ts
@@ -6,7 +6,7 @@ interface ExpressResponse {
 }
 
 export default async function handler(
-  _: {},
+  _: unknown,
   res: ExpressResponse,
   clientsideBundleLocation: string
 ) {
diff --git a/tsconfig.json b/tsconfig.json
index 4275e5ad..c00b4e83 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,7 +15,7 @@
     "strict": true,                           /* Enable all strict type-checking options. */
     "strictPropertyInitialization": false,    /* Disable strict property initialization check since services are initialized by the manager */
 
-    "noUnusedLocals": true,                   /* Report errors on unused locals. */
+    "noUnusedLocals": false,                   /* Report errors on unused locals. */
     "noUnusedParameters": true,               /* Report errors on unused parameters. */
     "noImplicitReturns": true,                /* Report error when not all code paths in function return a value. */
     "noFallthroughCasesInSwitch": true,       /* Report errors for fallthrough cases in switch statement. */
diff --git a/webpack.config.js b/webpack.config.js
index 34563d95..3d2f04d9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,13 +1,6 @@
 const path = require('path');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 
-const commonBabelPlugins = [
-  ['@glimmer/babel-plugin-glimmer-env', { DEBUG: false }],
-  '@glimmerx/babel-plugin-component-templates',
-  ['@babel/plugin-proposal-decorators', { legacy: true }],
-  '@babel/plugin-proposal-class-properties',
-];
-
 const commonConfig = {
   mode: 'development',
   externals: {
@@ -19,7 +12,7 @@ const commonConfig = {
         mainFields: ['module', 'main'],
       }),
     ],
-    extensions: ['.ts', '.js'],
+    extensions: ['.ts', '.js', '.gjs', '.gts'],
   },
   output: {
     filename: '[name].bundle.js',
@@ -53,14 +46,16 @@ const browserConfig = {
   module: {
     rules: [
       {
-        test: /(\.ts|\.js)$/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            plugins: commonBabelPlugins,
-            presets: ['@babel/preset-typescript', '@babel/preset-env'],
+        test: /(\.ts|\.js|\.gts|\.gjs)$/,
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              presets: ['@glimmerx/babel-preset', '@babel/preset-typescript', '@babel/preset-env'],
+            },
           },
-        },
+          '@glimmerx/webpack-loader',
+        ],
       },
     ],
   },
@@ -85,24 +80,27 @@ const nodeConfig = {
   module: {
     rules: [
       {
-        test: /(\.ts|\.js)$/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            plugins: commonBabelPlugins,
-            presets: [
-              '@babel/preset-typescript',
-              [
-                '@babel/preset-env',
-                {
-                  targets: {
-                    node: true,
+        test: /(\.ts|\.js|\.gts|\.gjs)$/,
+        use: [
+          {
+            loader: 'babel-loader',
+            options: {
+              presets: [
+                '@glimmerx/babel-preset',
+                '@babel/preset-typescript',
+                [
+                  '@babel/preset-env',
+                  {
+                    targets: {
+                      node: true,
+                    },
                   },
-                },
+                ],
               ],
-            ],
+            },
           },
-        },
+          '@glimmerx/webpack-loader',
+        ],
       },
     ],
   },
diff --git a/yarn.lock b/yarn.lock
index 3ed8b0f3..ae0ac47e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -44,6 +44,11 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.11.tgz#9c8fe523c206979c9a81b1e12fe50c1254f1aa35"
   integrity sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg==
 
+"@babel/compat-data@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
+  integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
+
 "@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
@@ -75,7 +80,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.7.5":
+"@babel/core@^7.1.0", "@babel/core@^7.12.0", "@babel/core@^7.12.1", "@babel/core@^7.12.3", "@babel/core@^7.7.5":
   version "7.13.10"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz#07de050bbd8193fcd8a3c27918c0890613a94559"
   integrity sha512-bfIYcT0BdKeAZrovpMqX2Mx5NrgAckGbwT982AkdS5GNfn3KMGiprlBAtmBcFZRUmpaufS6WZFP8trvx8ptFDw==
@@ -97,7 +102,7 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/core@^7.1.6", "@babel/core@^7.2.2", "@babel/core@^7.3.4", "@babel/core@^7.5.5", "@babel/core@^7.8.3", "@babel/core@^7.8.4", "@babel/core@^7.9.0":
+"@babel/core@^7.1.6", "@babel/core@^7.2.2", "@babel/core@^7.3.4", "@babel/core@^7.8.3", "@babel/core@^7.8.4", "@babel/core@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
   integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
@@ -128,7 +133,7 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.0", "@babel/generator@^7.9.4", "@babel/generator@^7.9.5":
+"@babel/generator@^7.9.0", "@babel/generator@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9"
   integrity sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==
@@ -168,7 +173,7 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.13.8":
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.10", "@babel/helper-compilation-targets@^7.13.8":
   version "7.13.10"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c"
   integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==
@@ -558,11 +563,20 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88"
   integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q==
 
-"@babel/parser@^7.3.4", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.4":
+"@babel/parser@^7.3.4", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
   version "7.9.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
   integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
+  integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
+
 "@babel/plugin-proposal-async-generator-functions@^7.13.8":
   version "7.13.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"
@@ -597,7 +611,7 @@
     "@babel/helper-create-class-features-plugin" "^7.13.0"
     "@babel/helper-plugin-utils" "^7.13.0"
 
-"@babel/plugin-proposal-decorators@^7.12.1":
+"@babel/plugin-proposal-decorators@^7.12.1", "@babel/plugin-proposal-decorators@^7.13.5":
   version "7.13.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.5.tgz#d28071457a5ba8ee1394b23e38d5dcf32ea20ef7"
   integrity sha512-i0GDfVNuoapwiheevUOuSW67mInqJ8qw7uWfpjNVeHMn143kXblEy/bmL9AdZ/0yf/4BMQeWXezK0tQIvNPqag==
@@ -757,6 +771,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
+"@babel/plugin-proposal-optional-chaining@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866"
+  integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
 "@babel/plugin-proposal-optional-chaining@^7.6.0", "@babel/plugin-proposal-optional-chaining@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
@@ -1372,6 +1395,18 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-runtime@^7.13.9":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.10.tgz#a1e40d22e2bf570c591c9c7e5ab42d6bf1e419e1"
+  integrity sha512-Y5k8ipgfvz5d/76tx7JYbKQTcgFSU6VgJ3kKQv4zGTKr+a9T/KBvfRvGtSFgKDQGt/DBykQixV0vNWKIdzWErA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    babel-plugin-polyfill-corejs2 "^0.1.4"
+    babel-plugin-polyfill-corejs3 "^0.1.3"
+    babel-plugin-polyfill-regenerator "^0.1.2"
+    semver "^6.3.0"
+
 "@babel/plugin-transform-runtime@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz#45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"
@@ -1522,6 +1557,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/polyfill@^7.11.5":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
+  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
 "@babel/polyfill@^7.8.3", "@babel/polyfill@^7.8.7":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
@@ -1596,6 +1639,81 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
+"@babel/preset-env@^7.12.0":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.12.tgz#6dff470478290582ac282fb77780eadf32480237"
+  integrity sha512-JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA==
+  dependencies:
+    "@babel/compat-data" "^7.13.12"
+    "@babel/helper-compilation-targets" "^7.13.10"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-validator-option" "^7.12.17"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12"
+    "@babel/plugin-proposal-async-generator-functions" "^7.13.8"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.13.8"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
+    "@babel/plugin-proposal-json-strings" "^7.13.8"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.13"
+    "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
+    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
+    "@babel/plugin-proposal-private-methods" "^7.13.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-top-level-await" "^7.12.13"
+    "@babel/plugin-transform-arrow-functions" "^7.13.0"
+    "@babel/plugin-transform-async-to-generator" "^7.13.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
+    "@babel/plugin-transform-block-scoping" "^7.12.13"
+    "@babel/plugin-transform-classes" "^7.13.0"
+    "@babel/plugin-transform-computed-properties" "^7.13.0"
+    "@babel/plugin-transform-destructuring" "^7.13.0"
+    "@babel/plugin-transform-dotall-regex" "^7.12.13"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.13"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
+    "@babel/plugin-transform-for-of" "^7.13.0"
+    "@babel/plugin-transform-function-name" "^7.12.13"
+    "@babel/plugin-transform-literals" "^7.12.13"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.13"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.13.8"
+    "@babel/plugin-transform-modules-umd" "^7.13.0"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
+    "@babel/plugin-transform-new-target" "^7.12.13"
+    "@babel/plugin-transform-object-super" "^7.12.13"
+    "@babel/plugin-transform-parameters" "^7.13.0"
+    "@babel/plugin-transform-property-literals" "^7.12.13"
+    "@babel/plugin-transform-regenerator" "^7.12.13"
+    "@babel/plugin-transform-reserved-words" "^7.12.13"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.13"
+    "@babel/plugin-transform-spread" "^7.13.0"
+    "@babel/plugin-transform-sticky-regex" "^7.12.13"
+    "@babel/plugin-transform-template-literals" "^7.13.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.13"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.13"
+    "@babel/plugin-transform-unicode-regex" "^7.12.13"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.13.12"
+    babel-plugin-polyfill-corejs2 "^0.1.4"
+    babel-plugin-polyfill-corejs3 "^0.1.3"
+    babel-plugin-polyfill-regenerator "^0.1.2"
+    core-js-compat "^3.9.0"
+    semver "^6.3.0"
+
 "@babel/preset-env@^7.12.1":
   version "7.13.10"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.10.tgz#b5cde31d5fe77ab2a6ab3d453b59041a1b3a5252"
@@ -1731,6 +1849,13 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
+"@babel/runtime@7.12.18":
+  version "7.12.18"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.18.tgz#af137bd7e7d9705a412b3caaf991fe6aaa97831b"
+  integrity sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.0.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.0":
   version "7.9.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
@@ -1811,6 +1936,15 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz#edbf99208ef48852acdff1c8a681a1e4ade580cd"
+  integrity sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@base2/pretty-print-object@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
@@ -2205,52 +2339,44 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
-"@glimmer/babel-plugin-glimmer-env@2.0.0-beta.12", "@glimmer/babel-plugin-glimmer-env@~2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/babel-plugin-glimmer-env/-/babel-plugin-glimmer-env-2.0.0-beta.12.tgz#6ce9d10fa737848e705b7ec19a42f2db54a6eef4"
-  integrity sha512-GnDPsQqyVg8N9+qjg7bd1e43uyBeuBmTGkVe7UHWCWfGzoNJZ4Hmm5NONfHFrMKqpM2fdua/375XTpePicEZsw==
+"@glimmer/babel-preset@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/babel-preset/-/babel-preset-2.0.0-beta.15.tgz#f6d04f04e968643df292e037793140ce616bc3a2"
+  integrity sha512-cdXcFaNGeysJto1sOIQMdzFpsJEPILetwrVnFwypj+ZFk8NOZlUGkzD62GF0Tw0XXEmAO1zGhxypaR4S3Ioc5Q==
   dependencies:
-    "@babel/core" "^7.5.5"
-    babel-plugin-debug-macros "^0.3.3"
-
-"@glimmer/babel-plugin-strict-template-precompile@2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/babel-plugin-strict-template-precompile/-/babel-plugin-strict-template-precompile-2.0.0-beta.12.tgz#f43b22098e932d80f61e6b4845a3c5683a36b890"
-  integrity sha512-scjD9KMWJmhZT8WxCYAWJKX0qlEK7WEPE8R5wBqY6oDdoLEBpXdte+m2UQqm3sYe7qVPs/STkBi6uvzuisn0NQ==
-  dependencies:
-    "@babel/core" "^7.5.5"
-    "@babel/generator" "^7.9.4"
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/parser" "^7.9.4"
-    "@babel/types" "^7.9.0"
-    "@glimmer/compiler" "0.73.0"
+    "@babel/plugin-proposal-class-properties" "^7.8.3"
+    "@babel/plugin-proposal-decorators" "^7.8.3"
+    "@glimmer/compiler" "0.77.6"
+    "@glimmer/vm-babel-plugins" "0.77.6"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-htmlbars-inline-precompile "^5.2.0"
 
-"@glimmer/blueprint@2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/blueprint/-/blueprint-2.0.0-beta.12.tgz#7b0306a6339d636a4f5304106729cfbfa827ded5"
-  integrity sha512-52Kg5rjKEtjMHc1kBZkaUhzG0ez4tI8ar6n3EzmGrUCb8tytnMEIHEPLS4BtqEVKY9WDewEjaqmk/yFU8x+FIA==
+"@glimmer/blueprint@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/blueprint/-/blueprint-2.0.0-beta.15.tgz#7f5f052fb72c4027471ea344abf86c3323616605"
+  integrity sha512-WbXi56iXoTg4B46piQHpJY8h8blG4zxu6vGQiuLzeRdjshPn35ikHVOssxVpKFT36qJp5Nk8J29DDOan4aGHCg==
   dependencies:
     ember-cli-string-utils "^1.1.0"
 
-"@glimmer/compiler@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.73.0.tgz#206d3b3bf5de07bfa95591bc6aa9c43493e52bce"
-  integrity sha512-vBq4CNPdA1wdKysOshbkjUgy2YHc8IfPIdish4qIx7S3g2ibfH9+EfcFHwb+CrXnijG7dUrVMu/AUmuurbvTNQ==
+"@glimmer/compiler@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.77.6.tgz#010ca57c3031071ef317181c6f8ecba71526101f"
+  integrity sha512-kfaLoqypiyL08KmmIIIsuR9wZP2EWnF/aHvusAVp8o578w2Veseba1tr7p/1fkY9TsC+su9A0g+KXZ3EoKrWpA==
   dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/syntax" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/wire-format" "0.73.0"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/syntax" "0.77.6"
+    "@glimmer/util" "0.77.6"
+    "@glimmer/wire-format" "0.77.6"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/component@2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-2.0.0-beta.12.tgz#9c39efc09a9aa9c5d60360eae4c23667ab4bc62e"
-  integrity sha512-1jJNhysJOBOCR91rtzrCahGKuXHoM7eK3ZW1gAZE2bTs6nJIS/panFPWmUnbcnWm6mEGf5gdEtGHxlCnVVcO6Q==
+"@glimmer/component@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-2.0.0-beta.15.tgz#d6e977cabebc47bdcfd79d7a058233794de78d3e"
+  integrity sha512-x9AU5LMgo6JrJf8cQmiaChLIhNF5TpxNu1baVGBl/jV2ZhjCMjhERhVdTNfTmZnI86gdhCid+msMSShwjAcEoQ==
   dependencies:
-    "@glimmer/core" "2.0.0-beta.12"
+    "@glimmer/core" "2.0.0-beta.15"
     "@glimmer/env" "^0.1.7"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/util" "0.77.6"
     broccoli-file-creator "^2.1.1"
     broccoli-merge-trees "^3.0.2"
     ember-cli-babel "^7.7.3"
@@ -2281,71 +2407,109 @@
     ember-cli-typescript "3.0.0"
     ember-compatibility-helpers "^1.1.2"
 
-"@glimmer/core@2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/core/-/core-2.0.0-beta.12.tgz#4d1148c92565b65d7bf7ef3114b6c41062f52547"
-  integrity sha512-1Fk7hijjENMX/AoR2dnGv3u4t2Uh/yAvrtzQBr6HqHj4A+JqZ6dnN2BVXAp9uudfFsyt38Xha4X0NPhDS5gIGQ==
+"@glimmer/core@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/core/-/core-2.0.0-beta.15.tgz#f6fc6010766a9b2a586d1fbe2c3869ec3d56f299"
+  integrity sha512-s1LSNmZW9oghpw5cnTEhcZBp+kFSA6JvImv2Ain+BDKbyIKZt/nSq2BYg0hpRQlizlHrGF2ZYmtcbEZttaSvZA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.0"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/manager" "0.73.0"
-    "@glimmer/opcode-compiler" "0.73.0"
-    "@glimmer/owner" "0.73.0"
-    "@glimmer/program" "0.73.0"
-    "@glimmer/runtime" "0.73.0"
-    "@glimmer/validator" "0.73.0"
+    "@glimmer/global-context" "0.77.6"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/manager" "0.77.6"
+    "@glimmer/opcode-compiler" "0.77.6"
+    "@glimmer/owner" "0.77.6"
+    "@glimmer/program" "0.77.6"
+    "@glimmer/runtime" "0.77.6"
+    "@glimmer/validator" "0.77.6"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.73.0.tgz#04a0ce1d31c6325c13f85831e63d392ad103646e"
-  integrity sha512-yx2Ci2s7Q0zY6A934a/eJBVofBg/YsuLv9et6FXVYgQFjb45V3Pm+lklitKCZ401kXKJqozTC08jHgka40U3rA==
+"@glimmer/debug@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/debug/-/debug-2.0.0-beta.15.tgz#6145b499a0231dcaaae1f0e66bd3720d9069cf68"
+  integrity sha512-7iBFiXi06GTTzj6wKCfanWABypYXL3lX9X1y014TMRAtNElIY4sBWWPvHYkAy/QY3vJCBRZcxVwq6wnMAwQy+w==
+  dependencies:
+    "@glimmer/global-context" "0.77.6"
+
+"@glimmer/destroyable@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.77.3.tgz#e4f11a8b02e6ba21940e368f9a64078c72596ca5"
+  integrity sha512-2ft+Q2xaZ20vdIitdPgb+ngneK3L4zhS7NrGSXGvAtCVaF7hX/W91PDsKmyfxUl6DB+lW7Bw/pERfFdH9XRLMw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.73.0"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/global-context" "0.77.3"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/util" "0.77.3"
+
+"@glimmer/destroyable@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.77.6.tgz#5e83739a53025ad4d68a5be55379fdb3ab3dbb35"
+  integrity sha512-3SqfWPg+P2u2sjmLhL7jc8vpo4Z2pgS4D4/LOUW8Y0CW0mxAr49HoTGh6qWGHs1baAVy1HGc/ZlaTxMKhpBjJQ==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/global-context" "0.77.6"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/util" "0.77.6"
 
 "@glimmer/di@^0.1.9":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
   integrity sha1-poeMB6E6LCx2/N5ZilyXY3v8QoA=
 
-"@glimmer/encoder@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.73.0.tgz#5ad9ebcdca8fc7952367ab4b0d77c8452cda96e7"
-  integrity sha512-v2jcMem2TFLP/VJF4HI+GPX9PEwkmcussyLjNG65ZMCcsqOKHcmGcXULtMxeQR4Y7PpjaZRwWCMpuGgL9QLo5Q==
+"@glimmer/encoder@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.77.6.tgz#d0e29e9aefce0a259d1142497e3a37086b480c04"
+  integrity sha512-qqkWinPfD0nf0dkIzp1BcD2wHXZ63kbDDwU/5LZxr10k9xb+BPSmZRVU+sUh9ilD23Zwj3IFbsNGxLaYFf6yRw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/vm" "0.73.0"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/vm" "0.77.6"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.0.tgz#273f757779a17595cb4cb76685c17087dc619bb8"
-  integrity sha512-DnatUdDcF6STNhN4aOFjSW5cn1lmgMpjaauwIKZSy9O45Eo8uqNCMpYRCKf4fkVmYVDRwg6N6ua0Sv0q6OlWSw==
+"@glimmer/global-context@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.77.3.tgz#b83f2c9d2d0720fdbd49d1ecf33d6836d06c3af2"
+  integrity sha512-bNPwdoW0/+bwSAR3Ek5C+xo+xkIlUxR4LljfRuwDOXlTebm7YPVDNLN+Vb2XUGNZfMgyNDRPkMO9P3CxW1wDTA==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+
+"@glimmer/global-context@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.77.6.tgz#8b2c62bf31996dea8659c5128f8c05a96bc73e65"
+  integrity sha512-ev2ZH5Qz35mh6GAanM758ghZisGRIPbf6vmZuZbn/xiR2zDZIVRN5vMqSOsGs2lI+UKZ1qZWnTPa04wDS+lybQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/helper@2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/helper/-/helper-2.0.0-beta.12.tgz#547220bee1044b3d016d896e5ac34bbee14bd4e9"
-  integrity sha512-DFJWGwzeQ503QeLjeR0UqYCpXNmOU1MSl4H8wRJH1sUjK7ZZ+co+scb/NpwbiAUHoNFR61JKr/1nD+Awa50PCQ==
+"@glimmer/helper@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/helper/-/helper-2.0.0-beta.15.tgz#d58ca52d6f0e3f7c9b9373a73df063954c585814"
+  integrity sha512-MTZbGiotKam9oYRVxYuAbymhO2bXHzlcITYy7NUdEc9hRw7tIBnK0UXgAJNfV6ECQH+vi1+Q68vbm78EI+uSFw==
+  dependencies:
+    "@glimmer/component" "2.0.0-beta.15"
+    "@glimmer/core" "2.0.0-beta.15"
+    "@glimmer/runtime" "0.77.6"
+
+"@glimmer/interfaces@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.3.tgz#cd0523147da72d8901950a24c3be7aa4e38d8d09"
+  integrity sha512-i/2YmyjFKhKNheEfvajQbbQr9AWbahNV71oakipz8b+qWx0nni5cjM/m/Z0nhnwrsa2cNFIt5kNknD6rh18AHg==
   dependencies:
-    "@glimmer/component" "2.0.0-beta.12"
-    "@glimmer/core" "2.0.0-beta.12"
-    "@glimmer/runtime" "0.73.0"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/interfaces@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.5.tgz#74c791ba4712588f2e7b65669d90e8d349eee30a"
+  integrity sha512-ahiZX2EG2w1DrXmIxjzmkRrAeRJS+y35YTXhP82/NSyLiS2g7NTgYbqXpsS+VfvYRZ2+EbeXzY7cTe8mN4OUxg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/interfaces@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.0.tgz#ea926b2542cf666a9a479e8aa67224cc11f7710d"
-  integrity sha512-DagAc0Ul+lrid54QKrUVctlKfloIZMRhaz/oaEJ3nVf4Nqz/6YtT3tOrJ+fOxLYjsDy3Dq0uJMDOHzdd6IqS2g==
+"@glimmer/interfaces@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.6.tgz#e11715bcdc5c5133cbb52db9a53b16c49ee611e5"
+  integrity sha512-VVsi6Z8BgV9Y42FSybiImb6BR00ILr5m5M0B2VbDFytuKR0scRf0xUzKQV+EgLXOwgu/L5XVQJMWElYxTh6xBw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -2356,125 +2520,158 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.73.0.tgz#70e42e35954ed07c544413bd5064cdd4aa2f6ce9"
-  integrity sha512-n52STqtO54R/1GUv+oe7TXjwIdLBaZ1/+DqWPsh5XlzIH/MY6RipNeCpaIKJDYdSshJYZEp6i/7x0NBfzmocdQ==
+"@glimmer/low-level@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.77.6.tgz#76966084d2d80c7a586c3a4fcd6389e78b4d141e"
+  integrity sha512-7L66cjGqBBiHYu5D2cLz9Tvo2wo6EzTpV3jbNziLhiLIEjfg9lzy6HaE6IR4/osIbOiwtvEU6ZGrwoM/vbx4zg==
 
-"@glimmer/manager@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.73.0.tgz#7af1c290e5ad5ce0d38517367996452346b776d6"
-  integrity sha512-Sjn2eTBbDxS7fdr3tY2nfHQ34DTGmobNDUIwNGBv7RgNWJ6yCcgM3HYxfynK6AoCrzQyNcHkthefNtFRZOQJSQ==
+"@glimmer/manager@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.77.3.tgz#68bf2f8f2410f79a88e4c401f0dd7aed47741534"
+  integrity sha512-NSKXUkQsjaGyWdtjGQAeeiilZ+Q3WPuM0EC/9yCt4hVEXTpyS0bcLv4nuXCNZXPygTiBNYOA4+c7X93TTx+sUQ==
   dependencies:
-    "@glimmer/destroyable" "0.73.0"
+    "@glimmer/destroyable" "0.77.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/reference" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/validator" "0.73.0"
-
-"@glimmer/modifier@2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/modifier/-/modifier-2.0.0-beta.12.tgz#6b7861ffa5417068cc79a4d318427543d9e7f740"
-  integrity sha512-RtQs6Kb+FvuNI/Lje0mDxrf7iC3nq/KYcAvhiCv3Tjv8cpNz6rem+SzPqcRxcKRisd12zaTQSoFZ6J+5A6GNPg==
-  dependencies:
-    "@glimmer/runtime" "0.73.0"
-
-"@glimmer/node@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.73.0.tgz#ad1fb21423044b78781c2a0a522ca74b7655312d"
-  integrity sha512-IVQuV+jezP5L81KwswnyW8vT+M+ef+KhgMtW3gI8+6D5Msdx06QUrLzPjbcFyLwHUZ6AHO3IOydEAsk8JclgCg==
-  dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/runtime" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/reference" "0.77.3"
+    "@glimmer/util" "0.77.3"
+    "@glimmer/validator" "0.77.3"
+
+"@glimmer/manager@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.77.6.tgz#c6f28ec2084da7e690139936d783405524316a0d"
+  integrity sha512-Izb/4pRNTEyuqIUY1kfV4GDG5ki2VKIEw4pBvHcfeKoxqXGWEIR8rmG2Maghbbsn41qX0tjGI7K5bruvUVgDtg==
+  dependencies:
+    "@glimmer/destroyable" "0.77.6"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/reference" "0.77.6"
+    "@glimmer/util" "0.77.6"
+    "@glimmer/validator" "0.77.6"
+
+"@glimmer/modifier@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/modifier/-/modifier-2.0.0-beta.15.tgz#da6999ac63e06077a7c54dd7fc6f8d1adbd4ebee"
+  integrity sha512-Ec6LMPuZ1SkWFxtR1P0T1qCCMH4F+lok1nqY7Qqawpn9qmghrJRuIKtnZiFmplIW9YKoLcSNCsv3T9984ZHwYQ==
+  dependencies:
+    "@glimmer/runtime" "0.77.6"
+
+"@glimmer/node@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.77.6.tgz#fd3661d88532c46fc7a8f5c45b0a4be1e5d3a318"
+  integrity sha512-C6CMJ75mGavJ+gqMOxSadXG3Gxq/CdUKhPgeT3T5X3WgHzyyiR9cBS28xeOZ8IT1ryWGAFCd2fqmj8IhLC+GUQ==
+  dependencies:
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/runtime" "0.77.6"
+    "@glimmer/util" "0.77.6"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.73.0.tgz#302b3f2d3ca0c8fa6b4dded1230aa63e53007208"
-  integrity sha512-5RTVLx1CpdTeTNeNw9Nrbc8FKeTACrptacfL5pBD/3hWkj2XqaXIpsuMv6rXm1oGrr79KhFqpSimPM1qcdPGAg==
+"@glimmer/opcode-compiler@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.77.6.tgz#018c196e406e8f1780fc8d8609d6d63c2f4b5372"
+  integrity sha512-oehFnYkV4g9CbMMxpXxuKkeLO/WyL2gnMEKy+wpwqoOX3fOSljt6zzngCX/3NOTbD6ZZNEtXUvV8hx0pISJ8cw==
   dependencies:
-    "@glimmer/encoder" "0.73.0"
+    "@glimmer/encoder" "0.77.6"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/reference" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/vm" "0.73.0"
-    "@glimmer/wire-format" "0.73.0"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/reference" "0.77.6"
+    "@glimmer/util" "0.77.6"
+    "@glimmer/vm" "0.77.6"
+    "@glimmer/wire-format" "0.77.6"
 
-"@glimmer/owner@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.73.0.tgz#a76378812f5def9cc47bcecb09caf0838111fcc7"
-  integrity sha512-fJ/ZzGNbGZiHwTlohqvPOXLdStmlm57iNuKg3PmqXYOpOfe4Ga/l7qbwDeat/+vBskVT7ZWitawM6lsyRtuVlg==
+"@glimmer/owner@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.77.6.tgz#22cc9f5f0867387b1abd2576fc8eb79c0dadecd7"
+  integrity sha512-w2vS7mHaj/3J1U5KzgsgGn3W15WuxqAvqp02SyxmDgkZedJQm0UGxadWdxepCnNgTby5E+cqkTVf7LZo+HTqng==
   dependencies:
-    "@glimmer/util" "0.73.0"
+    "@glimmer/util" "0.77.6"
 
-"@glimmer/program@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.73.0.tgz#a6a368e0c9d7e5a47375577a93f5773fbace8d8c"
-  integrity sha512-P631EYGtkOJ+05oNy4taxh1G+D9Hd12uc5STUB9jRutxN/6U4WJy2+V935Vyac2disuKTj7RVQuWI0EE6BAXgQ==
+"@glimmer/program@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.77.6.tgz#7e1fdc1efda89d39ce7b532dc10edc70ce29cd78"
+  integrity sha512-2Y8YSBF+SJsMMEo/0aThv+38MuLzlGYBkafkN/vMhOm+T4K2e7nAO7JkQyihBktRQOAUD97RetNTnsVLaZqvzg==
   dependencies:
-    "@glimmer/encoder" "0.73.0"
+    "@glimmer/encoder" "0.77.6"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/manager" "0.73.0"
-    "@glimmer/opcode-compiler" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/manager" "0.77.6"
+    "@glimmer/opcode-compiler" "0.77.6"
+    "@glimmer/util" "0.77.6"
 
-"@glimmer/reference@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.0.tgz#77d421254c0d58dd0bdcb341bdcb76744d0b28ba"
-  integrity sha512-m2vWCAD0bYLI03EvvJo4ow8a2cmfpLi7mHT+s9tMER7c7/TNenLmh6/5A7NKzbwCb6onqXQGOT4Sb/vAZqFgQw==
+"@glimmer/reference@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.77.3.tgz#8bf252da20aacd444ab8b7fd4b35d3d56d71a235"
+  integrity sha512-g9XsW/ZqJ2/6htZYegYoSY4vl43E5KsN2xSNw2sy4Hk901tzvsvjsiLtdH7CvzxZI+s5AUJNQNc2D+/WSppQIQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.0"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/validator" "0.73.0"
+    "@glimmer/global-context" "0.77.3"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/util" "0.77.3"
+    "@glimmer/validator" "0.77.3"
 
-"@glimmer/runtime@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.73.0.tgz#621a354ed7040afd29fedd8acd78ba3eb7cd8b52"
-  integrity sha512-O7YJSDbw5zRSdAcGBSi1YIWtoFmDqYR1HK7eSyLpobHOyhNLOYajdK0QLFreB9RZSELHACMWUbHpEQa3NPo5RA==
+"@glimmer/reference@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.77.6.tgz#377780f35dd63861c083e9038c2715651e6fd8cc"
+  integrity sha512-AHkccjgI/oa0YZkl4WMIjgvVM4fFmK8mZtXFaH48P/LSluE2QBIZvMINxUJ5qC7B5JASSacwxf7MsaePVSzDpA==
   dependencies:
-    "@glimmer/destroyable" "0.73.0"
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/global-context" "0.77.6"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/util" "0.77.6"
+    "@glimmer/validator" "0.77.6"
+
+"@glimmer/runtime@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.77.6.tgz#3be182e14dc7109433b29eb7958d2cd26e4cbf87"
+  integrity sha512-rfT3Rvy1MNsOTR8axZffmrOBn1hqg7jO43OEjnc1fkg0P6EjJpEqze9/hhkCnV3vwS9m2TenWiC3e6dqeb10rg==
+  dependencies:
+    "@glimmer/destroyable" "0.77.6"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.73.0"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/low-level" "0.73.0"
-    "@glimmer/owner" "0.73.0"
-    "@glimmer/program" "0.73.0"
-    "@glimmer/reference" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/validator" "0.73.0"
-    "@glimmer/vm" "0.73.0"
-    "@glimmer/wire-format" "0.73.0"
+    "@glimmer/global-context" "0.77.6"
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/low-level" "0.77.6"
+    "@glimmer/owner" "0.77.6"
+    "@glimmer/program" "0.77.6"
+    "@glimmer/reference" "0.77.6"
+    "@glimmer/util" "0.77.6"
+    "@glimmer/validator" "0.77.6"
+    "@glimmer/vm" "0.77.6"
+    "@glimmer/wire-format" "0.77.6"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/ssr@2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/ssr/-/ssr-2.0.0-beta.12.tgz#a1ecde920e3ab238fefc24e97f20fbc4e179096e"
-  integrity sha512-zerW/jUdlVQTNXXyar4ePZqNeZr4fkVxf5IK8JvodZmwIvBVPNxKdlxiWa2tO1oVDwovDVZUiCbzTzN002svZw==
+"@glimmer/ssr@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/ssr/-/ssr-2.0.0-beta.15.tgz#35102d54a215b415526d91215ee26eb8638be6da"
+  integrity sha512-7b6yy7ZONGueUJ9mU7XusK9Mbao+3kMnUky7Aprl+wsHAB3pbSQHjfM+vgy8lz/iODAIDjdx2J+r8Ih8es3lJQ==
   dependencies:
-    "@glimmer/core" "2.0.0-beta.12"
-    "@glimmer/node" "0.73.0"
-    "@glimmer/reference" "0.73.0"
-    "@glimmer/runtime" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/core" "2.0.0-beta.15"
+    "@glimmer/node" "0.77.6"
+    "@glimmer/reference" "0.77.6"
+    "@glimmer/runtime" "0.77.6"
+    "@glimmer/util" "0.77.6"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/serializer" "^1.4.0"
     "@simple-dom/void-map" "^1.4.0"
 
-"@glimmer/syntax@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.0.tgz#f45f820d19fba8e7d87054f4bb87b7ce9edd1aac"
-  integrity sha512-dgxEUocjkbtlfkDPLFDkJO+RhZigffnOeDkdDAR4lbsEFgm0Pd3zNvnFhYyXSg/UUzioLdknyuixlwihG9OGow==
+"@glimmer/syntax@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.5.tgz#b841803dd54ea86de7e8ae8850b3760000033bf2"
+  integrity sha512-FRb1onDsP9P2CnbwTyKF91QYIbRJ0svALG7TnAJlUjQU9E4lWdI5lf7vPRh45A4W1rjcAcIcuiIS6oGrdEkhuQ==
   dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@handlebars/parser" "^2.0.0"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/util" "0.77.5"
+    "@handlebars/parser" "~2.0.0"
+    simple-html-tokenizer "^0.5.10"
+
+"@glimmer/syntax@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.6.tgz#31142ba914ee123f9b5e5c70bd92272cb6258bca"
+  integrity sha512-Nh5D/IGpY7LQ5fmNEIeU9UdwIb9xaRfEefsSbIiBcHw13mauFVz7K+ZKIn3p1Qur6xWmUIKcYgXCAsOFFiOyQg==
+  dependencies:
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/util" "0.77.6"
+    "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
 "@glimmer/syntax@^0.50.0":
@@ -2487,21 +2684,39 @@
     handlebars "^4.5.1"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/tracking@2.0.0-beta.12":
-  version "2.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-2.0.0-beta.12.tgz#f3ae74ab2db7e10daba347a455fc22c587454224"
-  integrity sha512-+pBjv/0pj8gejf/C4MB6ShTh/+TWzIwvo8aBTAgOGOA2yh6llt8kSRt+ttLdNtbTCcVW6C0QEiTNk38IO5CQSw==
+"@glimmer/tracking@2.0.0-beta.15":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@glimmer/tracking/-/tracking-2.0.0-beta.15.tgz#a35b98be9306aa00cc49206d4ae406758f419e46"
+  integrity sha512-VXf7wF5vlYEF+uNPl/m3mnyoqDZ4MjD6qZYXTU++TQiedPAtpmJ2J2jCZ02nGSFXn5GEFRncB+vIQO+m7a7Y3A==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/validator" "0.73.0"
+    "@glimmer/validator" "0.77.6"
+
+"@glimmer/util@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.3.tgz#c91fc3b61743ddea3e4470cf1ed8378f88cc863f"
+  integrity sha512-pqkU2b4BOkmSehRPSbS4bIw1zk8K6dVkVbXdXRqVz4oKqM7c0zYR/5fV2Sjayd3gEElt71lAef5uBr+7WddDlA==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.77.3"
+    "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/util@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.0.tgz#21c93fd7f822ba641485953c3ad4d7e929ec17c1"
-  integrity sha512-S8DfVvNAIOUxSawKjSSxa8U6yu2VVcZjaMVy4yoJR0QKpo++V6x1HDBjDOQU0xKgr98lCJqoAnPKZT6t1/eahg==
+"@glimmer/util@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.5.tgz#b4e2909d34eb7db34c63fd9d942e0ffa458d4c90"
+  integrity sha512-Y78NnJClpz7sBks3q+ZNNVfCjy8ALcCQOG5GEIm/P9O3+eXMBsx2ac9Umu4LBZqmeINQ9CtFz10u2BiyxOtSQg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/interfaces" "0.77.5"
+    "@simple-dom/interface" "^1.4.0"
+
+"@glimmer/util@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.6.tgz#4997f9a066aab915f50c344b2aedab8108b4658b"
+  integrity sha512-IjrVvSv8fPCroyWHFaJO4q0iIy5s8Zge0PgghrI7Z4Ne5bKHifODy/6yAnA1EjE1NhHAVlZbHjI/pE17a+VjoA==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.77.6"
     "@simple-dom/interface" "^1.4.0"
 
 "@glimmer/util@^0.44.0":
@@ -2518,31 +2733,53 @@
     "@glimmer/interfaces" "^0.50.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.0.tgz#d523904f4faff0a3af570d215d679bc7c2148e29"
-  integrity sha512-fAs3XREHTw/ePYkAM8lKkNeo0//d/TJYWn2iM5SuPPglRJGATg/8p1Nk2iw31BofPvsT3WAnFbr0aWGGZF9paQ==
+"@glimmer/validator@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.77.3.tgz#bbbd802742983ad5deed66c02d636e0faa520c65"
+  integrity sha512-e/eUJszfBrr0wQkW1+vsiP8Sa+S7oBuSa1XPh1b7maGUNkWpk49THERfyULsWYGzrl5iYHWmM+Cl6proAXdI6g==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/global-context" "0.77.3"
+
+"@glimmer/validator@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.77.6.tgz#1271a344f2249e2835869dc3cacd91aaa9a7dda0"
+  integrity sha512-ZybFdN3Oc/qzwPNsu7GOf+9FylJyVv+QqGcXeE+eN5wkwv5RxhUZxpo+vdag47r6MVfsZvQlsbmGndwr5LkGjw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.0"
+    "@glimmer/global-context" "0.77.6"
 
-"@glimmer/vm@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.73.0.tgz#286b7fd3049bd922e6e61293ff040e3a4a392210"
-  integrity sha512-DokPu8ls8akbQcGwPpm1Z4I9m81de4PqkC8hhkMFQ9qj8BAA/4LRoJ5nxaJFJTq4Ub+kKIZ5owzGosSnucGZEg==
+"@glimmer/vm-babel-plugins@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.5.tgz#daffb6507aa6b08ec36f69d652897d339fdd0007"
+  integrity sha512-jTBM7fJMrIEy4/bCeI8e7ypR+AuWYzLA+KORCGbnTJtL/NYg4G8qwhQAZBtg1d3KmoqyqaCsyqE6f4/tzJO4eQ==
   dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/wire-format@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.73.0.tgz#2069aa68763dc409a3ea28b3819298376b4de5be"
-  integrity sha512-I3iLdUXClTDUuusq+/FiYA3g6Crr8KW4VmX6qgOxE4aG8kWqnlmDZNX73RvWJVDS0t7t/Cjrv+YwOf51DA75pg==
+"@glimmer/vm-babel-plugins@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.6.tgz#e74d61884e44c0d0db34bef78514ac37c0fc0d6f"
+  integrity sha512-oSAhYfAS4A6xDTAdY6mDDgxfcTyb4Cgm6SphKcrTBecpz2TaKRbTMdg8K6slI8n2sj5KDeBpXHPrPBYHoYtGHQ==
   dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    babel-plugin-debug-macros "^0.3.4"
 
-"@handlebars/parser@^2.0.0":
+"@glimmer/vm@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.77.6.tgz#8bfaed24797ba302f574fac838022ba1161e9f4e"
+  integrity sha512-OONfuQcl9QlRcendwZB7zcTnClousOBdFmCH56wI4CM5/EBwNbCYxEnFYaqRvJcOrWrRwGjF6+ubAnDLEbUfRw==
+  dependencies:
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/util" "0.77.6"
+
+"@glimmer/wire-format@0.77.6":
+  version "0.77.6"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.77.6.tgz#d3a1a9e27c16c9c89f48cd8500f36960dd648325"
+  integrity sha512-VjLlPbuuyWnkzbvibm9PGbhBbAnx+Hrc3jS/x9Av1P7JKXlKMeJIijYrnWrfdC/3TltbVuuwNo3fBCoShWwqQg==
+  dependencies:
+    "@glimmer/interfaces" "0.77.6"
+    "@glimmer/util" "0.77.6"
+
+"@handlebars/parser@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
@@ -4512,7 +4749,7 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^2.26.0", "@typescript-eslint/eslint-plugin@^2.27.0":
+"@typescript-eslint/eslint-plugin@^2.27.0":
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.27.0.tgz#e479cdc4c9cf46f96b4c287755733311b0d0ba4b"
   integrity sha512-/my+vVHRN7zYgcp0n4z5A6HAK7bvKGBiswaM5zIlOQczsxj/aiD7RcgD+dvVFuwFaGh5+kM7XA6Q6PN0bvb1tw==
@@ -4522,6 +4759,20 @@
     regexpp "^3.0.0"
     tsutils "^3.17.1"
 
+"@typescript-eslint/eslint-plugin@^4.18.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz#56f8da9ee118fe9763af34d6a526967234f6a7f0"
+  integrity sha512-CRQNQ0mC2Pa7VLwKFbrGVTArfdVDdefS+gTw0oC98vSI98IX5A8EVH4BzJ2FOB0YlCmm8Im36Elad/Jgtvveaw==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "4.19.0"
+    "@typescript-eslint/scope-manager" "4.19.0"
+    debug "^4.1.1"
+    functional-red-black-tree "^1.0.1"
+    lodash "^4.17.15"
+    regexpp "^3.0.0"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
+
 "@typescript-eslint/experimental-utils@2.27.0":
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a"
@@ -4532,7 +4783,19 @@
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/parser@^2.26.0", "@typescript-eslint/parser@^2.27.0":
+"@typescript-eslint/experimental-utils@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz#9ca379919906dc72cb0fcd817d6cb5aa2d2054c6"
+  integrity sha512-9/23F1nnyzbHKuoTqFN1iXwN3bvOm/PRIXSBR3qFAYotK/0LveEOHr5JT1WZSzcD6BESl8kPOG3OoDRKO84bHA==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/scope-manager" "4.19.0"
+    "@typescript-eslint/types" "4.19.0"
+    "@typescript-eslint/typescript-estree" "4.19.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^2.0.0"
+
+"@typescript-eslint/parser@^2.27.0":
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.27.0.tgz#d91664335b2c46584294e42eb4ff35838c427287"
   integrity sha512-HFUXZY+EdwrJXZo31DW4IS1ujQW3krzlRjBrFRrJcMDh0zCu107/nRfhk/uBasO8m0NVDbBF5WZKcIUMRO7vPg==
@@ -4542,6 +4805,29 @@
     "@typescript-eslint/typescript-estree" "2.27.0"
     eslint-visitor-keys "^1.1.0"
 
+"@typescript-eslint/parser@^4.18.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.19.0.tgz#4ae77513b39f164f1751f21f348d2e6cb2d11128"
+  integrity sha512-/uabZjo2ZZhm66rdAu21HA8nQebl3lAIDcybUoOxoI7VbZBYavLIwtOOmykKCJy+Xq6Vw6ugkiwn8Js7D6wieA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "4.19.0"
+    "@typescript-eslint/types" "4.19.0"
+    "@typescript-eslint/typescript-estree" "4.19.0"
+    debug "^4.1.1"
+
+"@typescript-eslint/scope-manager@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz#5e0b49eca4df7684205d957c9856f4e720717a4f"
+  integrity sha512-GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g==
+  dependencies:
+    "@typescript-eslint/types" "4.19.0"
+    "@typescript-eslint/visitor-keys" "4.19.0"
+
+"@typescript-eslint/types@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.19.0.tgz#5181d5d2afd02e5b8f149ebb37ffc8bd7b07a568"
+  integrity sha512-A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA==
+
 "@typescript-eslint/typescript-estree@2.27.0":
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8"
@@ -4555,6 +4841,27 @@
     semver "^6.3.0"
     tsutils "^3.17.1"
 
+"@typescript-eslint/typescript-estree@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz#8a709ffa400284ab72df33376df085e2e2f61147"
+  integrity sha512-3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA==
+  dependencies:
+    "@typescript-eslint/types" "4.19.0"
+    "@typescript-eslint/visitor-keys" "4.19.0"
+    debug "^4.1.1"
+    globby "^11.0.1"
+    is-glob "^4.0.1"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
+
+"@typescript-eslint/visitor-keys@4.19.0":
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz#cbea35109cbd9b26e597644556be4546465d8f7f"
+  integrity sha512-aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A==
+  dependencies:
+    "@typescript-eslint/types" "4.19.0"
+    eslint-visitor-keys "^2.0.0"
+
 "@webassemblyjs/ast@1.7.11":
   version "1.7.11"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
@@ -5390,6 +5697,11 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
+assertion-error@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
+
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -5771,6 +6083,13 @@ babel-plugin-debug-macros@^0.3.0, babel-plugin-debug-macros@^0.3.3:
   dependencies:
     semver "^5.3.0"
 
+babel-plugin-debug-macros@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
+  integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
+  dependencies:
+    semver "^5.3.0"
+
 babel-plugin-dynamic-import-node@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
@@ -5799,6 +6118,13 @@ babel-plugin-ember-modules-api-polyfill@^2.12.0, babel-plugin-ember-modules-api-
   dependencies:
     ember-rfc176-data "^0.3.12"
 
+babel-plugin-ember-modules-api-polyfill@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
+  integrity sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+
 babel-plugin-emotion@^10.0.20, babel-plugin-emotion@^10.0.27:
   version "10.0.33"
   resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz#ce1155dcd1783bbb9286051efee53f4e2be63e03"
@@ -5835,10 +6161,16 @@ babel-plugin-htmlbars-inline-precompile@^1.0.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22"
   integrity sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ==
 
-babel-plugin-htmlbars-inline-precompile@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-4.2.1.tgz#9a367f8d7ecb9fb2c2e886edfe285caf7cb9766d"
-  integrity sha512-MCJXk+1R0YjlF/F52eDbhJTpsnqRVYsPYVP9d0jEu7E46AcRPEWDL5tfSweiQWHLKG017BIedATb91KcIoT3zA==
+babel-plugin-htmlbars-inline-precompile@^5.0.0, babel-plugin-htmlbars-inline-precompile@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.2.1.tgz#e90818f23e6eba3073b341712bd651853ad9bfb2"
+  integrity sha512-83zmTXGMCjVkfSETFn1Cfvh8Mk+2+Q/QmmOIuqkan1bRvLQuRCqCqwY9x0WzUfwOlGF3jO+NRRFrzwM/h/+E5Q==
+  dependencies:
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    parse-static-imports "^1.1.0"
+    string.prototype.matchall "^4.0.4"
 
 babel-plugin-istanbul@^6.0.0:
   version "6.0.0"
@@ -5936,7 +6268,7 @@ babel-plugin-minify-type-constructors@^0.4.3:
   dependencies:
     babel-helper-is-void-0 "^0.4.3"
 
-babel-plugin-module-resolver@^3.1.1:
+babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
   integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
@@ -6763,6 +7095,24 @@ broccoli-babel-transpiler@^7.4.0:
     rsvp "^4.8.4"
     workerpool "^3.1.1"
 
+broccoli-babel-transpiler@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
+  integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/polyfill" "^7.11.5"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-persistent-filter "^2.2.1"
+    clone "^2.1.2"
+    hash-for-dep "^1.4.7"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.9"
+    json-stable-stringify "^1.0.1"
+    rsvp "^4.8.4"
+    workerpool "^3.1.1"
+
 broccoli-builder@^0.18.14:
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
@@ -7084,7 +7434,7 @@ broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.2.2, broccoli-p
     sync-disk-cache "^1.3.3"
     walk-sync "^1.0.0"
 
-broccoli-persistent-filter@^3.1.0:
+broccoli-persistent-filter@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.2.tgz#41da6b9577be09a170ecde185f2c5a6099f99c4e"
   integrity sha512-CbU95RXXVyy+eJV9XTiHUC7NnsY3EvdVrGzp3YgyvO2bzXZFE5/GzDp4X/VQqX+jsk4qyT1HvMOF0sD1DX68TQ==
@@ -7201,6 +7551,11 @@ broccoli-source@^1.1.0:
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
   integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
 
+broccoli-source@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b"
+  integrity sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==
+
 broccoli-source@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.0.tgz#c7c9ba24505941b72a0244568285bc859f69dfbd"
@@ -7637,7 +7992,7 @@ calculate-cache-key-for-tree@^2.0.0:
   dependencies:
     json-stable-stringify "^1.0.1"
 
-call-bind@^1.0.2:
+call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
@@ -7786,6 +8141,18 @@ ccount@^1.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
   integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
 
+chai@^4.2.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49"
+  integrity sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==
+  dependencies:
+    assertion-error "^1.1.0"
+    check-error "^1.0.2"
+    deep-eql "^3.0.1"
+    get-func-name "^2.0.0"
+    pathval "^1.1.1"
+    type-detect "^4.0.5"
+
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -7862,6 +8229,11 @@ charm@^1.0.0:
   dependencies:
     inherits "^2.0.1"
 
+check-error@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
+  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
+
 chokidar@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
@@ -8955,6 +9327,13 @@ dedent@^0.7.0:
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
+deep-eql@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
+  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
+  dependencies:
+    type-detect "^4.0.0"
+
 deep-equal@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
@@ -9509,6 +9888,44 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0:
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
   integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==
 
+ember-cli-babel-plugin-helpers@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
+  integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
+
+ember-cli-babel@7.26.2, ember-cli-babel@^7.23.0, ember-cli-babel@^7.26.2:
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.2.tgz#497985e741ffcc08f89f98c9464509e91cdb2809"
+  integrity sha512-bSSlFbUBfLwaabGpLgoLkOKMIdDRWu3cPBNrN2UQXfzlPei3nZblDatSzPbCZ7O5faJHRi13ra3Q4odnCoBtTg==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.12.0"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
 ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
@@ -9528,7 +9945,7 @@ ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0,
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
-ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.4.1, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.4.1, ember-cli-babel@^7.7.3:
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.19.0.tgz#e6eddea18a867231fcf90a80689e92b98be9a63b"
   integrity sha512-HiWKuoyy35vGEr+iCw6gUnQ3pS5qslyTlKEDW8cVoMbvZNGYBgRxHed5nklVUh+BS74AwR9lsp25BTAagYAP9Q==
@@ -9597,23 +10014,24 @@ ember-cli-htmlbars@^3.0.1:
     json-stable-stringify "^1.0.1"
     strip-bom "^3.0.0"
 
-ember-cli-htmlbars@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.3.1.tgz#61793964fc2599ce750db9e972ab55c6dd177c48"
-  integrity sha512-ZjQTt44euDoqLvUkWbt1svgNCXgLzOztEbc2qqYMQvhQig416LMrWK7l3SSbNU+BtLD5UIxmwvLfF1tsO2CVyA==
+ember-cli-htmlbars@^5.7.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.1.tgz#eb5b88c7d9083bc27665fb5447a9b7503b32ce4f"
+  integrity sha512-9laCgL4tSy48orNoQgQKEHp93MaqAs9ZOl7or5q+8iyGGJHW6sVXIYrVv5/5O9HfV6Ts8/pW1rSoaeKyLUE+oA==
   dependencies:
     "@ember/edition-utils" "^1.2.0"
-    babel-plugin-htmlbars-inline-precompile "^4.2.0"
+    babel-plugin-htmlbars-inline-precompile "^5.0.0"
     broccoli-debug "^0.6.5"
-    broccoli-persistent-filter "^3.1.0"
+    broccoli-persistent-filter "^3.1.2"
     broccoli-plugin "^4.0.3"
     common-tags "^1.8.0"
-    ember-cli-babel-plugin-helpers "^1.1.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^5.1.2"
     fs-tree-diff "^2.0.1"
     hash-for-dep "^1.5.1"
     heimdalljs-logger "^0.1.10"
     json-stable-stringify "^1.0.1"
-    semver "^7.3.2"
+    semver "^7.3.4"
     silent-error "^1.1.1"
     strip-bom "^4.0.0"
     walk-sync "^2.2.0"
@@ -9767,6 +10185,15 @@ ember-cli-uglify@^3.0.0:
     broccoli-uglify-sourcemap "^3.1.0"
     lodash.defaultsdeep "^4.6.0"
 
+ember-cli-version-checker@5.1.2, ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz#649c7b6404902e3b3d69c396e054cea964911ab0"
+  integrity sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==
+  dependencies:
+    resolve-package-path "^3.1.0"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+
 ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
@@ -9999,6 +10426,11 @@ ember-rfc176-data@^0.3.12:
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.12.tgz#90d82878e69e2ac9a5438e8ce14d12c6031c5bd2"
   integrity sha512-g9HeZj/gU5bfIIrGXkP7MhS2b3Vu5DfNUrYr14hy99TgIvtZETO+96QF4WOEUXGjIJdfTRjerVnQlqngPQSv1g==
 
+ember-rfc176-data@^0.3.17:
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
+  integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw==
+
 ember-router-generator@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-2.0.0.tgz#d04abfed4ba8b42d166477bbce47fccc672dbde0"
@@ -10022,36 +10454,46 @@ ember-source-channel-url@^2.0.1:
   dependencies:
     got "^8.0.1"
 
-ember-source@~3.17.3:
-  version "3.17.3"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.17.3.tgz#315b198848bcc1699928579b2d7fc2d607ebf63e"
-  integrity sha512-mZ2a4MRJm+QsZ61q7p4Ulq+07IERgEF7mEzOPmqES+J4PpeXyWHAYh1MnSWHz3W5jQhwHQAPs6WTZE0TbAsS2Q==
+ember-source@~3.26.0:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.26.1.tgz#8c9e8a314fb0da447b944d64f9d92a80a628d7b5"
+  integrity sha512-5/NATBo5h9m1N52ITVksmjtGlYhGHLl4lDErAWv5/DC9zYe9ZR93NtymR6PEqrRilXc2x0KWd3NlOsWUoJRUOw==
   dependencies:
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/plugin-transform-block-scoping" "^7.8.3"
     "@babel/plugin-transform-object-assign" "^7.8.3"
     "@ember/edition-utils" "^1.2.0"
+    "@glimmer/vm-babel-plugins" "0.77.5"
     babel-plugin-debug-macros "^0.3.3"
     babel-plugin-filter-imports "^4.0.0"
-    broccoli-concat "^3.7.4"
+    broccoli-concat "^4.2.4"
     broccoli-debug "^0.6.4"
     broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.2"
-    chalk "^3.0.0"
-    ember-cli-babel "^7.18.0"
+    broccoli-merge-trees "^4.2.0"
+    chalk "^4.0.0"
+    ember-cli-babel "^7.23.0"
     ember-cli-get-component-path-option "^1.0.0"
     ember-cli-is-package-missing "^1.0.0"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-path-utils "^1.0.0"
     ember-cli-string-utils "^1.1.0"
-    ember-cli-version-checker "^3.1.3"
+    ember-cli-version-checker "^5.1.1"
     ember-router-generator "^2.0.0"
     inflection "^1.12.0"
-    jquery "^3.4.1"
-    resolve "^1.14.2"
-    semver "^6.1.1"
+    jquery "^3.5.1"
+    resolve "^1.17.0"
+    semver "^7.3.4"
     silent-error "^1.1.1"
 
+ember-template-imports@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-template-imports/-/ember-template-imports-1.1.1.tgz#41600ee044f2a9d5b7882c814cf25b260e31bac7"
+  integrity sha512-T6BMhEYIiYQK2/FI6Nn8WgidZagUAUjdLX4uKIaNY4+4ZmczD3gnVlR6sx4BU8DNAIi33S45ElPNjnUYgrjYpw==
+  dependencies:
+    broccoli-stew "^3.0.0"
+    ember-cli-version-checker "^5.1.2"
+    validate-peer-dependencies "^1.1.0"
+
 ember-template-lint@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.4.1.tgz#c388ea9d7112621c308967033f2e197ec199ebaa"
@@ -10327,6 +10769,28 @@ es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es-
     string.prototype.trimleft "^2.1.1"
     string.prototype.trimright "^2.1.1"
 
+es-abstract@^1.18.0-next.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
+  integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    is-callable "^1.2.3"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.2"
+    is-string "^1.0.5"
+    object-inspect "^1.9.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.0"
+
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
@@ -10503,6 +10967,11 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
 eslint@^6.8.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
@@ -11538,7 +12007,12 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2:
+get-func-name@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
+  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
   integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
@@ -11908,6 +12382,18 @@ globby@11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+globby@^11.0.1:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
+  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -12112,6 +12598,11 @@ has-ansi@^3.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+has-bigints@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
@@ -12151,6 +12642,11 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
+has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
@@ -12879,6 +13375,15 @@ internal-slot@^1.0.2:
     has "^1.0.3"
     side-channel "^1.0.2"
 
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+  dependencies:
+    get-intrinsic "^1.1.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
 interpret@1.2.0, interpret@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
@@ -12966,6 +13471,11 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
+is-bigint@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
+  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
@@ -12980,6 +13490,13 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
+is-boolean-object@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
+  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  dependencies:
+    call-bind "^1.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -13000,6 +13517,11 @@ is-callable@^1.1.4, is-callable@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
+is-callable@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
+  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
+
 is-ci@2.0.0, is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -13007,6 +13529,13 @@ is-ci@2.0.0, is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
+is-core-module@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -13170,11 +13699,21 @@ is-map@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
   integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==
 
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
 is-npm@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d"
   integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
 
+is-number-object@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
+  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -13279,7 +13818,7 @@ is-regex@^1.0.4, is-regex@^1.0.5:
   dependencies:
     has "^1.0.3"
 
-is-regex@^1.1.1:
+is-regex@^1.1.1, is-regex@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
   integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
@@ -13568,10 +14107,10 @@ jest-worker@^26.2.1, jest-worker@^26.6.2:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jquery@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
-  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+jquery@^3.5.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
 js-reporters@1.2.1:
   version "1.2.1"
@@ -13925,6 +14464,14 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+line-column@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
+  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
+  dependencies:
+    isarray "^1.0.0"
+    isobject "^2.0.0"
+
 line-stream@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/line-stream/-/line-stream-0.0.0.tgz#888b7cc7951c6a05ce4d696dd1e6b8262371bb45"
@@ -14259,6 +14806,13 @@ lodash@^4.0.1, lodash@^4.17.19, lodash@^4.17.20:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+log-symbols@2.2.0, log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
 log-symbols@3.0.0, log-symbols@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
@@ -14266,13 +14820,6 @@ log-symbols@3.0.0, log-symbols@^3.0.0:
   dependencies:
     chalk "^2.4.2"
 
-log-symbols@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
 loglevel@^1.6.6:
   version "1.6.7"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz#b3e034233188c68b889f5b862415306f565e2c56"
@@ -14349,6 +14896,13 @@ magic-string@^0.24.0:
   dependencies:
     sourcemap-codec "^1.4.1"
 
+magic-string@^0.25.7:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -14962,6 +15516,13 @@ mkdirp@0.5.3:
   dependencies:
     minimist "^1.2.5"
 
+mkdirp@0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512"
+  integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==
+  dependencies:
+    minimist "^1.2.5"
+
 mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -14974,6 +15535,35 @@ mktemp@~0.4.0:
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
   integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
 
+mocha@^6.2.0:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-6.2.3.tgz#e648432181d8b99393410212664450a4c1e31912"
+  integrity sha512-0R/3FvjIGH3eEuG17ccFPk117XL2rWxatr81a57D+r/x2uTYZRbdZ4oVidEUMh2W2TJDa7MdAb12Lm2/qrKajg==
+  dependencies:
+    ansi-colors "3.2.3"
+    browser-stdout "1.3.1"
+    debug "3.2.6"
+    diff "3.5.0"
+    escape-string-regexp "1.0.5"
+    find-up "3.0.0"
+    glob "7.1.3"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "3.13.1"
+    log-symbols "2.2.0"
+    minimatch "3.0.4"
+    mkdirp "0.5.4"
+    ms "2.1.1"
+    node-environment-flags "1.0.5"
+    object.assign "4.1.0"
+    strip-json-comments "2.0.1"
+    supports-color "6.0.0"
+    which "1.3.1"
+    wide-align "1.1.3"
+    yargs "13.3.2"
+    yargs-parser "13.1.2"
+    yargs-unparser "1.6.0"
+
 mocha@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.1.tgz#89fbb30d09429845b1bb893a830bf5771049a441"
@@ -15171,6 +15761,14 @@ no-case@^3.0.3:
     lower-case "^2.0.1"
     tslib "^1.10.0"
 
+node-environment-flags@1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.5.tgz#fa930275f5bf5dae188d6192b24b4c8bbac3d76a"
+  integrity sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+    semver "^5.7.0"
+
 node-environment-flags@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
@@ -15521,6 +16119,11 @@ object-inspect@^1.7.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
+object-inspect@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
+  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+
 object-is@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
@@ -15548,6 +16151,16 @@ object.assign@4.1.0, object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
+object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
 object.entries@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b"
@@ -16066,6 +16679,11 @@ parse-path@^4.0.0:
     is-ssh "^1.3.0"
     protocols "^1.4.0"
 
+parse-static-imports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parse-static-imports/-/parse-static-imports-1.1.0.tgz#ae2f18f18da1a993080ae406a5219455c0bbad5d"
+  integrity sha512-HlxrZcISCblEV0lzXmAHheH/8qEkKgmqkdxyHTPbSqsTUV8GzqmN1L+SSti+VbNPfbBO3bYLPHDiUs2avbAdbA==
+
 parse-url@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f"
@@ -16135,6 +16753,11 @@ path-browserify@0.0.1:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
   integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
+path-browserify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
+
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -16225,6 +16848,11 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathval@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
+
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
@@ -17301,6 +17929,14 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
+regexp.prototype.flags@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -17693,6 +18329,14 @@ resolve-package-path@^2.0.0:
     path-root "^0.1.1"
     resolve "^1.13.1"
 
+resolve-package-path@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-3.1.0.tgz#35faaa5d54a9c7dd481eb7c4b2a44410c9c763d8"
+  integrity sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.17.0"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -17720,6 +18364,14 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.17.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 responselike@1.0.2, responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -17935,6 +18587,15 @@ scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
+schema-utils@3.0.0, schema-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
+  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+  dependencies:
+    "@types/json-schema" "^7.0.6"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 schema-utils@^0.4.4:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
@@ -17969,15 +18630,6 @@ schema-utils@^2.6.6, schema-utils@^2.7.0:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
-  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
-  dependencies:
-    "@types/json-schema" "^7.0.6"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -18034,6 +18686,13 @@ semver@^7.3.2:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.3.4:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -18209,6 +18868,15 @@ side-channel@^1.0.2:
     es-abstract "^1.17.0-next.1"
     object-inspect "^1.7.0"
 
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -18501,7 +19169,7 @@ source-map@~0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
-sourcemap-codec@^1.4.1:
+sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
@@ -18777,6 +19445,19 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
     regexp.prototype.flags "^1.3.0"
     side-channel "^1.0.2"
 
+string.prototype.matchall@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29"
+  integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+    has-symbols "^1.0.1"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.3.1"
+    side-channel "^1.0.4"
+
 string.prototype.padend@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3"
@@ -18801,6 +19482,14 @@ string.prototype.trimend@^1.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
 string.prototype.trimleft@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
@@ -18827,6 +19516,14 @@ string.prototype.trimstart@^1.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -19595,6 +20292,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-detect@^4.0.0, type-detect@^4.0.5:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
 type-fest@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.10.0.tgz#7f06b2b9fbfc581068d1341ffabd0349ceafc642"
@@ -19647,6 +20349,11 @@ typescript@^3.8.3, typescript@~3.8.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
   integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
 
+typescript@~4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
+  integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
+
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -19670,6 +20377,16 @@ umask@^1.1.0:
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
   integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
 
+unbox-primitive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz#eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f"
+  integrity sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.0"
+    has-symbols "^1.0.0"
+    which-boxed-primitive "^1.0.1"
+
 underscore.string@^3.2.2, underscore.string@~3.3.4:
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.5.tgz#fc2ad255b8bd309e239cbc5816fd23a9b7ea4023"
@@ -20087,6 +20804,14 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
+validate-peer-dependencies@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-1.1.0.tgz#8240a115df121ea35b0bb082255b38b5c591d7e1"
+  integrity sha512-eHHxI3fNMqu8bzWPRWWgV72kBJkWwRCeEua7yC7UI6dsqC55orhxKAC3uyQfCjjToOyAZ8mpNrbQH+NMoYBn1w==
+  dependencies:
+    resolve-package-path "^3.1.0"
+    semver "^7.3.2"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -20488,6 +21213,17 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
+which-boxed-primitive@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"