Merge pull request #242 from ember-cli/merge-beta

mansona · web-flow · commit 215e467701ce · 2026-04-17T23:13:17.000+01:00
Prepare 7.0-alpha
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,122 +1,100 @@
 # Changelog
 
-## Release (2026-02-11)
+## Release (2026-04-02)
 
-* @ember/app-blueprint 6.12.0-alpha.4 (patch)
+* @ember/app-blueprint 6.12.0-beta.1 (minor)
+
+#### :rocket: Enhancement
+* `@ember/app-blueprint`
+  * [#238](https://github.com/ember-cli/ember-app-blueprint/pull/238) Promote 6.12 to beta and update dependencies ([@mansona](https://github.com/mansona))
+  * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))
 
 #### :bug: Bug Fix
 * `@ember/app-blueprint`
+  * [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
+  * [#226](https://github.com/ember-cli/ember-app-blueprint/pull/226) fix decorator-transforms runtime path in babel.config.mjs ([@mansona](https://github.com/mansona))
   * [#215](https://github.com/ember-cli/ember-app-blueprint/pull/215) upgrade ember/optional-features to clear install deprecation warnings ([@void-mAlex](https://github.com/void-mAlex))
-  * [#209](https://github.com/ember-cli/ember-app-blueprint/pull/209) Remove unnecessary empty lines when `--no-warp-drive` was passed ([@mkszepp](https://github.com/mkszepp))
-  * [#205](https://github.com/ember-cli/ember-app-blueprint/pull/205) [bugfix release] Auto-choose correct compilerPath ([@ef4](https://github.com/ef4))
+  * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv))
+  * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp))
+
+#### :memo: Documentation
+* `@ember/app-blueprint`
+  * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona))
 
 #### :house: Internal
 * `@ember/app-blueprint`
-  * [#220](https://github.com/ember-cli/ember-app-blueprint/pull/220) Merge beta into main ([@mansona](https://github.com/mansona))
-  * [#218](https://github.com/ember-cli/ember-app-blueprint/pull/218) Prepare Stable Release v6.10.4 ([@github-actions[bot]](https://github.com/apps/github-actions))
-  * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))
-  * [#203](https://github.com/ember-cli/ember-app-blueprint/pull/203) Prepare Beta Release v6.11.0-beta.2 ([@github-actions[bot]](https://github.com/apps/github-actions))
-  * [#206](https://github.com/ember-cli/ember-app-blueprint/pull/206) Merge release into beta ([@mansona](https://github.com/mansona))
-  * [#201](https://github.com/ember-cli/ember-app-blueprint/pull/201) Prepare Stable Release v6.10.3 ([@github-actions[bot]](https://github.com/apps/github-actions))
+  * [#228](https://github.com/ember-cli/ember-app-blueprint/pull/228) Enable patch publish ([@mansona](https://github.com/mansona))
+  * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))
 
-#### Committers: 5
+#### Committers: 4
 - Alex ([@void-mAlex](https://github.com/void-mAlex))
+- Alexey Kulakov ([@aklkv](https://github.com/aklkv))
 - Chris Manson ([@mansona](https://github.com/mansona))
-- Edward Faulkner ([@ef4](https://github.com/ef4))
-- GitHub Actions [Bot] ([@github-actions](https://github.com/apps/github-actions))
 - Markus Sanin ([@mkszepp](https://github.com/mkszepp))
 
-## Release (2026-02-08)
+## Release (2026-03-03)
 
-* @ember/app-blueprint 6.12.0-alpha.3 (minor)
+* @ember/app-blueprint 6.11.2 (patch)
 
-#### :rocket: Enhancement
+#### :bug: Bug Fix
 * `@ember/app-blueprint`
-  * [#144](https://github.com/ember-cli/ember-app-blueprint/pull/144) feat: move ember-cli-build to `mjs` ([@aklkv](https://github.com/aklkv))
+  * [#231](https://github.com/ember-cli/ember-app-blueprint/pull/231) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
 
 #### Committers: 1
-- Alexey Kulakov ([@aklkv](https://github.com/aklkv))
+- Chris Manson ([@mansona](https://github.com/mansona))
 
-## Release (2026-02-08)
+## Release (2026-03-01)
 
-* @ember/app-blueprint 6.12.0-alpha.2 (patch)
+* @ember/app-blueprint 6.11.1 (patch)
 
 #### :bug: Bug Fix
 * `@ember/app-blueprint`
-  * [#119](https://github.com/ember-cli/ember-app-blueprint/pull/119) fix: align linters with recent changes in classic app blueprint ([@aklkv](https://github.com/aklkv))
-  * [#208](https://github.com/ember-cli/ember-app-blueprint/pull/208) [Bugfix release] Add `globals.browser` to eslint config for TS files ([@mkszepp](https://github.com/mkszepp))
+  * [#226](https://github.com/ember-cli/ember-app-blueprint/pull/226) fix decorator-transforms runtime path in babel.config.mjs ([@mansona](https://github.com/mansona))
 
-#### Committers: 2
-- Alexey Kulakov ([@aklkv](https://github.com/aklkv))
-- Markus Sanin ([@mkszepp](https://github.com/mkszepp))
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
 
-## Release (2026-01-25)
+## Release (2026-02-17)
 
-* @ember/app-blueprint 6.12.0-alpha.1 (patch)
+* @ember/app-blueprint 6.11.0 (minor)
 
-#### :memo: Documentation
+#### :rocket: Enhancement
 * `@ember/app-blueprint`
-  * [#204](https://github.com/ember-cli/ember-app-blueprint/pull/204) Update Release.md ([@mansona](https://github.com/mansona))
+  * [#222](https://github.com/ember-cli/ember-app-blueprint/pull/222) Promote Beta and update all dependencies for 6.11 release ([@mansona](https://github.com/mansona))
 
 #### :house: Internal
 * `@ember/app-blueprint`
-  * [#211](https://github.com/ember-cli/ember-app-blueprint/pull/211) fix release-plan alpha tag ([@mansona](https://github.com/mansona))
+  * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))
 
 #### Committers: 1
 - Chris Manson ([@mansona](https://github.com/mansona))
 
-## Release (2026-01-23)
+## Release (2026-02-09)
 
-* @ember/app-blueprint 6.12.0-beta.0 (minor)
-
-#### :rocket: Enhancement
-* `@ember/app-blueprint`
-  * [#190](https://github.com/ember-cli/ember-app-blueprint/pull/190) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona))
+* @ember/app-blueprint 6.10.4 (patch)
 
 #### :bug: Bug Fix
 * `@ember/app-blueprint`
-  * [#197](https://github.com/ember-cli/ember-app-blueprint/pull/197) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
-  * [#195](https://github.com/ember-cli/ember-app-blueprint/pull/195) add sort-package-json as a dependency ([@mansona](https://github.com/mansona))
-  * [#187](https://github.com/ember-cli/ember-app-blueprint/pull/187) [bugfix beta] Revert "Add --minimal and --no-compat" ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
-
-#### :memo: Documentation
-* `@ember/app-blueprint`
-  * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))
+  * [#209](https://github.com/ember-cli/ember-app-blueprint/pull/209) Remove unnecessary empty lines when `--no-warp-drive` was passed ([@mkszepp](https://github.com/mkszepp))
 
 #### :house: Internal
 * `@ember/app-blueprint`
-  * [#202](https://github.com/ember-cli/ember-app-blueprint/pull/202) Prepare 6.12-alpha ([@mansona](https://github.com/mansona))
-  * [#200](https://github.com/ember-cli/ember-app-blueprint/pull/200) Prepare Beta Release v6.11.0-beta.1 ([@github-actions[bot]](https://github.com/apps/github-actions))
-  * [#199](https://github.com/ember-cli/ember-app-blueprint/pull/199) Prepare 6.11 Beta ([@mansona](https://github.com/mansona))
+  * [#217](https://github.com/ember-cli/ember-app-blueprint/pull/217) update release-plan to support OIDC ([@mansona](https://github.com/mansona))
 
-#### Committers: 3
+#### Committers: 2
 - Chris Manson ([@mansona](https://github.com/mansona))
-- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
-- [@github-actions[bot]](https://github.com/apps/github-actions)
+- Markus Sanin ([@mkszepp](https://github.com/mkszepp))
 
 ## Release (2026-01-23)
 
-* @ember/app-blueprint 6.11.0-beta.1 (minor)
-
-#### :rocket: Enhancement
-* `@ember/app-blueprint`
-  * [#190](https://github.com/ember-cli/ember-app-blueprint/pull/190) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona))
+* @ember/app-blueprint 6.10.3 (patch)
 
 #### :bug: Bug Fix
 * `@ember/app-blueprint`
-  * [#197](https://github.com/ember-cli/ember-app-blueprint/pull/197) update ember-cli dependency to latest ([@mansona](https://github.com/mansona))
-  * [#195](https://github.com/ember-cli/ember-app-blueprint/pull/195) add sort-package-json as a dependency ([@mansona](https://github.com/mansona))
-
-#### :memo: Documentation
-* `@ember/app-blueprint`
-  * [#158](https://github.com/ember-cli/ember-app-blueprint/pull/158) update RELEASE.md ([@mansona](https://github.com/mansona))
-
-#### :house: Internal
-* `@ember/app-blueprint`
-  * [#199](https://github.com/ember-cli/ember-app-blueprint/pull/199) Prepare 6.11 Beta ([@mansona](https://github.com/mansona))
+  * [#205](https://github.com/ember-cli/ember-app-blueprint/pull/205) [bugfix release] Auto-choose correct compilerPath ([@ef4](https://github.com/ef4))
 
 #### Committers: 1
-- Chris Manson ([@mansona](https://github.com/mansona))
+- Edward Faulkner ([@ef4](https://github.com/ef4))
 
 ## Release (2026-01-23)
 
diff --git a/conditional-files/_js_babel.config.mjs b/conditional-files/_js_babel.config.mjs
@@ -22,7 +22,9 @@ export default {
       'module:decorator-transforms',
       {
         runtime: {
-          import: import.meta.resolve('decorator-transforms/runtime-esm'),
+          import: fileURLToPath(
+            import.meta.resolve('decorator-transforms/runtime-esm'),
+          ),
         },
       },
     ],
diff --git a/conditional-files/_ts_babel.config.mjs b/conditional-files/_ts_babel.config.mjs
@@ -30,7 +30,9 @@ export default {
       'module:decorator-transforms',
       {
         runtime: {
-          import: import.meta.resolve('decorator-transforms/runtime-esm'),
+          import: fileURLToPath(
+            import.meta.resolve('decorator-transforms/runtime-esm'),
+          ),
         },
       },
     ],
diff --git a/files/package.json b/files/package.json
@@ -31,28 +31,28 @@
     "./*": "./app/*"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.6",
+    "@babel/core": "^7.29.0",
     "@babel/runtime": "^7.28.6",
-    "@babel/plugin-transform-runtime": "^7.28.5<% if (typescript) { %>",
+    "@babel/plugin-transform-runtime": "^7.29.0<% if (typescript) { %>",
     "@babel/plugin-transform-typescript": "^7.28.6<% } %>",
     "@babel/eslint-parser": "^7.28.6<% if (typescript) { %>",
     "@ember/app-tsconfig": "^1.0.3<% } %>",
     "@ember/optional-features": "^3.0.0",
     "@ember/string": "^4.0.1",
     "@ember/test-helpers": "^5.4.1",
     "@ember/test-waiters": "^4.1.1",
-    "@embroider/macros": "^1.19.6",
-    "@embroider/core": "^4.4.2",
-    "@embroider/vite": "^1.5.0",
-    "@embroider/compat": "^4.1.12",
+    "@embroider/macros": "^1.19.7",
+    "@embroider/core": "^4.4.3",
+    "@embroider/vite": "^1.5.2",
+    "@embroider/compat": "^4.1.13",
     "@embroider/router": "^3.0.6",
     "@embroider/config-meta-loader": "^1.0.0",
     "@embroider/legacy-inspector-support": "^0.1.3",
     "@eslint/js": "^9.39.2",
     "@glimmer/component": "^2.0.0<% if (typescript) { %>",
-    "@glint/ember-tsc": "^1.0.9",
-    "@glint/template": "^1.7.3",
-    "@glint/tsserver-plugin": "^2.0.9<% } %>",
+    "@glint/ember-tsc": "^1.1.1",
+    "@glint/template": "^1.7.4",
+    "@glint/tsserver-plugin": "^2.1.0<% } %>",
     "@rollup/plugin-babel": "^6.1.0<% if (typescript) { %>",
     "@types/qunit": "^2.19.13",
     "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>",
@@ -64,33 +64,33 @@
     "babel-plugin-ember-template-compilation": "^3.1.0",
     "concurrently": "^9.2.1",
     "decorator-transforms": "^2.3.1",
-    "ember-cli": "~6.10.0",
-    "ember-cli-babel": "^8.2.0",
+    "ember-cli": "~6.11.0",
+    "ember-cli-babel": "^8.3.1",
     "ember-cli-deprecation-workflow": "^3.4.0",
     "ember-load-initializers": "^3.0.1",
-    "ember-modifier": "^4.2.2",
+    "ember-modifier": "^4.3.0",
     "ember-page-title": "^9.0.3",
     "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.11.0-alpha.6",
+    "ember-source": "~7.0.0-beta.1",
     "ember-template-lint": "^7.9.3<% if (welcome) { %>",
     "ember-welcome-page": "^8.0.5<% } %>",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-ember": "^12.7.5",
-    "eslint-plugin-n": "^17.23.2",
-    "eslint-plugin-qunit": "^8.2.5<% if (warpDrive) { %>",
+    "eslint-plugin-n": "^17.24.0",
+    "eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>",
     "eslint-plugin-warp-drive": "^5.8.1<% } %>",
     "globals": "^16.5.0",
-    "prettier": "^3.8.0",
-    "prettier-plugin-ember-template-tag": "^2.1.2",
+    "prettier": "^3.8.1",
+    "prettier-plugin-ember-template-tag": "^2.1.3",
     "qunit": "^2.25.0",
     "qunit-dom": "^3.5.0",
     "stylelint": "^16.26.1",
     "stylelint-config-standard": "^38.0.0",
     "testem": "^3.17.0<% if (typescript) { %>",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.53.0<% } %>",
+    "typescript-eslint": "^8.56.0<% } %>",
     "vite": "^7.3.1"
   },
   "engines": {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ember/app-blueprint",
-  "version": "6.12.0-alpha.4",
+  "version": "7.0.0-alpha.0",
   "description": "Blueprint for next generation of Ember apps",
   "keywords": [
     "ember-blueprint"
diff --git a/tests/fixtures/tests-js-20/testem-dev.js b/tests/fixtures/tests-js-20/testem-dev.js
@@ -20,7 +20,7 @@ function testemProxy(targetURL) {
       res && res.status && res.status(500).json(err);
     });
 
-    app.all('*', (req, res, next) => {
+    app.all('*name', (req, res, next) => {
       let url = req.url;
       if (url === '/testem.js' || url.startsWith('/testem/')) {
         return next();

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ember/app-blueprint",`
`3`		`- "version": "6.12.0-alpha.4",`
	`3`	`+ "version": "7.0.0-alpha.0",`
`4`	`4`	`"description": "Blueprint for next generation of Ember apps",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"ember-blueprint"`