diff --git a/test-packages/macro-sample-addon/package.json b/test-packages/macro-sample-addon/package.json
index 99953e3ab..aee6b8cf2 100644
--- a/test-packages/macro-sample-addon/package.json
+++ b/test-packages/macro-sample-addon/package.json
@@ -36,10 +36,9 @@
     "@embroider/test-support": "0.36.0",
     "@embroider/webpack": "0.41.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.10.1",
     "ember-cli-dependency-checker": "^3.1.0",
+    "ember-cli": "~3.26.1",
     "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-inject-live-reload": "^1.8.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.3",
diff --git a/yarn.lock b/yarn.lock
index 4c7deded0..6b609b01b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1384,6 +1384,56 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.2"
 
+"@embroider/babel-loader-7@0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/babel-loader-7/-/babel-loader-7-0.40.0.tgz#a6cd69cc6e1313d94bb61dda6bf372dab4352082"
+  integrity sha512-mcoxWdk9lDcRQb6mBoFjxOJlPGtx1XUj2a+gK6cr0VQLFpYLpU2xC+GIvc/f4bnwLQXZ0Mx0v8Lv+3y5hQw6jQ==
+  dependencies:
+    babel-core "^6.26.3"
+    babel-loader "7"
+
+"@embroider/compat@0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.40.0.tgz#231a3782948c5fe7eede4d6bdfe26af2d5f8e411"
+  integrity sha512-5Dh/1zg+7cF15l4v5MmPB6Kl+X0uMfQbcoXec+lDPkCbUMzF95RiQlwkNffegM0pMzAwSiheoYq7mpqxOy9yew==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/core" "^7.12.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/preset-env" "^7.12.1"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "@embroider/macros" "0.40.0"
+    "@types/babel__code-frame" "^7.0.2"
+    "@types/yargs" "^15.0.9"
+    assert-never "^1.1.0"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    babylon "^6.18.0"
+    bind-decorator "^1.0.11"
+    broccoli "^3.4.2"
+    broccoli-concat "^3.7.3"
+    broccoli-file-creator "^2.1.1"
+    broccoli-funnel ef4/broccoli-funnel#c70d060076e14793e8495571f304a976afc754ac
+    broccoli-merge-trees "^3.0.0"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.0"
+    broccoli-source "^3.0.0"
+    chalk "^4.1.0"
+    debug "^3.1.0"
+    fs-extra "^7.0.0"
+    fs-tree-diff "^2.0.0"
+    jsdom "^16.4.0"
+    lodash "^4.17.10"
+    pkg-up "^3.1.0"
+    resolve "^1.8.1"
+    resolve-package-path "^1.2.2"
+    semver "^7.3.2"
+    symlink-or-copy "^1.2.0"
+    tree-sync "^2.0.0"
+    typescript-memoize "^1.0.0"
+    walk-sync "^1.1.3"
+    yargs "^16.1.0"
+
 "@embroider/core@0.33.0", "@embroider/core@^0.33.0":
   version "0.33.0"
   resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.33.0.tgz#0fb1752d6e34ea45368e65c42e13220a57ffae76"
@@ -1462,6 +1512,51 @@
     walk-sync "^1.1.3"
     wrap-legacy-hbs-plugin-if-needed "^1.0.1"
 
+"@embroider/core@0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.40.0.tgz#520efffa1cb17dde87ac3c29c19e39b1f7e35e7a"
+  integrity sha512-TdiavOxRluj2n5/gso8+6K92IYVGgBeFvUfH3mLk4me+S40ss2+M5XtY7gsryR30qlCyjiXXoZb6/CbZPBqfQA==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/parser" "^7.12.3"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-transform-runtime" "^7.12.1"
+    "@babel/runtime" "^7.12.5"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    "@embroider/macros" "0.40.0"
+    "@embroider/shared-internals" "0.40.0"
+    assert-never "^1.1.0"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-node-api "^1.7.0"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.1"
+    broccoli-source "^3.0.0"
+    debug "^3.1.0"
+    escape-string-regexp "^4.0.0"
+    fast-sourcemap-concat "^1.4.0"
+    filesize "^4.1.2"
+    fs-extra "^7.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.4.2"
+    js-string-escape "^1.0.1"
+    jsdom "^16.4.0"
+    lodash "^4.17.10"
+    pkg-up "^3.1.0"
+    resolve "^1.8.1"
+    resolve-package-path "^1.2.2"
+    strip-bom "^3.0.0"
+    typescript-memoize "^1.0.0"
+    walk-sync "^1.1.3"
+    wrap-legacy-hbs-plugin-if-needed "^1.0.1"
+
+"@embroider/hbs-loader@0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/hbs-loader/-/hbs-loader-0.40.0.tgz#4e922a92b28bdb4668b04b473a40889d6d593a87"
+  integrity sha512-JjUqc1agwacBG79g1iTvvdW3BuGe09vLjGbRviE5TlhEUTyi4mSP+4t/opGEO4XFwJpHwSjXofKWB6lxtkZpXQ==
+  dependencies:
+    loader-utils "^1.1.0"
+
 "@embroider/macros@0.33.0":
   version "0.33.0"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.33.0.tgz#d5826ea7565bb69b57ba81ed528315fe77acbf9d"
@@ -1504,6 +1599,18 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
+"@embroider/macros@0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.40.0.tgz#f58763b4cfb9b4089679b478a28627595341bc5a"
+  integrity sha512-ygChvFoebSi/N8b+A+XFncd454gLYBYHancrtY0AE/h6Y1HouoqQvji/IfaLisGoeuwUWuI9rCBv97COweu/rA==
+  dependencies:
+    "@embroider/shared-internals" "0.40.0"
+    assert-never "^1.1.0"
+    ember-cli-babel "^7.23.0"
+    lodash "^4.17.10"
+    resolve "^1.8.1"
+    semver "^7.3.2"
+
 "@embroider/sample-lib@link:test-packages/sample-lib":
   version "0.0.0"
 
@@ -1520,6 +1627,48 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
+"@embroider/shared-internals@0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
+  integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^7.0.1"
+    lodash "^4.17.10"
+    pkg-up "^3.1.0"
+    resolve-package-path "^1.2.2"
+    semver "^7.3.2"
+    typescript-memoize "^1.0.0-alpha.3"
+
+"@embroider/webpack@0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/webpack/-/webpack-0.40.0.tgz#cd4c67d224fda29f940df0cb5ebae911a386933d"
+  integrity sha512-wmmCN360JElrKbIONtwzON4FmUzqNK+EQd6cmKI54poPKpxWUHfEHn9yQuJaMmqi3z2Gv3v42p0Agt/JnidXaQ==
+  dependencies:
+    "@babel/core" "^7.12.3"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@embroider/babel-loader-7" "0.40.0"
+    "@embroider/hbs-loader" "0.40.0"
+    "@types/loader-utils" "^2.0.1"
+    "@types/source-map" "^0.5.7"
+    babel-core "^6.26.3"
+    babel-loader "^8.2.2"
+    babel-preset-env "^1.7.0"
+    css-loader "^5.0.1"
+    csso "^4.1.0"
+    debug "^3.1.0"
+    fs-extra "^7.0.0"
+    jsdom "^16.4.0"
+    loader-utils "^2.0.0"
+    lodash "^4.17.10"
+    mini-css-extract-plugin "^1.3.2"
+    pkg-up "^3.1.0"
+    source-map-url "^0.4.0"
+    style-loader "^2.0.0"
+    terser "^5.5.1"
+    thread-loader "^3.0.1"
+
 "@eslint/eslintrc@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
@@ -4947,6 +5096,23 @@ broccoli-concat@^4.2.4:
     lodash.omit "^4.1.0"
     lodash.uniq "^4.2.0"
 
+broccoli-concat@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.5.tgz#d578f00094048b5fc87195e82fbdbde20d838d29"
+  integrity sha512-dFB5ATPwOyV8S2I7a07HxCoutoq23oY//LhM6Mou86cWUTB174rND5aQLR7Fu8FjFFLxoTbkk7y0VPITJ1IQrw==
+  dependencies:
+    broccoli-debug "^0.6.5"
+    broccoli-kitchen-sink-helpers "^0.3.1"
+    broccoli-plugin "^4.0.2"
+    ensure-posix-path "^1.0.2"
+    fast-sourcemap-concat "^2.1.0"
+    find-index "^1.1.0"
+    fs-extra "^8.1.0"
+    fs-tree-diff "^2.0.1"
+    lodash.merge "^4.6.2"
+    lodash.omit "^4.1.0"
+    lodash.uniq "^4.2.0"
+
 broccoli-config-loader@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
@@ -5133,6 +5299,24 @@ broccoli-funnel@^3.0.5:
     path-posix "^1.0.0"
     walk-sync "^2.0.2"
 
+broccoli-funnel@ef4/broccoli-funnel#c70d060076e14793e8495571f304a976afc754ac:
+  version "2.0.2-ef4.0"
+  resolved "https://codeload.github.com/ef4/broccoli-funnel/tar.gz/c70d060076e14793e8495571f304a976afc754ac"
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^1.3.0"
+    debug "^2.2.0"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^0.5.3"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    mkdirp "^0.5.0"
+    path-posix "^1.0.0"
+    rimraf "^2.4.3"
+    symlink-or-copy "^1.0.0"
+    walk-sync "^2.2.0"
+
 broccoli-kitchen-sink-helpers@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
@@ -8866,6 +9050,103 @@ ember-cli@~3.25.2:
     workerpool "^6.0.3"
     yam "^1.0.0"
 
+ember-cli@~3.26.1:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.26.1.tgz#43e924454f1fcff6157863925d0eb33bfa593c24"
+  integrity sha512-jJ0kMob21A/HIqkDNWQMZnnpadjS/xaBlv1RU1NoCUi+3Lqpt9esDT9cK0QCFp9vh4zfU4BEBNYkMN/SiQMaGg==
+  dependencies:
+    "@babel/core" "^7.12.10"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-module-resolver "^4.0.0"
+    bower-config "^1.4.3"
+    bower-endpoint-parser "0.2.2"
+    broccoli "^3.5.0"
+    broccoli-amd-funnel "^2.0.1"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-builder "^0.18.14"
+    broccoli-concat "^4.2.5"
+    broccoli-config-loader "^1.0.1"
+    broccoli-config-replace "^1.1.2"
+    broccoli-debug "^0.6.5"
+    broccoli-funnel "^2.0.2"
+    broccoli-funnel-reducer "^1.0.0"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-middleware "^2.1.1"
+    broccoli-slow-trees "^3.1.0"
+    broccoli-source "^3.0.0"
+    broccoli-stew "^3.0.0"
+    calculate-cache-key-for-tree "^2.0.0"
+    capture-exit "^2.0.0"
+    chalk "^4.1.0"
+    ci-info "^2.0.0"
+    clean-base-url "^1.0.0"
+    compression "^1.7.4"
+    configstore "^5.0.1"
+    console-ui "^3.1.2"
+    core-object "^3.1.5"
+    dag-map "^2.0.2"
+    diff "^5.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-lodash-subset "^2.0.1"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-preprocess-registry "^3.3.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-source-channel-url "^3.0.0"
+    ensure-posix-path "^1.1.1"
+    execa "^5.0.0"
+    exit "^0.1.2"
+    express "^4.17.1"
+    filesize "^6.1.0"
+    find-up "^5.0.0"
+    find-yarn-workspace-root "^2.0.0"
+    fixturify-project "^2.1.0"
+    fs-extra "^9.1.0"
+    fs-tree-diff "^2.0.1"
+    get-caller-file "^2.0.5"
+    git-repo-info "^2.1.1"
+    glob "^7.1.6"
+    heimdalljs "^0.2.6"
+    heimdalljs-fs-monitor "^1.1.0"
+    heimdalljs-graph "^1.0.0"
+    heimdalljs-logger "^0.1.10"
+    http-proxy "^1.18.1"
+    inflection "^1.12.0"
+    is-git-url "^1.0.0"
+    is-language-code "^2.0.0"
+    isbinaryfile "^4.0.6"
+    js-yaml "^3.14.0"
+    json-stable-stringify "^1.0.1"
+    leek "0.0.24"
+    lodash.template "^4.5.0"
+    markdown-it "^12.0.4"
+    markdown-it-terminal "0.2.1"
+    minimatch "^3.0.4"
+    morgan "^1.10.0"
+    nopt "^3.0.6"
+    npm-package-arg "^8.1.0"
+    p-defer "^3.0.0"
+    portfinder "^1.0.28"
+    promise-map-series "^0.3.0"
+    promise.hash.helper "^1.0.7"
+    quick-temp "^0.1.8"
+    resolve "^1.19.0"
+    resolve-package-path "^3.1.0"
+    sane "^4.1.0"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    sort-package-json "^1.48.0"
+    symlink-or-copy "^1.3.1"
+    temp "0.9.4"
+    testem "^3.2.0"
+    tiny-lr "^2.0.0"
+    tree-sync "^2.1.0"
+    uuid "^8.3.2"
+    walk-sync "^2.2.0"
+    watch-detector "^1.0.0"
+    workerpool "^6.0.3"
+    yam "^1.0.0"
+
 ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.3.tgz#356283a3ebc85d0678c9a8f711b8dc877e25e845"
@@ -18273,7 +18554,7 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-thread-loader@^3.0.4:
+thread-loader@^3.0.1, thread-loader@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-3.0.4.tgz#c392e4c0241fbc80430eb680e4886819b504a31b"
   integrity sha512-ByaL2TPb+m6yArpqQUZvP+5S1mZtXsEP7nWKKlAUTm7fCml8kB5s1uI3+eHRP2bk5mVYfRSBI7FFf+tWEyLZwA==