diff --git a/.changeset/automated-from-00ec2e7e58f546a5e19a23740302e49883d664d3.md b/.changeset/automated-from-00ec2e7e58f546a5e19a23740302e49883d664d3.md
deleted file mode 100644
index e0f8a57c2a..0000000000
--- a/.changeset/automated-from-00ec2e7e58f546a5e19a23740302e49883d664d3.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Change from: 00ec2e7e58f546a5e19a23740302e49883d664d3
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/core": "minor"
----
-
-[#1376](https://github.com/embroider-build/embroider/pull/1376) : legacy addon resolving : _by [@ef4](https://github.com/ef4)_
-
-This adds the ability to intercept module resolution requests to and from addons that have been rewritten from v1 to v2.
-
-It's what will allow resolving modules without needing to physically rewrite the node_modules tree.
diff --git a/.changeset/automated-from-01575a4d3a86b8b329c75024aa77b2539a6dad5d.md b/.changeset/automated-from-01575a4d3a86b8b329c75024aa77b2539a6dad5d.md
deleted file mode 100644
index e567cb1502..0000000000
--- a/.changeset/automated-from-01575a4d3a86b8b329c75024aa77b2539a6dad5d.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: 01575a4d3a86b8b329c75024aa77b2539a6dad5d
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/addon-dev": "minor"
----
-
-[#1368](https://github.com/embroider-build/embroider/pull/1368) : Add support for keeping public assets and ember-addon.public-assets meta in sync : _by [@phndiaye](https://github.com/phndiaye)_
diff --git a/.changeset/automated-from-07818cc70bf16a5c6d4e3482c1475623c18d168f.md b/.changeset/automated-from-07818cc70bf16a5c6d4e3482c1475623c18d168f.md
deleted file mode 100644
index a3a8caca6a..0000000000
--- a/.changeset/automated-from-07818cc70bf16a5c6d4e3482c1475623c18d168f.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: 07818cc70bf16a5c6d4e3482c1475623c18d168f
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1362](https://github.com/embroider-build/embroider/pull/1362) : clarify which package rules apply inside vs outside a component : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-137fcab566174aad3ebb67dda12ac80572f78ab9.md b/.changeset/automated-from-137fcab566174aad3ebb67dda12ac80572f78ab9.md
deleted file mode 100644
index db56a4cf25..0000000000
--- a/.changeset/automated-from-137fcab566174aad3ebb67dda12ac80572f78ab9.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: 137fcab566174aad3ebb67dda12ac80572f78ab9
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": patch
----
-
-[#1381](https://github.com/embroider-build/embroider/pull/1381) : add tests for helper name collisions with html elements or js keywords : _by [@void-mAlex](https://github.com/void-mAlex)_
\ No newline at end of file
diff --git a/.changeset/automated-from-21eae416d9fa85ea6f9be55945c44ab3da2c655b.md b/.changeset/automated-from-21eae416d9fa85ea6f9be55945c44ab3da2c655b.md
deleted file mode 100644
index 9b02e05639..0000000000
--- a/.changeset/automated-from-21eae416d9fa85ea6f9be55945c44ab3da2c655b.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Change from: 21eae416d9fa85ea6f9be55945c44ab3da2c655b
-#
-# Each of these should be one of "patch", "minor", "major"
----
-
-[#1364](https://github.com/embroider-build/embroider/pull/1364) : Unstable release sync with main : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli), [@ef4](https://github.com/ef4)_
\ No newline at end of file
diff --git a/.changeset/automated-from-22d54ebaebdcfe68212fff2bae0161b27b29a43c.md b/.changeset/automated-from-22d54ebaebdcfe68212fff2bae0161b27b29a43c.md
deleted file mode 100644
index a59bf7cbb0..0000000000
--- a/.changeset/automated-from-22d54ebaebdcfe68212fff2bae0161b27b29a43c.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Change from: 22d54ebaebdcfe68212fff2bae0161b27b29a43c
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
-"@embroider/core": "patch"
-"@embroider/webpack": "patch"
----
-
-[#1346](https://github.com/embroider-build/embroider/pull/1346) : Bugfix: inconsistent handling of webpack virtual modules : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-3a232cc04a68f86d0acfa5e7edfa764b990efdbf.md b/.changeset/automated-from-3a232cc04a68f86d0acfa5e7edfa764b990efdbf.md
deleted file mode 100644
index e7d540f8f2..0000000000
--- a/.changeset/automated-from-3a232cc04a68f86d0acfa5e7edfa764b990efdbf.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Change from: 3a232cc04a68f86d0acfa5e7edfa764b990efdbf
-#
-# Each of these should be one of "patch", "minor", "major"
----
-
-[#1401](https://github.com/embroider-build/embroider/pull/1401) : Add relevant changesets for the upcoming release and evaluate their impact : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
\ No newline at end of file
diff --git a/.changeset/automated-from-3a9d8ade05e92b65045a01d59898f063e337fcd1.md b/.changeset/automated-from-3a9d8ade05e92b65045a01d59898f063e337fcd1.md
deleted file mode 100644
index b5f015e1bc..0000000000
--- a/.changeset/automated-from-3a9d8ade05e92b65045a01d59898f063e337fcd1.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: 3a9d8ade05e92b65045a01d59898f063e337fcd1
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": minor
----
-
-[#1392](https://github.com/embroider-build/embroider/pull/1392) : Allow running publish-unstable on workflow_dispatch : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
\ No newline at end of file
diff --git a/.changeset/automated-from-4f583c9b87a6da95b59ecde0939d4177dfd15d3b.md b/.changeset/automated-from-4f583c9b87a6da95b59ecde0939d4177dfd15d3b.md
deleted file mode 100644
index 086e88a6c1..0000000000
--- a/.changeset/automated-from-4f583c9b87a6da95b59ecde0939d4177dfd15d3b.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# Change from: 4f583c9b87a6da95b59ecde0939d4177dfd15d3b
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/core": "minor"
-"@embroider/webpack": "minor"
----
-
-[#1355](https://github.com/embroider-build/embroider/pull/1355) : Refactor self-resolution : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-514566f036a28113d3aefd4430f256658c08e82e.md b/.changeset/automated-from-514566f036a28113d3aefd4430f256658c08e82e.md
deleted file mode 100644
index 50b635ae55..0000000000
--- a/.changeset/automated-from-514566f036a28113d3aefd4430f256658c08e82e.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Change from: 514566f036a28113d3aefd4430f256658c08e82e
-#
-# Each of these should be one of "patch", "minor", "major"
----
-
-[#1395](https://github.com/embroider-build/embroider/pull/1395) : Revving yarn.lock : _by [@ef4](https://github.com/ef4)_
\ No newline at end of file
diff --git a/.changeset/automated-from-55b12fea25b68bae28886e7705f9e3637ddf0b55.md b/.changeset/automated-from-55b12fea25b68bae28886e7705f9e3637ddf0b55.md
deleted file mode 100644
index 29ffab8209..0000000000
--- a/.changeset/automated-from-55b12fea25b68bae28886e7705f9e3637ddf0b55.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: 55b12fea25b68bae28886e7705f9e3637ddf0b55
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": minor
----
-
-[#1389](https://github.com/embroider-build/embroider/pull/1389) : bump unstable versions by at least a patch : _by [@mansona](https://github.com/mansona)_
\ No newline at end of file
diff --git a/.changeset/automated-from-565e9e5032509c63073be1af4b7340018087bd79.md b/.changeset/automated-from-565e9e5032509c63073be1af4b7340018087bd79.md
deleted file mode 100644
index 03373f8c6a..0000000000
--- a/.changeset/automated-from-565e9e5032509c63073be1af4b7340018087bd79.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: 565e9e5032509c63073be1af4b7340018087bd79
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/webpack": "patch"
----
-
-[#1359](https://github.com/embroider-build/embroider/pull/1359) : Ignore resolve requests that start with ! : _by [@mansona](https://github.com/mansona)_
diff --git a/.changeset/automated-from-5d605075b84e902609eccacd6decf7e6c4ca7250.md b/.changeset/automated-from-5d605075b84e902609eccacd6decf7e6c4ca7250.md
deleted file mode 100644
index 3964c2be3a..0000000000
--- a/.changeset/automated-from-5d605075b84e902609eccacd6decf7e6c4ca7250.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# Change from: 5d605075b84e902609eccacd6decf7e6c4ca7250
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/addon-dev": minor
-"@embroider/addon-shim": minor
-"@embroider/compat": minor
-"@embroider/core": minor
-"@embroider/macros": minor
-"@embroider/shared-internals": minor
-"@embroider/util": minor
-"@embroider/webpack": minor
----
-
-[#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
\ No newline at end of file
diff --git a/.changeset/automated-from-6e54dd135709bfbead5a58512340d2dab00125f3.md b/.changeset/automated-from-6e54dd135709bfbead5a58512340d2dab00125f3.md
deleted file mode 100644
index faa328d8fa..0000000000
--- a/.changeset/automated-from-6e54dd135709bfbead5a58512340d2dab00125f3.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: 6e54dd135709bfbead5a58512340d2dab00125f3
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/shared-internals": "patch"
----
-
-[#1396](https://github.com/embroider-build/embroider/pull/1396) : Add @ember/owner to emberVirtualPackages : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-72d5a8e1edf20d0512cd98d1979b7b92360e6fd0.md b/.changeset/automated-from-72d5a8e1edf20d0512cd98d1979b7b92360e6fd0.md
deleted file mode 100644
index 59a2976402..0000000000
--- a/.changeset/automated-from-72d5a8e1edf20d0512cd98d1979b7b92360e6fd0.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Change from: 72d5a8e1edf20d0512cd98d1979b7b92360e6fd0
-#
-# Each of these should be one of "patch", "minor", "major"
----
-
-[#1390](https://github.com/embroider-build/embroider/pull/1390) : Change namespace for publish-unstable cancel-in-progress : _by [@backspace](https://github.com/backspace)_
\ No newline at end of file
diff --git a/.changeset/automated-from-77c945c528f8e828276e536d25473946f243337c.md b/.changeset/automated-from-77c945c528f8e828276e536d25473946f243337c.md
deleted file mode 100644
index 1d0d0ecdae..0000000000
--- a/.changeset/automated-from-77c945c528f8e828276e536d25473946f243337c.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Change from: 77c945c528f8e828276e536d25473946f243337c
-#
-# Each of these should be one of "patch", "minor", "major"
----
-
-[#1405](https://github.com/embroider-build/embroider/pull/1405) : Upgrade changeset-recover : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
\ No newline at end of file
diff --git a/.changeset/automated-from-8b6569908d0a114c432ee4ff2a0b5a4df8a25187.md b/.changeset/automated-from-8b6569908d0a114c432ee4ff2a0b5a4df8a25187.md
deleted file mode 100644
index 18a94fb2f5..0000000000
--- a/.changeset/automated-from-8b6569908d0a114c432ee4ff2a0b5a4df8a25187.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: 8b6569908d0a114c432ee4ff2a0b5a4df8a25187
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/addon-shim": "patch"
----
-
-[#1327](https://github.com/embroider-build/embroider/pull/1327) : Fix Nested V2 Addons : _by [@gossi](https://github.com/gossi), [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-936fd6373339a6848260f6c0a52f426127023299.md b/.changeset/automated-from-936fd6373339a6848260f6c0a52f426127023299.md
deleted file mode 100644
index 5d5279b871..0000000000
--- a/.changeset/automated-from-936fd6373339a6848260f6c0a52f426127023299.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Change from: 936fd6373339a6848260f6c0a52f426127023299
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "minor"
-"@embroider/core": "minor"
-"@embroider/webpack": "minor"
----
-
-[#1373](https://github.com/embroider-build/embroider/pull/1373) : app tree resolving : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-97d8b0d81d62631a8d98afa07f4b6be3ba39504e.md b/.changeset/automated-from-97d8b0d81d62631a8d98afa07f4b6be3ba39504e.md
deleted file mode 100644
index aa6da3cb40..0000000000
--- a/.changeset/automated-from-97d8b0d81d62631a8d98afa07f4b6be3ba39504e.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# Change from: 97d8b0d81d62631a8d98afa07f4b6be3ba39504e
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/core": "major"
-"@embroider/webpack": "patch"
----
-
-[#1363](https://github.com/embroider-build/embroider/pull/1363) : Simplified template resolution : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-a6cd4aac9b7497991b7b1acc18d0e78dccb8cd78.md b/.changeset/automated-from-a6cd4aac9b7497991b7b1acc18d0e78dccb8cd78.md
deleted file mode 100644
index 1c84a9fae8..0000000000
--- a/.changeset/automated-from-a6cd4aac9b7497991b7b1acc18d0e78dccb8cd78.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: a6cd4aac9b7497991b7b1acc18d0e78dccb8cd78
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/util": patch
----
-
-[#1388](https://github.com/embroider-build/embroider/pull/1388) : Enable prettier in ci : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
\ No newline at end of file
diff --git a/.changeset/automated-from-a99302507faed21af683eeb3ac29e02b54eea2ea.md b/.changeset/automated-from-a99302507faed21af683eeb3ac29e02b54eea2ea.md
deleted file mode 100644
index 501200bb27..0000000000
--- a/.changeset/automated-from-a99302507faed21af683eeb3ac29e02b54eea2ea.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: a99302507faed21af683eeb3ac29e02b54eea2ea
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1383](https://github.com/embroider-build/embroider/pull/1383) : Rename strict flag to strictMode : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
diff --git a/.changeset/automated-from-b490776951484e7ac79e3eedb8f088a9a4a88c2b.md b/.changeset/automated-from-b490776951484e7ac79e3eedb8f088a9a4a88c2b.md
deleted file mode 100644
index 5098510458..0000000000
--- a/.changeset/automated-from-b490776951484e7ac79e3eedb8f088a9a4a88c2b.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: b490776951484e7ac79e3eedb8f088a9a4a88c2b
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1347](https://github.com/embroider-build/embroider/pull/1347) : fix resolver bugs around package rules : _by [@void-mAlex](https://github.com/void-mAlex)_
diff --git a/.changeset/automated-from-b869b2c4d52bddaa347faba404cd283a7bd33493.md b/.changeset/automated-from-b869b2c4d52bddaa347faba404cd283a7bd33493.md
deleted file mode 100644
index ff41003be3..0000000000
--- a/.changeset/automated-from-b869b2c4d52bddaa347faba404cd283a7bd33493.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# Change from: b869b2c4d52bddaa347faba404cd283a7bd33493
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "major"
-"@embroider/core": "major"
-"@embroider/shared-internals": "major"
-"@embroider/webpack": "major"
----
-
-[#1339](https://github.com/embroider-build/embroider/pull/1339) : Layer template resolver on top of module resolver : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-bae34674206d6e519e634adcd6f2e26f29030955.md b/.changeset/automated-from-bae34674206d6e519e634adcd6f2e26f29030955.md
deleted file mode 100644
index 8e816c766d..0000000000
--- a/.changeset/automated-from-bae34674206d6e519e634adcd6f2e26f29030955.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Change from: bae34674206d6e519e634adcd6f2e26f29030955
-#
-# Each of these should be one of "patch", "minor", "major"
----
-
-[#1393](https://github.com/embroider-build/embroider/pull/1393) : continue deploying unstable packages even with an error : _by [@mansona](https://github.com/mansona)_
\ No newline at end of file
diff --git a/.changeset/automated-from-c2dd82ec06831a846c3d7d7e47261a04b2b4f6a3.md b/.changeset/automated-from-c2dd82ec06831a846c3d7d7e47261a04b2b4f6a3.md
deleted file mode 100644
index 06b78b1ef9..0000000000
--- a/.changeset/automated-from-c2dd82ec06831a846c3d7d7e47261a04b2b4f6a3.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: c2dd82ec06831a846c3d7d7e47261a04b2b4f6a3
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1340](https://github.com/embroider-build/embroider/pull/1340) : Static helpers and static modifiers transform fixes : _by [@void-mAlex](https://github.com/void-mAlex)_
diff --git a/.changeset/automated-from-d94051e03a2b069dc42be6dfb0902737dfd55ca6.md b/.changeset/automated-from-d94051e03a2b069dc42be6dfb0902737dfd55ca6.md
deleted file mode 100644
index e1aff0e538..0000000000
--- a/.changeset/automated-from-d94051e03a2b069dc42be6dfb0902737dfd55ca6.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# Change from: d94051e03a2b069dc42be6dfb0902737dfd55ca6
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "major"
-"@embroider/core": "major"
-"@embroider/webpack": "major"
----
-
-[#1331](https://github.com/embroider-build/embroider/pull/1331) : Move resolving into dedicated plugins : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-dda695fea24d6ab8daf884b68579d309584fb494.md b/.changeset/automated-from-dda695fea24d6ab8daf884b68579d309584fb494.md
deleted file mode 100644
index 7e883d7764..0000000000
--- a/.changeset/automated-from-dda695fea24d6ab8daf884b68579d309584fb494.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: dda695fea24d6ab8daf884b68579d309584fb494
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1386](https://github.com/embroider-build/embroider/pull/1386) : Fix `Maximum call stack size exceeded` error : _by [@simonihmig](https://github.com/simonihmig)_
diff --git a/.changeset/automated-from-de6938a9cceeabbd9d2927a81706c1382917418d.md b/.changeset/automated-from-de6938a9cceeabbd9d2927a81706c1382917418d.md
deleted file mode 100644
index a8c5cc31fb..0000000000
--- a/.changeset/automated-from-de6938a9cceeabbd9d2927a81706c1382917418d.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: de6938a9cceeabbd9d2927a81706c1382917418d
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1352](https://github.com/embroider-build/embroider/pull/1352) : reinstate logic around parsing of invokes packageRules : _by [@void-mAlex](https://github.com/void-mAlex)_
diff --git a/.changeset/automated-from-df7f4412bd8b1f996377a37bcf70e4c7937fb9c0.md b/.changeset/automated-from-df7f4412bd8b1f996377a37bcf70e4c7937fb9c0.md
deleted file mode 100644
index 0483f0793a..0000000000
--- a/.changeset/automated-from-df7f4412bd8b1f996377a37bcf70e4c7937fb9c0.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Change from: df7f4412bd8b1f996377a37bcf70e4c7937fb9c0
-#
-# Each of these should be one of "patch", "minor", "major"
----
-
-[#1398](https://github.com/embroider-build/embroider/pull/1398) : Add prepare changelog workflow to automatically propose what should be in sync for us : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
\ No newline at end of file
diff --git a/.changeset/automated-from-e05dfdc5496dd5b1aaa2684816c1a4e05c4f88c4.md b/.changeset/automated-from-e05dfdc5496dd5b1aaa2684816c1a4e05c4f88c4.md
deleted file mode 100644
index 2d119b48da..0000000000
--- a/.changeset/automated-from-e05dfdc5496dd5b1aaa2684816c1a4e05c4f88c4.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Change from: e05dfdc5496dd5b1aaa2684816c1a4e05c4f88c4
-#
-# Each of these should be one of "patch", "minor", "major"
----
-
-[#1345](https://github.com/embroider-build/embroider/pull/1345) : Update release workflow : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
\ No newline at end of file
diff --git a/.changeset/automated-from-e0fe915f4f6b91ccb78ec0f43c6f63036b731b3f.md b/.changeset/automated-from-e0fe915f4f6b91ccb78ec0f43c6f63036b731b3f.md
deleted file mode 100644
index 70b78fa230..0000000000
--- a/.changeset/automated-from-e0fe915f4f6b91ccb78ec0f43c6f63036b731b3f.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: e0fe915f4f6b91ccb78ec0f43c6f63036b731b3f
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1369](https://github.com/embroider-build/embroider/pull/1369) : Add semverRange <=4.11.0 for ember-data : _by [@mkszepp](https://github.com/mkszepp)_
diff --git a/.changeset/automated-from-e1c5b45044283e2107f3fd021034a1651f210ae5.md b/.changeset/automated-from-e1c5b45044283e2107f3fd021034a1651f210ae5.md
deleted file mode 100644
index 8912550c29..0000000000
--- a/.changeset/automated-from-e1c5b45044283e2107f3fd021034a1651f210ae5.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: e1c5b45044283e2107f3fd021034a1651f210ae5
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1343](https://github.com/embroider-build/embroider/pull/1343) : Fix `@babel/core` version check to support `ember-cli-babel` v8 : _by [@bertdeblock](https://github.com/bertdeblock)_
diff --git a/.changeset/automated-from-e7c17891eef96ab35f75e7323ea39dc69a36a8b6.md b/.changeset/automated-from-e7c17891eef96ab35f75e7323ea39dc69a36a8b6.md
deleted file mode 100644
index 4a2d58bda9..0000000000
--- a/.changeset/automated-from-e7c17891eef96ab35f75e7323ea39dc69a36a8b6.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: e7c17891eef96ab35f75e7323ea39dc69a36a8b6
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/shared-internals": "patch"
----
-
-[#1379](https://github.com/embroider-build/embroider/pull/1379) : don't confuse webpack requests with packageNames : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-f04ae3d629ad973d17b577cc30e574bee01a95c2.md b/.changeset/automated-from-f04ae3d629ad973d17b577cc30e574bee01a95c2.md
deleted file mode 100644
index abf7cad813..0000000000
--- a/.changeset/automated-from-f04ae3d629ad973d17b577cc30e574bee01a95c2.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# Change from: f04ae3d629ad973d17b577cc30e574bee01a95c2
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
-"@embroider/shared-internals": "patch"
----
-
-[#1372](https://github.com/embroider-build/embroider/pull/1372) : restore component invokes rules support : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/automated-from-f5dd6f168b1d17ac52e33d8df4312f7caa01c78c.md b/.changeset/automated-from-f5dd6f168b1d17ac52e33d8df4312f7caa01c78c.md
deleted file mode 100644
index 1635e221c3..0000000000
--- a/.changeset/automated-from-f5dd6f168b1d17ac52e33d8df4312f7caa01c78c.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# Change from: f5dd6f168b1d17ac52e33d8df4312f7caa01c78c
-#
-# Each of these should be one of "patch", "minor", "major"
-"@embroider/compat": "patch"
----
-
-[#1342](https://github.com/embroider-build/embroider/pull/1342) : restore original ts extension priority : _by [@ef4](https://github.com/ef4)_
diff --git a/.changeset/plenty-chairs-relate.md b/.changeset/plenty-chairs-relate.md
deleted file mode 100644
index 0fc5002844..0000000000
--- a/.changeset/plenty-chairs-relate.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@embroider/util': minor
----
-
-Improve types of `ensure-safe-component` helper
-
-This will improve the Glint type of `ensure-safe-component` in two ways:
-
-- when a component class is passed, the return type will _not_ get narrowed down to an (mostly unusable) `ComponentLike<unknown>`, but to the type of the passed component itself
-- when a string is passed that has an entry in the `@glint/environment-ember-loose` template registry, then the registered type will be returned instead of again `ComponentLike<unknown>`
diff --git a/packages/addon-dev/CHANGELOG.md b/packages/addon-dev/CHANGELOG.md
new file mode 100644
index 0000000000..d3a15988d1
--- /dev/null
+++ b/packages/addon-dev/CHANGELOG.md
@@ -0,0 +1,20 @@
+# @embroider/addon-dev
+
+## 3.1.0
+
+### Minor Changes
+
+- 8c179845: [#1368](https://github.com/embroider-build/embroider/pull/1368) : Add support for keeping public assets and ember-addon.public-assets meta in sync : _by [@phndiaye](https://github.com/phndiaye)_
+- 66de9820: [#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
+
+### Patch Changes
+
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/core@3.0.0
diff --git a/packages/addon-dev/package.json b/packages/addon-dev/package.json
index 370a3466da..7f9fac712f 100644
--- a/packages/addon-dev/package.json
+++ b/packages/addon-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-dev",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Utilities for addon authors",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@embroider/core": "^2.0.0",
+    "@embroider/core": "^3.0.0",
     "@rollup/pluginutils": "^4.1.1",
     "assert-never": "^1.2.1",
     "fs-extra": "^10.0.0",
diff --git a/packages/addon-shim/CHANGELOG.md b/packages/addon-shim/CHANGELOG.md
new file mode 100644
index 0000000000..f667f8dffe
--- /dev/null
+++ b/packages/addon-shim/CHANGELOG.md
@@ -0,0 +1,17 @@
+# @embroider/addon-shim
+
+## 1.9.0
+
+### Minor Changes
+
+- 66de9820: [#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
+
+### Patch Changes
+
+- 8c179845: [#1327](https://github.com/embroider-build/embroider/pull/1327) : Fix Nested V2 Addons : _by [@gossi](https://github.com/gossi), [@ef4](https://github.com/ef4)_
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/shared-internals@3.0.0
diff --git a/packages/addon-shim/package.json b/packages/addon-shim/package.json
index d191538510..036324dc29 100644
--- a/packages/addon-shim/package.json
+++ b/packages/addon-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-shim",
-  "version": "1.8.4",
+  "version": "1.9.0",
   "description": "Make v2 addons work in non-Embroider apps.",
   "keywords": [],
   "main": "./src/index.js",
@@ -17,7 +17,7 @@
   },
   "scripts": {},
   "dependencies": {
-    "@embroider/shared-internals": "^2.0.0",
+    "@embroider/shared-internals": "^3.0.0",
     "broccoli-funnel": "^3.0.8",
     "semver": "^7.3.8"
   },
diff --git a/packages/babel-loader-8/CHANGELOG.md b/packages/babel-loader-8/CHANGELOG.md
new file mode 100644
index 0000000000..1f0e51f93c
--- /dev/null
+++ b/packages/babel-loader-8/CHANGELOG.md
@@ -0,0 +1,15 @@
+# @embroider/babel-loader-8
+
+## 3.0.0
+
+### Patch Changes
+
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/core@3.0.0
diff --git a/packages/babel-loader-8/package.json b/packages/babel-loader-8/package.json
index 2e4bb781ea..f61c89ba45 100644
--- a/packages/babel-loader-8/package.json
+++ b/packages/babel-loader-8/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/babel-loader-8",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/embroider-build/embroider.git",
@@ -13,7 +13,7 @@
     "babel-loader": "8"
   },
   "peerDependencies": {
-    "@embroider/core": "^2.0.0"
+    "@embroider/core": "^3.0.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
diff --git a/packages/compat/CHANGELOG.md b/packages/compat/CHANGELOG.md
new file mode 100644
index 0000000000..beb6eabebf
--- /dev/null
+++ b/packages/compat/CHANGELOG.md
@@ -0,0 +1,40 @@
+# @embroider/compat
+
+## 3.0.0
+
+### Major Changes
+
+- 8c179845: [#1339](https://github.com/embroider-build/embroider/pull/1339) : Layer template resolver on top of module resolver : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1331](https://github.com/embroider-build/embroider/pull/1331) : Move resolving into dedicated plugins : _by [@ef4](https://github.com/ef4)_
+
+### Minor Changes
+
+- 66de9820: [#1392](https://github.com/embroider-build/embroider/pull/1392) : Allow running publish-unstable on workflow*dispatch : \_by [@NullVoxPopuli](https://github.com/NullVoxPopuli)*
+- 66de9820: [#1389](https://github.com/embroider-build/embroider/pull/1389) : bump unstable versions by at least a patch : _by [@mansona](https://github.com/mansona)_
+- 66de9820: [#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
+- 8c179845: [#1373](https://github.com/embroider-build/embroider/pull/1373) : app tree resolving : _by [@ef4](https://github.com/ef4)_
+
+### Patch Changes
+
+- 8c179845: [#1362](https://github.com/embroider-build/embroider/pull/1362) : clarify which package rules apply inside vs outside a component : _by [@ef4](https://github.com/ef4)_
+- 66de9820: [#1381](https://github.com/embroider-build/embroider/pull/1381) : add tests for helper name collisions with html elements or js keywords : _by [@void-mAlex](https://github.com/void-mAlex)_
+- 8c179845: [#1346](https://github.com/embroider-build/embroider/pull/1346) : Bugfix: inconsistent handling of webpack virtual modules : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1383](https://github.com/embroider-build/embroider/pull/1383) : Rename strict flag to strictMode : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
+- 8c179845: [#1347](https://github.com/embroider-build/embroider/pull/1347) : fix resolver bugs around package rules : _by [@void-mAlex](https://github.com/void-mAlex)_
+- 8c179845: [#1340](https://github.com/embroider-build/embroider/pull/1340) : Static helpers and static modifiers transform fixes : _by [@void-mAlex](https://github.com/void-mAlex)_
+- 8c179845: [#1386](https://github.com/embroider-build/embroider/pull/1386) : Fix `Maximum call stack size exceeded` error : _by [@simonihmig](https://github.com/simonihmig)_
+- 8c179845: [#1352](https://github.com/embroider-build/embroider/pull/1352) : reinstate logic around parsing of invokes packageRules : _by [@void-mAlex](https://github.com/void-mAlex)_
+- 8c179845: [#1369](https://github.com/embroider-build/embroider/pull/1369) : Add semverRange <=4.11.0 for ember-data : _by [@mkszepp](https://github.com/mkszepp)_
+- 8c179845: [#1343](https://github.com/embroider-build/embroider/pull/1343) : Fix `@babel/core` version check to support `ember-cli-babel` v8 : _by [@bertdeblock](https://github.com/bertdeblock)_
+- 8c179845: [#1372](https://github.com/embroider-build/embroider/pull/1372) : restore component invokes rules support : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1342](https://github.com/embroider-build/embroider/pull/1342) : restore original ts extension priority : _by [@ef4](https://github.com/ef4)_
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/core@3.0.0
+  - @embroider/macros@1.11.0
diff --git a/packages/compat/package.json b/packages/compat/package.json
index 7c392df721..8d859729b3 100644
--- a/packages/compat/package.json
+++ b/packages/compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
@@ -28,7 +28,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.14.5",
     "@babel/traverse": "^7.14.5",
-    "@embroider/macros": "1.10.0",
+    "@embroider/macros": "1.11.0",
     "@types/babel__code-frame": "^7.0.2",
     "@types/yargs": "^17.0.3",
     "assert-never": "^1.1.0",
@@ -83,7 +83,7 @@
     "typescript": "*"
   },
   "peerDependencies": {
-    "@embroider/core": "^2.0.0"
+    "@embroider/core": "^3.0.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
new file mode 100644
index 0000000000..86e6b44d94
--- /dev/null
+++ b/packages/core/CHANGELOG.md
@@ -0,0 +1,32 @@
+# @embroider/core
+
+## 3.0.0
+
+### Major Changes
+
+- 8c179845: [#1363](https://github.com/embroider-build/embroider/pull/1363) : Simplified template resolution : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1339](https://github.com/embroider-build/embroider/pull/1339) : Layer template resolver on top of module resolver : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1331](https://github.com/embroider-build/embroider/pull/1331) : Move resolving into dedicated plugins : _by [@ef4](https://github.com/ef4)_
+
+### Minor Changes
+
+- 8c179845: [#1376](https://github.com/embroider-build/embroider/pull/1376) : legacy addon resolving : _by [@ef4](https://github.com/ef4)_
+
+  This adds the ability to intercept module resolution requests to and from addons that have been rewritten from v1 to v2.
+
+  It's what will allow resolving modules without needing to physically rewrite the node_modules tree.
+
+- 8c179845: [#1355](https://github.com/embroider-build/embroider/pull/1355) : Refactor self-resolution : _by [@ef4](https://github.com/ef4)_
+- 66de9820: [#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
+- 8c179845: [#1373](https://github.com/embroider-build/embroider/pull/1373) : app tree resolving : _by [@ef4](https://github.com/ef4)_
+
+### Patch Changes
+
+- 8c179845: [#1346](https://github.com/embroider-build/embroider/pull/1346) : Bugfix: inconsistent handling of webpack virtual modules : _by [@ef4](https://github.com/ef4)_
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/macros@1.11.0
+  - @embroider/shared-internals@3.0.0
diff --git a/packages/core/package.json b/packages/core/package.json
index 250945dc87..3fcc063028 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -26,8 +26,8 @@
     "@babel/plugin-transform-runtime": "^7.14.5",
     "@babel/runtime": "^7.14.5",
     "@babel/traverse": "^7.14.5",
-    "@embroider/macros": "1.10.0",
-    "@embroider/shared-internals": "2.0.0",
+    "@embroider/macros": "1.11.0",
+    "@embroider/shared-internals": "3.0.0",
     "assert-never": "^1.2.1",
     "babel-plugin-ember-template-compilation": "^2.0.0",
     "broccoli-node-api": "^1.7.0",
diff --git a/packages/hbs-loader/CHANGELOG.md b/packages/hbs-loader/CHANGELOG.md
new file mode 100644
index 0000000000..fe98ffada0
--- /dev/null
+++ b/packages/hbs-loader/CHANGELOG.md
@@ -0,0 +1,15 @@
+# @embroider/hbs-loader
+
+## 3.0.0
+
+### Patch Changes
+
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/core@3.0.0
diff --git a/packages/hbs-loader/package.json b/packages/hbs-loader/package.json
index 4ef15dafbd..649419f2be 100644
--- a/packages/hbs-loader/package.json
+++ b/packages/hbs-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/hbs-loader",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "private": false,
   "description": "Glimmer handlebars loader for webpack",
   "repository": {
@@ -23,7 +23,7 @@
     "typescript": "*"
   },
   "peerDependencies": {
-    "@embroider/core": "^2.0.0",
+    "@embroider/core": "^3.0.0",
     "webpack": "^5"
   },
   "engines": {
diff --git a/packages/macros/CHANGELOG.md b/packages/macros/CHANGELOG.md
new file mode 100644
index 0000000000..14656027d5
--- /dev/null
+++ b/packages/macros/CHANGELOG.md
@@ -0,0 +1,16 @@
+# @embroider/macros
+
+## 1.11.0
+
+### Minor Changes
+
+- 66de9820: [#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
+
+### Patch Changes
+
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/shared-internals@3.0.0
diff --git a/packages/macros/package.json b/packages/macros/package.json
index 5cba274b03..9d4f732912 100644
--- a/packages/macros/package.json
+++ b/packages/macros/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/macros",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "private": false,
   "description": "Standardized build-time macros for ember apps.",
   "keywords": [
@@ -23,7 +23,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@embroider/shared-internals": "2.0.0",
+    "@embroider/shared-internals": "3.0.0",
     "assert-never": "^1.2.1",
     "babel-import-util": "^1.1.0",
     "ember-cli-babel": "^7.26.6",
@@ -36,7 +36,7 @@
     "@babel/core": "^7.14.5",
     "@babel/plugin-transform-modules-amd": "^7.19.6",
     "@babel/traverse": "^7.14.5",
-    "@embroider/core": "2.1.1",
+    "@embroider/core": "3.0.0",
     "@embroider/test-support": "0.36.0",
     "@types/babel__core": "^7.1.14",
     "@types/babel__generator": "^7.6.2",
diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
new file mode 100644
index 0000000000..0aa7086472
--- /dev/null
+++ b/packages/router/CHANGELOG.md
@@ -0,0 +1,17 @@
+# @embroider/router
+
+## 3.0.0
+
+### Patch Changes
+
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/core@3.0.0
+  - @embroider/addon-shim@1.9.0
diff --git a/packages/router/package.json b/packages/router/package.json
index ad31b22482..dd8838a41d 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/router",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Lazy loading router",
   "keywords": [
     "ember-addon"
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@ember/test-waiters": "^3.0.0",
-    "@embroider/addon-shim": "^1.8.4"
+    "@embroider/addon-shim": "^1.9.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.0",
@@ -39,7 +39,7 @@
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-decorators": "^7.17.0",
     "@babel/plugin-syntax-decorators": "^7.17.0",
-    "@embroider/addon-dev": "^3.0.0",
+    "@embroider/addon-dev": "^3.1.0",
     "@tsconfig/ember": "^1.0.0",
     "@types/ember": "^4.0.0",
     "@types/ember__object": "^4.0.0",
@@ -74,7 +74,7 @@
     "typescript": "^4.7.4"
   },
   "peerDependencies": {
-    "@embroider/core": "^2.0.0",
+    "@embroider/core": "^3.0.0",
     "@types/ember__routing": "*"
   },
   "peerDependenciesMeta": {
diff --git a/packages/shared-internals/CHANGELOG.md b/packages/shared-internals/CHANGELOG.md
new file mode 100644
index 0000000000..c631a13709
--- /dev/null
+++ b/packages/shared-internals/CHANGELOG.md
@@ -0,0 +1,17 @@
+# @embroider/shared-internals
+
+## 3.0.0
+
+### Major Changes
+
+- 8c179845: [#1339](https://github.com/embroider-build/embroider/pull/1339) : Layer template resolver on top of module resolver : _by [@ef4](https://github.com/ef4)_
+
+### Minor Changes
+
+- 66de9820: [#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
+
+### Patch Changes
+
+- 8c179845: [#1396](https://github.com/embroider-build/embroider/pull/1396) : Add @ember/owner to emberVirtualPackages : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1379](https://github.com/embroider-build/embroider/pull/1379) : don't confuse webpack requests with packageNames : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1372](https://github.com/embroider-build/embroider/pull/1372) : restore component invokes rules support : _by [@ef4](https://github.com/ef4)_
diff --git a/packages/shared-internals/package.json b/packages/shared-internals/package.json
index 3769d9eb4a..205ed351ce 100644
--- a/packages/shared-internals/package.json
+++ b/packages/shared-internals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/shared-internals",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "private": false,
   "description": "Utilities shared among the other embroider packages",
   "repository": {
diff --git a/packages/test-setup/CHANGELOG.md b/packages/test-setup/CHANGELOG.md
new file mode 100644
index 0000000000..4584386992
--- /dev/null
+++ b/packages/test-setup/CHANGELOG.md
@@ -0,0 +1,3 @@
+# @embroider/test-setup
+
+## 3.0.0
diff --git a/packages/test-setup/package.json b/packages/test-setup/package.json
index 5e151ce017..ec3b46ac77 100644
--- a/packages/test-setup/package.json
+++ b/packages/test-setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/test-setup",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/embroider-build/embroider.git",
@@ -16,7 +16,7 @@
     "resolve": "^1.20.0"
   },
   "devDependencies": {
-    "@embroider/compat": "2.1.1"
+    "@embroider/compat": "3.0.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
diff --git a/packages/util/CHANGELOG.md b/packages/util/CHANGELOG.md
new file mode 100644
index 0000000000..69853d167d
--- /dev/null
+++ b/packages/util/CHANGELOG.md
@@ -0,0 +1,19 @@
+# @embroider/util
+
+## 1.11.0
+
+### Minor Changes
+
+- 66de9820: [#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
+- dc24a3ff: Improve types of `ensure-safe-component` helper
+
+  This will improve the Glint type of `ensure-safe-component` in two ways:
+
+  - when a component class is passed, the return type will _not_ get narrowed down to an (mostly unusable) `ComponentLike<unknown>`, but to the type of the passed component itself
+  - when a string is passed that has an entry in the `@glint/environment-ember-loose` template registry, then the registered type will be returned instead of again `ComponentLike<unknown>`
+
+### Patch Changes
+
+- 66de9820: [#1388](https://github.com/embroider-build/embroider/pull/1388) : Enable prettier in ci : _by [@NullVoxPopuli](https://github.com/NullVoxPopuli)_
+- Updated dependencies [66de9820]
+  - @embroider/macros@1.11.0
diff --git a/packages/util/package.json b/packages/util/package.json
index c5b62acc3f..459e362bfc 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/util",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Utilities for app and addon authors.",
   "keywords": [
     "ember-addon"
@@ -27,7 +27,7 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@embroider/macros": "^1.10.0",
+    "@embroider/macros": "^1.11.0",
     "broccoli-funnel": "^3.0.5",
     "ember-cli-babel": "^7.26.11"
   },
@@ -49,11 +49,11 @@
     "@ember/jquery": "^2.0.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.9.1",
-    "@embroider/compat": "2.1.1",
-    "@embroider/core": "2.1.1",
-    "@embroider/test-setup": "2.1.1",
+    "@embroider/compat": "3.0.0",
+    "@embroider/core": "3.0.0",
+    "@embroider/test-setup": "3.0.0",
     "@embroider/test-support": "0.36.0",
-    "@embroider/webpack": "2.1.1",
+    "@embroider/webpack": "3.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glint/template": "^1.0.0-beta.3",
diff --git a/packages/webpack/CHANGELOG.md b/packages/webpack/CHANGELOG.md
new file mode 100644
index 0000000000..a7a9e7db86
--- /dev/null
+++ b/packages/webpack/CHANGELOG.md
@@ -0,0 +1,35 @@
+# @embroider/webpack
+
+## 3.0.0
+
+### Major Changes
+
+- 8c179845: [#1339](https://github.com/embroider-build/embroider/pull/1339) : Layer template resolver on top of module resolver : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1331](https://github.com/embroider-build/embroider/pull/1331) : Move resolving into dedicated plugins : _by [@ef4](https://github.com/ef4)_
+
+### Minor Changes
+
+- 8c179845: [#1355](https://github.com/embroider-build/embroider/pull/1355) : Refactor self-resolution : _by [@ef4](https://github.com/ef4)_
+- 66de9820: [#1354](https://github.com/embroider-build/embroider/pull/1354) : Add glint helper types for more macros : _by [@vlascik](https://github.com/vlascik)_
+- 8c179845: [#1373](https://github.com/embroider-build/embroider/pull/1373) : app tree resolving : _by [@ef4](https://github.com/ef4)_
+
+### Patch Changes
+
+- 8c179845: [#1346](https://github.com/embroider-build/embroider/pull/1346) : Bugfix: inconsistent handling of webpack virtual modules : _by [@ef4](https://github.com/ef4)_
+- 8c179845: [#1359](https://github.com/embroider-build/embroider/pull/1359) : Ignore resolve requests that start with ! : _by [@mansona](https://github.com/mansona)_
+- 8c179845: [#1363](https://github.com/embroider-build/embroider/pull/1363) : Simplified template resolution : _by [@ef4](https://github.com/ef4)_
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [66de9820]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+- Updated dependencies [8c179845]
+  - @embroider/core@3.0.0
+  - @embroider/shared-internals@3.0.0
+  - @embroider/babel-loader-8@3.0.0
+  - @embroider/hbs-loader@3.0.0
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 87b6bdaef8..785c940cf8 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/webpack",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "private": false,
   "description": "Builds EmberJS apps with Webpack",
   "repository": {
@@ -19,9 +19,9 @@
   "scripts": {},
   "dependencies": {
     "@babel/core": "^7.14.5",
-    "@embroider/babel-loader-8": "2.0.0",
-    "@embroider/hbs-loader": "2.0.0",
-    "@embroider/shared-internals": "2.0.0",
+    "@embroider/babel-loader-8": "3.0.0",
+    "@embroider/hbs-loader": "3.0.0",
+    "@embroider/shared-internals": "3.0.0",
     "@types/supports-color": "^8.1.0",
     "assert-never": "^1.2.1",
     "babel-loader": "^8.2.2",
@@ -51,7 +51,7 @@
     "webpack": "^5.38.1"
   },
   "peerDependencies": {
-    "@embroider/core": "^2.0.0",
+    "@embroider/core": "^3.0.0",
     "webpack": "^5.0.0"
   },
   "engines": {
diff --git a/tests/addon-template/package.json b/tests/addon-template/package.json
index ce3eec66c1..c545beb33d 100644
--- a/tests/addon-template/package.json
+++ b/tests/addon-template/package.json
@@ -34,7 +34,7 @@
     "@babel/core": "^7.19.3",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.9.1",
-    "@embroider/test-setup": "^2.0.0",
+    "@embroider/test-setup": "^3.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "babel-eslint": "^10.1.0",
diff --git a/tests/app-template/package.json b/tests/app-template/package.json
index 795ee43fac..9bc3e6e162 100644
--- a/tests/app-template/package.json
+++ b/tests/app-template/package.json
@@ -27,11 +27,11 @@
     "@babel/core": "^7.19.3",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.9.1",
-    "@embroider/compat": "2.1.1",
-    "@embroider/core": "2.1.1",
-    "@embroider/router": "2.0.0",
-    "@embroider/test-setup": "2.1.1",
-    "@embroider/webpack": "2.1.1",
+    "@embroider/compat": "3.0.0",
+    "@embroider/core": "3.0.0",
+    "@embroider/router": "3.0.0",
+    "@embroider/test-setup": "3.0.0",
+    "@embroider/webpack": "3.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "babel-eslint": "^10.1.0",
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 24b1946d8b..2b574f1901 100644
--- a/tests/scenarios/package.json
+++ b/tests/scenarios/package.json
@@ -2,9 +2,9 @@
   "name": "@embroider/test-scenarios",
   "version": "0.0.5",
   "dependencies": {
-    "@embroider/compat": "2.1.1",
-    "@embroider/core": "2.1.1",
-    "@embroider/shared-internals": "2.0.0",
+    "@embroider/compat": "3.0.0",
+    "@embroider/core": "3.0.0",
+    "@embroider/shared-internals": "3.0.0",
     "@embroider/test-support": "0.36.0",
     "@types/qunit": "^2.11.1",
     "fastboot": "^3.1.0",
@@ -36,10 +36,10 @@
     "@babel/runtime": "^7.18.6",
     "@ember/legacy-built-in-components": "^0.4.1",
     "@ember/string": "^3.0.0",
-    "@embroider/addon-shim": "1.8.4",
-    "@embroider/macros": "1.10.0",
-    "@embroider/router": "2.0.0",
-    "@embroider/util": "1.10.0",
+    "@embroider/addon-shim": "1.9.0",
+    "@embroider/macros": "1.11.0",
+    "@embroider/router": "3.0.0",
+    "@embroider/util": "1.11.0",
     "@rollup/plugin-babel": "^5.3.1",
     "@tsconfig/ember": "1.0.1",
     "babel-plugin-ember-template-compilation": "^2.0.0",
diff --git a/tests/ts-app-template/package.json b/tests/ts-app-template/package.json
index bd8c3ec6bd..8ca252f26e 100644
--- a/tests/ts-app-template/package.json
+++ b/tests/ts-app-template/package.json
@@ -26,11 +26,11 @@
     "@babel/core": "^7.19.3",
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.9.0",
-    "@embroider/compat": "2.1.1",
-    "@embroider/core": "2.1.1",
-    "@embroider/router": "2.0.0",
-    "@embroider/test-setup": "2.1.1",
-    "@embroider/webpack": "2.1.1",
+    "@embroider/compat": "3.0.0",
+    "@embroider/core": "3.0.0",
+    "@embroider/router": "3.0.0",
+    "@embroider/test-setup": "3.0.0",
+    "@embroider/webpack": "3.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glimmer/interfaces": "^0.84.2",
diff --git a/tests/v2-addon-template/package.json b/tests/v2-addon-template/package.json
index 8bb9c07c69..7058631ee2 100644
--- a/tests/v2-addon-template/package.json
+++ b/tests/v2-addon-template/package.json
@@ -5,7 +5,7 @@
     "ember-addon"
   ],
   "dependencies": {
-    "@embroider/addon-shim": "1.8.4"
+    "@embroider/addon-shim": "1.9.0"
   },
   "private": true,
   "ember-addon": {