diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6b6722a2..40e47ec9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,68 +1,109 @@
 # Embroider Changelog
 
-Deprecated as of 10.7.0. highlight(lang, code, ...args) has been deprecated.
-Deprecated as of 10.7.0. Please use highlight(code, options) instead.
-https://github.com/highlightjs/highlight.js/issues/2277
+## v0.40.0 (2021-04-24)
 
-Deprecated as of 10.7.0. highlight(lang, code, ...args) has been deprecated.
-Deprecated as of 10.7.0. Please use highlight(code, options) instead.
-https://github.com/highlightjs/highlight.js/issues/2277
+#### :boom: Breaking Change
 
-Deprecated as of 10.7.0. highlight(lang, code, ...args) has been deprecated.
-Deprecated as of 10.7.0. Please use highlight(code, options) instead.
-https://github.com/highlightjs/highlight.js/issues/2277
+- `compat`, `core`, `hbs-loader`, `shared-internals`, `webpack`
+  - [#652](https://github.com/embroider-build/embroider/pull/652) webpack 5 ([@ef4](https://github.com/ef4)).
+    - If you have customized webpack config, you may need to update it for webpack 5.
+    - webpack is now a peerDependency of @embroider/webpack so you have more direct control over its version and can import any plugins out of it that you might need
+
+#### :rocket: Enhancement
+
+- `compat`
+  - [#754](https://github.com/embroider-build/embroider/pull/754) compatibility with ember-cli-htmlbars serialization for improved build performance ([@ef4](https://github.com/ef4))
+  - [#763](https://github.com/embroider-build/embroider/pull/763) Add Compat Adapter for `@html-next/vertical-collection` ([@alexlafroscia](https://github.com/alexlafroscia))
+- `addon-shim`, `shared-internals`, `util`
+  - [#773](https://github.com/embroider-build/embroider/pull/773) Updates to addon shim ([@ef4](https://github.com/ef4))
+
+#### :bug: Bug Fix
+
+- `compat`
+  - [#728](https://github.com/embroider-build/embroider/pull/728) Avoid building excessive copies of addons that appear in peerDependencies ([@charlespierce](https://github.com/charlespierce))
+- `compat`, `core`, `router`, `shared-internals`, `util`, `webpack`
+  - [#752](https://github.com/embroider-build/embroider/pull/752) add Windows support to CI matrix ([@thoov](https://github.com/thoov))
+
+#### :memo: Documentation
+
+- [#753](https://github.com/embroider-build/embroider/pull/753) Readme: Add splitAtRoutes to options ([@scottmessinger](https://github.com/scottmessinger))
+
+#### :house: Internal
+
+- Other
+  - [#775](https://github.com/embroider-build/embroider/pull/775) update scenario-tester ([@ef4](https://github.com/ef4))
+- `router`
+  - [#756](https://github.com/embroider-build/embroider/pull/756) Leverage test-scenarios from ember-auto-import ([@thoov](https://github.com/thoov))
+
+#### Committers: 6
+
+- Alex LaFroscia ([@alexlafroscia](https://github.com/alexlafroscia))
+- Charles Pierce ([@charlespierce](https://github.com/charlespierce))
+- Edward Faulkner ([@ef4](https://github.com/ef4))
+- Robert Jackson ([@rwjblue](https://github.com/rwjblue))
+- Scott Ames-Messinger ([@scottmessinger](https://github.com/scottmessinger))
+- Travis Hoover ([@thoov](https://github.com/thoov))
 
 ## v0.39.1 (2021-03-31)
 
 #### :bug: Bug Fix
-* `compat`
-  * [#751](https://github.com/embroider-build/embroider/pull/751) Fix node 10 support ([@thoov](https://github.com/thoov))
+
+- `compat`
+  - [#751](https://github.com/embroider-build/embroider/pull/751) Fix node 10 support ([@thoov](https://github.com/thoov))
 
 #### Committers: 1
+
 - Travis Hoover ([@thoov](https://github.com/thoov))
 
 ## v0.39.0 (2021-03-31)
 
 #### :rocket: Enhancement
-* `core`, `shared-internals`
-  * [#749](https://github.com/embroider-build/embroider/pull/749) exposing some features for browser-based build tools ([@ef4](https://github.com/ef4))
+
+- `core`, `shared-internals`
+  - [#749](https://github.com/embroider-build/embroider/pull/749) exposing some features for browser-based build tools ([@ef4](https://github.com/ef4))
 
 #### Committers: 1
+
 - Edward Faulkner ([@ef4](https://github.com/ef4))
 
 ## v0.38.0 (2021-03-31)
 
 #### :rocket: Enhancement
-* `compat`, `core`, `shared-internals`, `util`
-  * [#732](https://github.com/embroider-build/embroider/pull/732) v2 addon shim ([@ef4](https://github.com/ef4))
-* `compat`, `core`, `macros`, `shared-internals`
-  * [#748](https://github.com/embroider-build/embroider/pull/748) Supporting more build environments ([@ef4](https://github.com/ef4))
-  * [#737](https://github.com/embroider-build/embroider/pull/737) reduce deps in macros and util packages ([@ef4](https://github.com/ef4))
-* `compat`, `core`, `test-setup`, `util`, `webpack`
-  * [#740](https://github.com/embroider-build/embroider/pull/740) Use "real modules" for ember-source when possible (3.27+) ([@ef4](https://github.com/ef4))
-* `core`
-  * [#736](https://github.com/embroider-build/embroider/pull/736) silence warning about babel formatting while patching template compiler ([@ef4](https://github.com/ef4))
-* `compat`
-  * [#721](https://github.com/embroider-build/embroider/pull/721) easier stage2-only config ([@ef4](https://github.com/ef4))
-  * [#715](https://github.com/embroider-build/embroider/pull/715) support EMBROIDER_REBUILD_ADDONS for pure v2 addons ([@ef4](https://github.com/ef4))
-* `webpack`
-  * [#720](https://github.com/embroider-build/embroider/pull/720) Improve error message when module cannot be found in webpack ([@thoov](https://github.com/thoov))
+
+- `compat`, `core`, `shared-internals`, `util`
+  - [#732](https://github.com/embroider-build/embroider/pull/732) v2 addon shim ([@ef4](https://github.com/ef4))
+- `compat`, `core`, `macros`, `shared-internals`
+  - [#748](https://github.com/embroider-build/embroider/pull/748) Supporting more build environments ([@ef4](https://github.com/ef4))
+  - [#737](https://github.com/embroider-build/embroider/pull/737) reduce deps in macros and util packages ([@ef4](https://github.com/ef4))
+- `compat`, `core`, `test-setup`, `util`, `webpack`
+  - [#740](https://github.com/embroider-build/embroider/pull/740) Use "real modules" for ember-source when possible (3.27+) ([@ef4](https://github.com/ef4))
+- `core`
+  - [#736](https://github.com/embroider-build/embroider/pull/736) silence warning about babel formatting while patching template compiler ([@ef4](https://github.com/ef4))
+- `compat`
+  - [#721](https://github.com/embroider-build/embroider/pull/721) easier stage2-only config ([@ef4](https://github.com/ef4))
+  - [#715](https://github.com/embroider-build/embroider/pull/715) support EMBROIDER_REBUILD_ADDONS for pure v2 addons ([@ef4](https://github.com/ef4))
+- `webpack`
+  - [#720](https://github.com/embroider-build/embroider/pull/720) Improve error message when module cannot be found in webpack ([@thoov](https://github.com/thoov))
 
 #### :bug: Bug Fix
-* `core`, `shared-internals`
-  * [#742](https://github.com/embroider-build/embroider/pull/742) Improving Windows support ([@thoov](https://github.com/thoov))
-* `compat`
-  * [#747](https://github.com/embroider-build/embroider/pull/747) Add better support for skipping Stage 1 transforms that are not needed ([@ef4](https://github.com/ef4))
-* `hbs-loader`
-  * [#735](https://github.com/embroider-build/embroider/pull/735) fixing a typo in peerDep range in hbs-loader ([@ef4](https://github.com/ef4))
+
+- `core`, `shared-internals`
+  - [#742](https://github.com/embroider-build/embroider/pull/742) Improving Windows support ([@thoov](https://github.com/thoov))
+- `compat`
+  - [#747](https://github.com/embroider-build/embroider/pull/747) Add better support for skipping Stage 1 transforms that are not needed ([@ef4](https://github.com/ef4))
+- `hbs-loader`
+  - [#735](https://github.com/embroider-build/embroider/pull/735) fixing a typo in peerDep range in hbs-loader ([@ef4](https://github.com/ef4))
 
 #### :memo: Documentation
-* [#716](https://github.com/embroider-build/embroider/pull/716) Add documentation about publicAssetURL to README ([@lukemelia](https://github.com/lukemelia))
+
+- [#716](https://github.com/embroider-build/embroider/pull/716) Add documentation about publicAssetURL to README ([@lukemelia](https://github.com/lukemelia))
 
 #### :house: Internal
-* [#743](https://github.com/embroider-build/embroider/pull/743) Migrate from rwjblue/setup-volta to volta-cli/action. ([@rwjblue](https://github.com/rwjblue))
+
+- [#743](https://github.com/embroider-build/embroider/pull/743) Migrate from rwjblue/setup-volta to volta-cli/action. ([@rwjblue](https://github.com/rwjblue))
 
 #### Committers: 4
+
 - Edward Faulkner ([@ef4](https://github.com/ef4))
 - Luke Melia ([@lukemelia](https://github.com/lukemelia))
 - Robert Jackson ([@rwjblue](https://github.com/rwjblue))
@@ -71,46 +112,49 @@ https://github.com/highlightjs/highlight.js/issues/2277
 ## v0.37.0 (2021-03-08)
 
 #### :rocket: Enhancement
-* `core`
-  * [#713](https://github.com/embroider-build/embroider/pull/713) Avoid monkey patching template compiler for 3.24.3 and 3.25.2+. ([@rwjblue](https://github.com/rwjblue))
-  * [#705](https://github.com/embroider-build/embroider/pull/705) Avoid patching the template compiler on Ember 3.26. ([@rwjblue](https://github.com/rwjblue))
-  * [#700](https://github.com/embroider-build/embroider/pull/700) TemplateCompiler fixes / improvements (avoid monkey patch for Ember 3.27+) ([@rwjblue](https://github.com/rwjblue))
-* `macros`
-  * [#712](https://github.com/embroider-build/embroider/pull/712) Allow macroCondition inside modifier ([@simonihmig](https://github.com/simonihmig))
-  * [#694](https://github.com/embroider-build/embroider/pull/694) Run importSync transform later, so ember-auto-import can support importSync ([@simonihmig](https://github.com/simonihmig))
+
+- `core`
+  - [#713](https://github.com/embroider-build/embroider/pull/713) Avoid monkey patching template compiler for 3.24.3 and 3.25.2+. ([@rwjblue](https://github.com/rwjblue))
+  - [#705](https://github.com/embroider-build/embroider/pull/705) Avoid patching the template compiler on Ember 3.26. ([@rwjblue](https://github.com/rwjblue))
+  - [#700](https://github.com/embroider-build/embroider/pull/700) TemplateCompiler fixes / improvements (avoid monkey patch for Ember 3.27+) ([@rwjblue](https://github.com/rwjblue))
+- `macros`
+  - [#712](https://github.com/embroider-build/embroider/pull/712) Allow macroCondition inside modifier ([@simonihmig](https://github.com/simonihmig))
+  - [#694](https://github.com/embroider-build/embroider/pull/694) Run importSync transform later, so ember-auto-import can support importSync ([@simonihmig](https://github.com/simonihmig))
 
 #### :bug: Bug Fix
-* `compat`
-  * [#710](https://github.com/embroider-build/embroider/pull/710) Fix case where `autoRun` is `false` but no other addon set content into the `{{content-for 'app-boot'}}` ([@thoov](https://github.com/thoov))
-  * [#674](https://github.com/embroider-build/embroider/pull/674) adjust paths seen by css preprocessors ([@ef4](https://github.com/ef4))
-  * [#702](https://github.com/embroider-build/embroider/pull/702) Handle case where node_modules are symlinked ([@thoov](https://github.com/thoov))
-  * [#690](https://github.com/embroider-build/embroider/pull/690) Exclude 'babel-plugin-compact-reexports' during Stage 1 build ([@charlespierce](https://github.com/charlespierce))
-  * [#687](https://github.com/embroider-build/embroider/pull/687) Strip `main` field from v1 addons' `package.json` once they are rewritten as V2 ([@ef4](https://github.com/ef4))
-* `compat`, `core`
-  * [#709](https://github.com/embroider-build/embroider/pull/709) Fix the path to the on-disk styles file for in-repo engines ([@charlespierce](https://github.com/charlespierce))
-* `core`
-  * [#686](https://github.com/embroider-build/embroider/pull/686) Prevent accidental duplication of babel plugin during rebuilds ([@ef4](https://github.com/ef4))
+
+- `compat`
+  - [#710](https://github.com/embroider-build/embroider/pull/710) Fix case where `autoRun` is `false` but no other addon set content into the `{{content-for 'app-boot'}}` ([@thoov](https://github.com/thoov))
+  - [#674](https://github.com/embroider-build/embroider/pull/674) adjust paths seen by css preprocessors ([@ef4](https://github.com/ef4))
+  - [#702](https://github.com/embroider-build/embroider/pull/702) Handle case where node_modules are symlinked ([@thoov](https://github.com/thoov))
+  - [#690](https://github.com/embroider-build/embroider/pull/690) Exclude 'babel-plugin-compact-reexports' during Stage 1 build ([@charlespierce](https://github.com/charlespierce))
+  - [#687](https://github.com/embroider-build/embroider/pull/687) Strip `main` field from v1 addons' `package.json` once they are rewritten as V2 ([@ef4](https://github.com/ef4))
+- `compat`, `core`
+  - [#709](https://github.com/embroider-build/embroider/pull/709) Fix the path to the on-disk styles file for in-repo engines ([@charlespierce](https://github.com/charlespierce))
+- `core`
+  - [#686](https://github.com/embroider-build/embroider/pull/686) Prevent accidental duplication of babel plugin during rebuilds ([@ef4](https://github.com/ef4))
 
 #### :house: Internal
-* `compat`
-  * [#706](https://github.com/embroider-build/embroider/pull/706) Remove `ember-cli-htmlbars` dependency in `@embroider/compat`. ([@rwjblue](https://github.com/rwjblue))
-* Other
-  * [#711](https://github.com/embroider-build/embroider/pull/711) Add release automation setup. ([@rwjblue](https://github.com/rwjblue))
-  * [#704](https://github.com/embroider-build/embroider/pull/704) Avoid running CI jobs on both push and pull_request events. ([@rwjblue](https://github.com/rwjblue))
-  * [#697](https://github.com/embroider-build/embroider/pull/697) Refactor suite-setup-util to avoid knock on errors. ([@rwjblue](https://github.com/rwjblue))
-* `core`, `macros`
-  * [#707](https://github.com/embroider-build/embroider/pull/707) Fixup types for newer @babel/types. ([@rwjblue](https://github.com/rwjblue))
-* `router`, `util`
-  * [#703](https://github.com/embroider-build/embroider/pull/703) Add 3.20 and 3.24 to list of matrix tests. ([@rwjblue](https://github.com/rwjblue))
+
+- `compat`
+  - [#706](https://github.com/embroider-build/embroider/pull/706) Remove `ember-cli-htmlbars` dependency in `@embroider/compat`. ([@rwjblue](https://github.com/rwjblue))
+- Other
+  - [#711](https://github.com/embroider-build/embroider/pull/711) Add release automation setup. ([@rwjblue](https://github.com/rwjblue))
+  - [#704](https://github.com/embroider-build/embroider/pull/704) Avoid running CI jobs on both push and pull_request events. ([@rwjblue](https://github.com/rwjblue))
+  - [#697](https://github.com/embroider-build/embroider/pull/697) Refactor suite-setup-util to avoid knock on errors. ([@rwjblue](https://github.com/rwjblue))
+- `core`, `macros`
+  - [#707](https://github.com/embroider-build/embroider/pull/707) Fixup types for newer @babel/types. ([@rwjblue](https://github.com/rwjblue))
+- `router`, `util`
+  - [#703](https://github.com/embroider-build/embroider/pull/703) Add 3.20 and 3.24 to list of matrix tests. ([@rwjblue](https://github.com/rwjblue))
 
 #### Committers: 5
+
 - Charles Pierce ([@charlespierce](https://github.com/charlespierce))
 - Edward Faulkner ([@ef4](https://github.com/ef4))
 - Robert Jackson ([@rwjblue](https://github.com/rwjblue))
 - Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
 - Travis Hoover ([@thoov](https://github.com/thoov))
 
-
 ## 0.36.0 (2021-01-21)
 
 - BUGFIX: fix non-legacy CSS handling in production builds when using `@embroider/webpack`
diff --git a/package.json b/package.json
index e3145de74..8c421555f 100644
--- a/package.json
+++ b/package.json
@@ -87,5 +87,5 @@
     "node": "12.16.1",
     "yarn": "1.22.5"
   },
-  "version": "0.39.1"
+  "version": "0.40.0"
 }
diff --git a/packages/addon-shim/package.json b/packages/addon-shim/package.json
index e4d4ecd3e..3affa83e7 100644
--- a/packages/addon-shim/package.json
+++ b/packages/addon-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-shim",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "description": "Make v2 addons work in non-Embroider apps.",
   "keywords": [
     "ember-addon"
@@ -29,7 +29,7 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@embroider/shared-internals": "^0.39.1",
+    "@embroider/shared-internals": "^0.40.0",
     "ember-auto-import": "2.0.0-alpha.0",
     "semver": "^7.3.4"
   },
diff --git a/packages/babel-loader-7/package.json b/packages/babel-loader-7/package.json
index 6f641167f..560bd9729 100644
--- a/packages/babel-loader-7/package.json
+++ b/packages/babel-loader-7/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/babel-loader-7",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/embroider-build/embroider.git",
diff --git a/packages/compat/package.json b/packages/compat/package.json
index e5cb30c2c..9b0ef7915 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
@@ -30,7 +30,7 @@
     "@babel/preset-env": "^7.12.1",
     "@babel/traverse": "^7.12.1",
     "@babel/types": "^7.12.1",
-    "@embroider/macros": "0.39.1",
+    "@embroider/macros": "0.40.0",
     "@types/babel__code-frame": "^7.0.2",
     "@types/yargs": "^15.0.9",
     "assert-never": "^1.1.0",
@@ -82,7 +82,7 @@
     "typescript": "~4.0.0"
   },
   "peerDependencies": {
-    "@embroider/core": "0.39.1"
+    "@embroider/core": "0.40.0"
   },
   "engines": {
     "node": "10.* || 12.* || >= 14"
diff --git a/packages/core/package.json b/packages/core/package.json
index 1685a5b80..8d31a47c1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -37,8 +37,8 @@
     "@babel/runtime": "^7.12.5",
     "@babel/traverse": "^7.12.1",
     "@babel/types": "^7.12.1",
-    "@embroider/macros": "0.39.1",
-    "@embroider/shared-internals": "0.39.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",
diff --git a/packages/hbs-loader/package.json b/packages/hbs-loader/package.json
index 4c52ecb9c..c558a02a2 100644
--- a/packages/hbs-loader/package.json
+++ b/packages/hbs-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/hbs-loader",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "private": false,
   "description": "Glimmer handlebars loader for webpack",
   "repository": {
@@ -28,7 +28,7 @@
     "typescript": "~4.0.0"
   },
   "peerDependencies": {
-    "@embroider/core": "0.39.1",
+    "@embroider/core": "0.40.0",
     "webpack": "^4 || ^5"
   },
   "engines": {
diff --git a/packages/macros/package.json b/packages/macros/package.json
index ce7e6431a..092257efb 100644
--- a/packages/macros/package.json
+++ b/packages/macros/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/macros",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "private": false,
   "description": "Standardized build-time macros for ember apps.",
   "keywords": [
@@ -24,7 +24,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@embroider/shared-internals": "0.39.1",
+    "@embroider/shared-internals": "0.40.0",
     "assert-never": "^1.1.0",
     "ember-cli-babel": "^7.23.0",
     "lodash": "^4.17.10",
@@ -35,7 +35,7 @@
     "@babel/core": "^7.12.3",
     "@babel/traverse": "^7.12.1",
     "@babel/types": "^7.12.1",
-    "@embroider/core": "0.39.1",
+    "@embroider/core": "0.40.0",
     "@embroider/test-support": "0.36.0",
     "@types/babel__core": "^7.1.10",
     "@types/babel__generator": "^7.6.2",
diff --git a/packages/router/package.json b/packages/router/package.json
index cc4e0fbcb..c43b406de 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/router",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "description": "Lazy loading router",
   "keywords": [
     "ember-addon"
@@ -28,16 +28,16 @@
     "test:classic": "cross-env CLASSIC=true ember test --test-port=0"
   },
   "dependencies": {
-    "@embroider/macros": "0.39.1",
+    "@embroider/macros": "0.40.0",
     "ember-cli-babel": "^7.23.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",
     "@ember/string": "^1.0.0",
-    "@embroider/compat": "0.39.1",
-    "@embroider/core": "0.39.1",
+    "@embroider/compat": "0.40.0",
+    "@embroider/core": "0.40.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/webpack": "0.39.1",
+    "@embroider/webpack": "0.40.0",
     "@types/ember__routing": "^3.16.9",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
@@ -66,7 +66,7 @@
     "qunit-dom": "^0.8.4"
   },
   "peerDependencies": {
-    "@embroider/core": "0.39.1",
+    "@embroider/core": "0.40.0",
     "@types/ember__routing": "*"
   },
   "peerDependenciesMeta": {
diff --git a/packages/shared-internals/package.json b/packages/shared-internals/package.json
index 18c72c736..9ba2e9764 100644
--- a/packages/shared-internals/package.json
+++ b/packages/shared-internals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/shared-internals",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "private": false,
   "description": "Utilities shared among the other embroider packages",
   "repository": {
diff --git a/packages/test-setup/package.json b/packages/test-setup/package.json
index 40495141e..6d0a04873 100644
--- a/packages/test-setup/package.json
+++ b/packages/test-setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/test-setup",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/embroider-build/embroider.git",
@@ -16,7 +16,7 @@
     "resolve": "^1.17.0"
   },
   "devDependencies": {
-    "@embroider/compat": "0.39.1"
+    "@embroider/compat": "0.40.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/util/package.json b/packages/util/package.json
index df94335e5..500c40aab 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/util",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "description": "Utilities for app and addon authors.",
   "keywords": [
     "ember-addon"
@@ -28,18 +28,18 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@embroider/macros": "0.39.1",
+    "@embroider/macros": "0.40.0",
     "broccoli-funnel": "ef4/broccoli-funnel#c70d060076e14793e8495571f304a976afc754ac",
     "ember-cli-babel": "^7.23.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.2.0",
-    "@embroider/compat": "0.39.1",
-    "@embroider/core": "0.39.1",
-    "@embroider/test-setup": "0.39.1",
+    "@embroider/compat": "0.40.0",
+    "@embroider/core": "0.40.0",
+    "@embroider/test-setup": "0.40.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/webpack": "0.39.1",
+    "@embroider/webpack": "0.40.0",
     "@glimmer/component": "^1.0.3",
     "@glimmer/tracking": "^1.0.3",
     "@typescript-eslint/eslint-plugin": "^4.1.1",
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 4645be8af..24af40eb6 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/webpack",
-  "version": "0.39.1",
+  "version": "0.40.0",
   "private": false,
   "description": "Builds EmberJS apps with Webpack",
   "repository": {
@@ -23,8 +23,8 @@
     "@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.39.1",
-    "@embroider/hbs-loader": "0.39.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",
@@ -54,7 +54,7 @@
     "webpack": "^5.33.2"
   },
   "peerDependencies": {
-    "@embroider/core": "0.39.1",
+    "@embroider/core": "0.40.0",
     "webpack": "^5.0.0"
   },
   "engines": {
diff --git a/test-packages/engines-host-app/package.json b/test-packages/engines-host-app/package.json
index c32eaaa31..de9579598 100644
--- a/test-packages/engines-host-app/package.json
+++ b/test-packages/engines-host-app/package.json
@@ -26,11 +26,11 @@
     "@ember/jquery": "^0.6.0",
     "@ember/optional-features": "^0.7.0",
     "@ember/string": "^1.0.0",
-    "@embroider/compat": "0.39.1",
-    "@embroider/core": "0.39.1",
-    "@embroider/router": "0.39.1",
+    "@embroider/compat": "0.40.0",
+    "@embroider/core": "0.40.0",
+    "@embroider/router": "0.40.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/webpack": "0.39.1",
+    "@embroider/webpack": "0.40.0",
     "broccoli-asset-rev": "^3.0.0",
     "eager-engine": "0.0.0",
     "ember-cli": "~3.10.1",
diff --git a/test-packages/funky-sample-addon/package.json b/test-packages/funky-sample-addon/package.json
index 28721675f..44bf0b30f 100644
--- a/test-packages/funky-sample-addon/package.json
+++ b/test-packages/funky-sample-addon/package.json
@@ -19,7 +19,7 @@
     "start": "ember serve"
   },
   "dependencies": {
-    "@embroider/macros": "0.39.1",
+    "@embroider/macros": "0.40.0",
     "broccoli-babel-transpiler": "^5.5.0",
     "broccoli-funnel": "ef4/broccoli-funnel#c70d060076e14793e8495571f304a976afc754ac",
     "broccoli-merge-trees": "^3.0.2",
@@ -28,10 +28,10 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",
-    "@embroider/compat": "0.39.1",
-    "@embroider/core": "0.39.1",
+    "@embroider/compat": "0.40.0",
+    "@embroider/core": "0.40.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/webpack": "0.39.1",
+    "@embroider/webpack": "0.40.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~3.10.1",
     "ember-cli-dependency-checker": "^3.1.0",
diff --git a/test-packages/macro-sample-addon/package.json b/test-packages/macro-sample-addon/package.json
index 292a2d66e..9976e8411 100644
--- a/test-packages/macro-sample-addon/package.json
+++ b/test-packages/macro-sample-addon/package.json
@@ -24,17 +24,17 @@
     "test:classic:": "cross-env CLASSIC=true ember test --test-port=0"
   },
   "dependencies": {
-    "@embroider/macros": "0.39.1",
+    "@embroider/macros": "0.40.0",
     "ember-cli-babel": "^7.20.5",
     "ember-cli-htmlbars": "^4.3.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",
     "@ember/string": "^1.0.0",
-    "@embroider/compat": "0.39.1",
-    "@embroider/core": "0.39.1",
+    "@embroider/compat": "0.40.0",
+    "@embroider/core": "0.40.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/webpack": "0.39.1",
+    "@embroider/webpack": "0.40.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-cli": "~3.10.1",
     "ember-cli-dependency-checker": "^3.1.0",
diff --git a/test-packages/macro-tests/package.json b/test-packages/macro-tests/package.json
index eef0e2aad..fdbeb584b 100644
--- a/test-packages/macro-tests/package.json
+++ b/test-packages/macro-tests/package.json
@@ -24,11 +24,11 @@
     "@ember/jquery": "^0.6.0",
     "@ember/optional-features": "^0.7.0",
     "@ember/string": "^1.0.0",
-    "@embroider/compat": "0.39.1",
-    "@embroider/core": "0.39.1",
-    "@embroider/macros": "0.39.1",
+    "@embroider/compat": "0.40.0",
+    "@embroider/core": "0.40.0",
+    "@embroider/macros": "0.40.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/webpack": "0.39.1",
+    "@embroider/webpack": "0.40.0",
     "ember-ajax": "^5.0.0",
     "ember-cli": "~3.10.1",
     "ember-cli-app-version": "^3.2.0",
diff --git a/test-packages/static-app/package.json b/test-packages/static-app/package.json
index 586486e9e..bc50b3adf 100644
--- a/test-packages/static-app/package.json
+++ b/test-packages/static-app/package.json
@@ -26,11 +26,11 @@
     "@ember/jquery": "^0.5.2",
     "@ember/optional-features": "^0.7.0",
     "@ember/string": "^1.0.0",
-    "@embroider/compat": "0.39.1",
-    "@embroider/core": "0.39.1",
-    "@embroider/macros": "0.39.1",
+    "@embroider/compat": "0.40.0",
+    "@embroider/core": "0.40.0",
+    "@embroider/macros": "0.40.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/webpack": "0.39.1",
+    "@embroider/webpack": "0.40.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-ajax": "^5.0.0",
     "ember-cli": "~3.10.1",