Merge pull request #1470 from embroider-build/prepare-release

Prepping release
embroider-build · Jun 13, 2023 · 65632a7 · 65632a7
2 parents 5a5f4d5 + 51f8d19
commit 65632a7
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 36 deletions.
diff --git a/.release-plan.json b/.release-plan.json
@@ -1,16 +1,7 @@
 {
   "solution": {
     "@embroider/addon-dev": {
-      "impact": "patch",
-      "oldVersion": "3.1.0",
-      "newVersion": "3.1.1",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
-        }
-      ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/addon-dev/package.json"
+      "oldVersion": "3.1.1"
     },
     "@embroider/addon-shim": {
       "oldVersion": "1.8.5"
@@ -20,45 +11,53 @@
     },
     "@embroider/compat": {
       "impact": "patch",
-      "oldVersion": "3.0.0",
-      "newVersion": "3.0.1",
+      "oldVersion": "3.0.1",
+      "newVersion": "3.0.2",
       "constraints": [
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/macros"
+        },
         {
           "impact": "patch",
           "reason": "Appears in changelog section :bug: Bug Fix"
         }
       ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/compat/package.json"
+      "pkgJSONPath": "/Users/edward/hacking/embroider-main/packages/compat/package.json"
     },
     "@embroider/core": {
       "impact": "patch",
-      "oldVersion": "3.0.0",
-      "newVersion": "3.0.1",
+      "oldVersion": "3.0.1",
+      "newVersion": "3.0.2",
       "constraints": [
         {
           "impact": "patch",
           "reason": "Appears in changelog section :bug: Bug Fix"
+        },
+        {
+          "impact": "patch",
+          "reason": "Has dependency `workspace:*` on @embroider/macros"
         }
       ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/core/package.json"
+      "pkgJSONPath": "/Users/edward/hacking/embroider-main/packages/core/package.json"
     },
     "@embroider/hbs-loader": {
       "oldVersion": "3.0.0"
     },
     "@embroider/macros": {
-      "oldVersion": "1.11.0"
-    },
-    "@embroider/router": {
       "impact": "patch",
-      "oldVersion": "2.1.0",
-      "newVersion": "2.1.1",
+      "oldVersion": "1.11.0",
+      "newVersion": "1.11.1",
       "constraints": [
         {
           "impact": "patch",
           "reason": "Appears in changelog section :bug: Bug Fix"
         }
       ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/router/package.json"
+      "pkgJSONPath": "/Users/edward/hacking/embroider-main/packages/macros/package.json"
+    },
+    "@embroider/router": {
+      "oldVersion": "2.1.1"
     },
     "@embroider/shared-internals": {
       "oldVersion": "2.1.0"
@@ -67,20 +66,11 @@
       "oldVersion": "3.0.1"
     },
     "@embroider/util": {
-      "impact": "patch",
-      "oldVersion": "1.11.0",
-      "newVersion": "1.11.1",
-      "constraints": [
-        {
-          "impact": "patch",
-          "reason": "Appears in changelog section :bug: Bug Fix"
-        }
-      ],
-      "pkgJSONPath": "/Users/edward/hacking/embroider/packages/util/package.json"
+      "oldVersion": "1.11.1"
     },
     "@embroider/webpack": {
       "oldVersion": "3.0.0"
     }
   },
-  "description": "## Release (2023-06-05)\n\n@embroider/addon-dev 3.1.1 (patch)\n@embroider/compat 3.0.1 (patch)\n@embroider/core 3.0.1 (patch)\n@embroider/router 2.1.1 (patch)\n@embroider/util 1.11.1 (patch)\n\n#### :bug: Bug Fix\n* `compat`\n  * [#1460](https://github.com/embroider-build/embroider/pull/1460) expanding EmptyPackage contents ([@ef4](https://github.com/ef4))\n* `addon-dev`\n  * [#1423](https://github.com/embroider-build/embroider/pull/1423) Do not write package.json when there are no changes (affects `addon.appReexports()` and `addon.publicAssets()`) ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n  * [#1446](https://github.com/embroider-build/embroider/pull/1446) Revert \"Run the clean plugin of addon-dev as late as possible\" ([@mansona](https://github.com/mansona))\n  * [#1450](https://github.com/embroider-build/embroider/pull/1450) [bugfix] Ensured that normalizeFileExt ignores .css.d.ts files ([@ijlee2](https://github.com/ijlee2))\n  * [#1447](https://github.com/embroider-build/embroider/pull/1447) fix keepAssets corrupting image files ([@mansona](https://github.com/mansona))\n* `compat`, `core`\n  * [#1443](https://github.com/embroider-build/embroider/pull/1443) linkto routable engine path in host app ([@void-mAlex](https://github.com/void-mAlex))\n* `addon-dev`, `router`\n  * [#1449](https://github.com/embroider-build/embroider/pull/1449) [bugfix] Set output.experimentalMinChunkSize to 0, to counter a change in rollup@3.22.0 ([@ijlee2](https://github.com/ijlee2))\n* `util`\n  * [#1451](https://github.com/embroider-build/embroider/pull/1451) Use `typeof` in `EmbroiderUtilRegistry` ([@bertdeblock](https://github.com/bertdeblock))\n\n#### :memo: Documentation\n* [#1349](https://github.com/embroider-build/embroider/pull/1349) Add a document about pnpm monorepo error ([@mansona](https://github.com/mansona))\n* [#1458](https://github.com/embroider-build/embroider/pull/1458) Add compatible Ember version to README.md ([@EWhite613](https://github.com/EWhite613))\n\n#### :house: Internal\n* [#1444](https://github.com/embroider-build/embroider/pull/1444) clean up patch-package which was introduced with changeset-recover th… ([@void-mAlex](https://github.com/void-mAlex))\n* [#1440](https://github.com/embroider-build/embroider/pull/1440) release preview workflow ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 7\n- Alex ([@void-mAlex](https://github.com/void-mAlex))\n- Bert De Block ([@bertdeblock](https://github.com/bertdeblock))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n- Eric White ([@EWhite613](https://github.com/EWhite613))\n- Isaac Lee ([@ijlee2](https://github.com/ijlee2))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
+  "description": "## Release (2023-06-13)\n\n@embroider/compat 3.0.2 (patch)\n@embroider/core 3.0.2 (patch)\n@embroider/macros 1.11.1 (patch)\n\n#### :bug: Bug Fix\n* `core`\n  * [#1463](https://github.com/embroider-build/embroider/pull/1463) fix resolution of files with .hbs extensions ([@ef4](https://github.com/ef4))\n* `macros`\n  * [#1468](https://github.com/embroider-build/embroider/pull/1468) macroCondition: do branch elimination if no runtime impl. is involved ([@simonihmig](https://github.com/simonihmig))\n* `compat`\n  * [#1412](https://github.com/embroider-build/embroider/pull/1412) WriteV1Config: fix /tests support ([@22a](https://github.com/22a))\n\n#### :house: Internal\n* [#1469](https://github.com/embroider-build/embroider/pull/1469) update deprecated (and removed) blacklist config in test app ([@mansona](https://github.com/mansona))\n\n\n#### Committers: 5\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n- Peter Meehan ([@22a](https://github.com/22a))\n- Robert Jackson ([@rwjblue](https://github.com/rwjblue))\n- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))\n"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Embroider Changelog
 
+## Release (2023-06-13)
+
+@embroider/compat 3.0.2 (patch)
+@embroider/core 3.0.2 (patch)
+@embroider/macros 1.11.1 (patch)
+
+#### :bug: Bug Fix
+* `core`
+  * [#1463](https://github.com/embroider-build/embroider/pull/1463) fix resolution of files with .hbs extensions ([@ef4](https://github.com/ef4))
+* `macros`
+  * [#1468](https://github.com/embroider-build/embroider/pull/1468) macroCondition: do branch elimination if no runtime impl. is involved ([@simonihmig](https://github.com/simonihmig))
+* `compat`
+  * [#1412](https://github.com/embroider-build/embroider/pull/1412) WriteV1Config: fix /tests support ([@22a](https://github.com/22a))
+
+#### :house: Internal
+* [#1469](https://github.com/embroider-build/embroider/pull/1469) update deprecated (and removed) blacklist config in test app ([@mansona](https://github.com/mansona))
+
+
+#### Committers: 5
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Edward Faulkner ([@ef4](https://github.com/ef4))
+- Peter Meehan ([@22a](https://github.com/22a))
+- Robert Jackson ([@rwjblue](https://github.com/rwjblue))
+- Simon Ihmig ([@simonihmig](https://github.com/simonihmig))
+
 ## Release (2023-06-05)
 
 @embroider/addon-dev 3.1.1 (patch)

diff --git a/packages/compat/package.json b/packages/compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {

diff --git a/packages/macros/package.json b/packages/macros/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/macros",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "private": false,
   "description": "Standardized build-time macros for ember apps.",
   "keywords": [