From 7d32d37ccaa74160265f4a3e1e9ff654050403e2 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 25 Jan 2026 16:35:54 +0000 Subject: [PATCH 01/49] update to the next alpha version --- package.json | 2 +- packages/addon-blueprint/package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- packages/app-blueprint/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 927a572509..e718c5809f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.11.0-alpha.1", + "version": "6.12.0-alpha.0", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index bbc1f4be11..322c30412f 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.11.0-alpha.1", + "version": "6.12.0-alpha.0", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 1fb8baef05..5151f92f96 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.11.0-beta.1", + "ember-cli": "~6.12.0-alpha.0", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index 5316e67fe8..d17d393921 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.11.0-alpha.1", + "version": "6.12.0-alpha.0", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", From 835aa4708ff5cf1f6b5ec78bd1f599e4bad0d2d6 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 25 Jan 2026 22:34:47 +0000 Subject: [PATCH 02/49] update blueprint dependencies to alpha --- package.json | 2 +- packages/app-blueprint/files/package.json | 4 +- pnpm-lock.yaml | 72 ++++++++++--------- tests/fixtures/addon/defaults/package.json | 4 +- tests/fixtures/addon/pnpm/package.json | 4 +- tests/fixtures/addon/typescript/package.json | 4 +- tests/fixtures/addon/yarn/package.json | 4 +- tests/fixtures/app/defaults/package.json | 4 +- .../app/embroider-no-ember-data/package.json | 4 +- .../app/embroider-no-welcome/package.json | 4 +- .../fixtures/app/embroider-pnpm/package.json | 4 +- .../fixtures/app/embroider-yarn/package.json | 4 +- tests/fixtures/app/embroider/package.json | 4 +- tests/fixtures/app/no-ember-data/package.json | 4 +- tests/fixtures/app/npm/package.json | 4 +- tests/fixtures/app/pnpm/package.json | 4 +- .../package.json | 4 +- .../app/typescript-embroider/package.json | 4 +- .../app/typescript-no-ember-data/package.json | 4 +- tests/fixtures/app/typescript/package.json | 4 +- tests/fixtures/app/yarn/package.json | 4 +- 21 files changed, 78 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index e718c5809f..4e9d04d689 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@ember-tooling/blueprint-model": "workspace:*", "@ember-tooling/classic-build-addon-blueprint": "workspace:*", "@ember-tooling/classic-build-app-blueprint": "workspace:*", - "@ember/app-blueprint": "~6.11.0-beta.2", + "@ember/app-blueprint": "~6.12.0-alpha.1", "@pnpm/find-workspace-dir": "^1000.1.3", "babel-remove-types": "^1.0.2", "broccoli": "^4.0.0", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 5151f92f96..c3f9cd26da 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -76,7 +76,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0<% if (welcome) { %>", "ember-welcome-page": "^7.0.2<% } %>", @@ -88,7 +88,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ca7cc325c8..3b264e0e7b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,11 +9,11 @@ importers: .: dependencies: '@ember-tooling/blueprint-blueprint': - specifier: ^0.2.1 - version: 0.2.1 + specifier: workspace:* + version: link:packages/blueprint-blueprint '@ember-tooling/blueprint-model': - specifier: ^0.5.0 - version: 0.5.0 + specifier: workspace:* + version: link:packages/blueprint-model '@ember-tooling/classic-build-addon-blueprint': specifier: workspace:* version: link:packages/addon-blueprint @@ -21,8 +21,8 @@ importers: specifier: workspace:* version: link:packages/app-blueprint '@ember/app-blueprint': - specifier: ~6.11.0-beta.2 - version: 6.11.0-beta.2 + specifier: ~6.12.0-alpha.1 + version: 6.12.0-alpha.1 '@pnpm/find-workspace-dir': specifier: ^1000.1.3 version: 1000.1.3 @@ -367,8 +367,8 @@ importers: packages/addon-blueprint: dependencies: '@ember-tooling/blueprint-model': - specifier: ^0.5.0 - version: 0.5.0 + specifier: workspace:* + version: link:../blueprint-model chalk: specifier: ^5.6.2 version: 5.6.2 @@ -397,8 +397,8 @@ importers: packages/app-blueprint: dependencies: '@ember-tooling/blueprint-model': - specifier: ^0.5.0 - version: 0.5.0 + specifier: workspace:* + version: link:../blueprint-model chalk: specifier: ^5.6.2 version: 5.6.2 @@ -406,6 +406,32 @@ importers: specifier: ^1.1.0 version: 1.1.0 + packages/blueprint-blueprint: {} + + packages/blueprint-model: + dependencies: + chalk: + specifier: ^5.6.2 + version: 5.6.2 + diff: + specifier: ^7.0.0 + version: 7.0.0 + isbinaryfile: + specifier: ^5.0.4 + version: 5.0.4 + lodash: + specifier: ^4.17.21 + version: 4.17.21 + promise.hash.helper: + specifier: ^1.0.8 + version: 1.0.8 + quick-temp: + specifier: ^0.1.8 + version: 0.1.9 + silent-error: + specifier: ^1.1.1 + version: 1.1.1 + packages: '@ampproject/remapping@2.3.0': @@ -530,14 +556,8 @@ packages: engines: {node: '>=0.1.95'} hasBin: true - '@ember-tooling/blueprint-blueprint@0.2.1': - resolution: {integrity: sha512-eZ5qicL3gfFFbmzLaSiEWPSmoRUJGnqg+dQmU0R81vv+0Ni7W/cS7MXx1l4HpN9B7Yg4M9GgdQTkeJnb6abQug==} - - '@ember-tooling/blueprint-model@0.5.0': - resolution: {integrity: sha512-2zAebSmmzpUO2wt6EyfX5TlcmvB9cTkteuZ3QhPmXLMthUpU5nUifcz3hlYcXPK7WM0HdO9qL4GdGQCoxhzaGg==} - - '@ember/app-blueprint@6.11.0-beta.2': - resolution: {integrity: sha512-TM7R6Uy82L+9fqH5+f26CRZ7voTq+/TEm44labmBIyWPWKtg+3CraWHhzrf6t9g8rKM38vl8ikS+J5380oBsgw==} + '@ember/app-blueprint@6.12.0-alpha.1': + resolution: {integrity: sha512-dn/Ht8X7PMxCi571D/oB/576kZgDt40/hD3jIb1Tx0wM/ZBoh/9wiSVmP44CDM1IqsKMCjE1TGmKt7ph+oZkng==} '@eslint-community/eslint-utils@4.4.1': resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} @@ -5707,21 +5727,7 @@ snapshots: exec-sh: 0.3.6 minimist: 1.2.8 - '@ember-tooling/blueprint-blueprint@0.2.1': {} - - '@ember-tooling/blueprint-model@0.5.0': - dependencies: - chalk: 4.1.2 - diff: 7.0.0 - isbinaryfile: 5.0.4 - lodash: 4.17.21 - promise.hash.helper: 1.0.8 - quick-temp: 0.1.9 - silent-error: 1.1.1 - transitivePeerDependencies: - - supports-color - - '@ember/app-blueprint@6.11.0-beta.2': + '@ember/app-blueprint@6.12.0-alpha.1': dependencies: chalk: 4.1.2 ejs: 3.1.10 diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index d690a13292..78039dea90 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -59,7 +59,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -71,7 +71,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json index 55e8e9a6c2..355c0e4a1c 100644 --- a/tests/fixtures/addon/pnpm/package.json +++ b/tests/fixtures/addon/pnpm/package.json @@ -59,7 +59,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -72,7 +72,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/addon/typescript/package.json b/tests/fixtures/addon/typescript/package.json index 9de8889ccb..e9cddda9c7 100644 --- a/tests/fixtures/addon/typescript/package.json +++ b/tests/fixtures/addon/typescript/package.json @@ -83,7 +83,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -95,7 +95,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "rimraf": "^5.0.10", diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 8e2aa91f0d..9057f4b57a 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -59,7 +59,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -72,7 +72,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 20766c2a6b..0ea4afc39a 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -55,7 +55,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -67,7 +67,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index f128a2e560..e28fb0d14b 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -55,7 +55,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -67,7 +67,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index b5e388971a..a856e84939 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -56,7 +56,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "eslint": "^9.39.2", @@ -67,7 +67,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index f07497b5fd..3706f827e2 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -56,7 +56,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -68,7 +68,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index e7e6362990..8e0e7b5101 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -56,7 +56,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -68,7 +68,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index b4a76d020f..486bf131f8 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -56,7 +56,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -68,7 +68,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index 8702893bec..c1d9f260ce 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -54,7 +54,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -66,7 +66,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 9248e02d15..ce36c898de 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -55,7 +55,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "eslint": "^9.39.2", @@ -66,7 +66,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 64689de45e..557be21ab7 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -55,7 +55,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -67,7 +67,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index e41e65a029..07e54913a0 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -62,7 +62,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -74,7 +74,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index 9e51445964..20d019c044 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -74,7 +74,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -86,7 +86,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index 8ec8509969..bae0284579 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -61,7 +61,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -73,7 +73,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index 8de430d7bd..62b0c38c79 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -73,7 +73,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -85,7 +85,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index f74a4215a0..33c02f4b44 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -55,7 +55,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.12.0-alpha.1", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -67,7 +67,7 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", From 72ed7bbea3f4f523ba10459b1cd7ee0cc882e6a5 Mon Sep 17 00:00:00 2001 From: mansona <594890+mansona@users.noreply.github.com> Date: Mon, 26 Jan 2026 09:42:40 +0000 Subject: [PATCH 03/49] Prepare Alpha Release using 'release-plan' --- .release-plan.json | 46 ++++------------------- CHANGELOG.md | 20 ++++++++++ package.json | 2 +- packages/addon-blueprint/package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- packages/app-blueprint/package.json | 2 +- 6 files changed, 32 insertions(+), 42 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index 38dcb904a4..28ff610025 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -2,8 +2,8 @@ "solution": { "ember-cli": { "impact": "minor", - "oldVersion": "6.11.0-alpha.0", - "newVersion": "6.11.0-alpha.1", + "oldVersion": "6.12.0-alpha.0", + "newVersion": "6.12.0-alpha.1", "tagName": "alpha", "constraints": [ { @@ -18,18 +18,6 @@ "impact": "patch", "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" - }, - { - "impact": "patch", - "reason": "Appears in changelog section :bug: Bug Fix" - }, - { - "impact": "patch", - "reason": "Appears in changelog section :memo: Documentation" - }, { "impact": "patch", "reason": "Appears in changelog section :house: Internal" @@ -39,18 +27,14 @@ }, "@ember-tooling/classic-build-addon-blueprint": { "impact": "minor", - "oldVersion": "6.11.0-alpha.0", - "newVersion": "6.11.0-alpha.1", + "oldVersion": "6.12.0-alpha.0", + "newVersion": "6.12.0-alpha.1", "tagName": "alpha", "constraints": [ { "impact": "minor", "reason": "Appears in changelog section :rocket: Enhancement" }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" - }, { "impact": "patch", "reason": "Appears in changelog section :house: Internal" @@ -60,18 +44,14 @@ }, "@ember-tooling/classic-build-app-blueprint": { "impact": "minor", - "oldVersion": "6.11.0-alpha.0", - "newVersion": "6.11.0-alpha.1", + "oldVersion": "6.12.0-alpha.0", + "newVersion": "6.12.0-alpha.1", "tagName": "alpha", "constraints": [ { "impact": "minor", "reason": "Appears in changelog section :rocket: Enhancement" }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" - }, { "impact": "patch", "reason": "Appears in changelog section :house: Internal" @@ -83,18 +63,8 @@ "oldVersion": "0.3.0" }, "@ember-tooling/blueprint-model": { - "impact": "minor", - "oldVersion": "0.5.0", - "newVersion": "0.6.0", - "tagName": "latest", - "constraints": [ - { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" - } - ], - "pkgJSONPath": "./packages/blueprint-model/package.json" + "oldVersion": "0.6.0" } }, - "description": "## Release (2026-01-08)\n\n* ember-cli 6.11.0-alpha.1 (minor)\n* @ember-tooling/classic-build-addon-blueprint 6.11.0-alpha.1 (minor)\n* @ember-tooling/classic-build-app-blueprint 6.11.0-alpha.1 (minor)\n* @ember-tooling/blueprint-model 0.6.0 (minor)\n\n#### :rocket: Enhancement\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10919](https://github.com/ember-cli/ember-cli/pull/10919) Prepare 6.11-alpha ([@mansona](https://github.com/mansona))\n * [#10917](https://github.com/ember-cli/ember-cli/pull/10917) Prepare 6.10-beta ([@mansona](https://github.com/mansona))\n* `ember-cli`\n * [#10906](https://github.com/ember-cli/ember-cli/pull/10906) Even more dependency updates ([@bertdeblock](https://github.com/bertdeblock))\n * [#10892](https://github.com/ember-cli/ember-cli/pull/10892) More dependency updates ([@bertdeblock](https://github.com/bertdeblock))\n* `ember-cli`, `@ember-tooling/blueprint-model`\n * [#10890](https://github.com/ember-cli/ember-cli/pull/10890) Update various dependencies ([@bertdeblock](https://github.com/bertdeblock))\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-model`\n * [#10887](https://github.com/ember-cli/ember-cli/pull/10887) Update `chalk` dependency to latest ([@bertdeblock](https://github.com/bertdeblock))\n\n#### :bug: Bug Fix\n* `ember-cli`\n * [#10888](https://github.com/ember-cli/ember-cli/pull/10888) Upgrade broccoli ([@kategengler](https://github.com/kategengler))\n * [#10886](https://github.com/ember-cli/ember-cli/pull/10886) Update required Node version to v20.19.0 ([@bertdeblock](https://github.com/bertdeblock))\n * [#10860](https://github.com/ember-cli/ember-cli/pull/10860) [BUGFIX release]: Enter the WatchDetector branch of the build command when EMBROIDER_PREBUILD is present ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :memo: Documentation\n* `ember-cli`\n * [#10874](https://github.com/ember-cli/ember-cli/pull/10874) Update RELEASE.md ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10883](https://github.com/ember-cli/ember-cli/pull/10883) Prepare Beta Release ([@mansona](https://github.com/mansona))\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`\n * [#10891](https://github.com/ember-cli/ember-cli/pull/10891) Update `prettier` + setup ([@bertdeblock](https://github.com/bertdeblock))\n\n#### Committers: 4\n- Bert De Block ([@bertdeblock](https://github.com/bertdeblock))\n- Chris Manson ([@mansona](https://github.com/mansona))\n- Katie Gengler ([@kategengler](https://github.com/kategengler))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n" + "description": "## Release (2026-01-26)\n\n* ember-cli 6.12.0-alpha.1 (minor)\n* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.1 (minor)\n* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.1 (minor)\n\n#### :rocket: Enhancement\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10923](https://github.com/ember-cli/ember-cli/pull/10923) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10930](https://github.com/ember-cli/ember-cli/pull/10930) Prepare 6.12-alpha ([@mansona](https://github.com/mansona))\n * [#10926](https://github.com/ember-cli/ember-cli/pull/10926) Prepare Beta Release ([@mansona](https://github.com/mansona))\n * [#10929](https://github.com/ember-cli/ember-cli/pull/10929) Prepare 6.11-beta ([@mansona](https://github.com/mansona))\n * [#10918](https://github.com/ember-cli/ember-cli/pull/10918) Prepare Stable Release ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 776318e5be..5d6614aa00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # ember-cli Changelog +## Release (2026-01-26) + +* ember-cli 6.12.0-alpha.1 (minor) +* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.1 (minor) +* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.1 (minor) + +#### :rocket: Enhancement +* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint` + * [#10923](https://github.com/ember-cli/ember-cli/pull/10923) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona)) + +#### :house: Internal +* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint` + * [#10930](https://github.com/ember-cli/ember-cli/pull/10930) Prepare 6.12-alpha ([@mansona](https://github.com/mansona)) + * [#10926](https://github.com/ember-cli/ember-cli/pull/10926) Prepare Beta Release ([@mansona](https://github.com/mansona)) + * [#10929](https://github.com/ember-cli/ember-cli/pull/10929) Prepare 6.11-beta ([@mansona](https://github.com/mansona)) + * [#10918](https://github.com/ember-cli/ember-cli/pull/10918) Prepare Stable Release ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + ## Release (2026-01-08) * ember-cli 6.11.0-alpha.1 (minor) diff --git a/package.json b/package.json index 4e9d04d689..e65733632f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.12.0-alpha.0", + "version": "6.12.0-alpha.1", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index 322c30412f..dc433d3f86 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.12.0-alpha.0", + "version": "6.12.0-alpha.1", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index c3f9cd26da..31c2721471 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.12.0-alpha.0", + "ember-cli": "~6.12.0-alpha.1", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index d17d393921..2d44bf4c88 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.12.0-alpha.0", + "version": "6.12.0-alpha.1", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", From 47ed767d70be0ffb18d80cfe72aa0d391b8109de Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 26 Jan 2026 11:50:41 +0000 Subject: [PATCH 04/49] update Release.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit just updating the notes after doing another release 👍 --- RELEASE.md | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 2451ede09c..9629d133dd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -44,12 +44,17 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - make sure to not update the version in the package.json during this step, this will be release-plan's job - make sure to not update the version in the `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step, this will be release-plan's job - make sure to not add the `release-plan` config section to the package.json during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release. + - commit the merge `git commit -am "promote beta to release"` - Update blueprint dependencies to latest. Note: ember-data needs to be updated only in the alpha version from now on, make sure to only update to the release version of what was in the beta. ``` node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data= ``` +- run `pnpm lint:fix` +- update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@latest` +- manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json +- run `pnpm install` to make sure the lock file is up to date - commit this update `git commit -am "update blueprint dependencies to latest"` - push and open a PR targeting `release` with a PR title like `Promote Beta and update all dependencies for 6.4 release` - mark this PR as an `enhancement` if it is a minor release @@ -59,6 +64,11 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - Merge the `Prepare Release` branch when you are ready to release - Check the `Release Stable` GitHub action to make sure the release succeeded +### Finish the `@ember/app-blueprint` release + +- Update the `@ember/app-blueprint` `release` branch to use this new version of ember-cli +- continue the rest of the [@ember/app-blueprint release process](https://github.com/ember-cli/ember-app-blueprint/blob/main/RELEASE.md#release-ember-cli-and-update-that-dependency) until beta and alpha are released + ### Beta release from the `beta` branch - fetch latest from origin `git fetch` @@ -67,17 +77,20 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts - **make sure to not update any .github/workflows/plan-beta-release.yml file** this should still plan a beta release - **make sure to not update any .github/workflows/publish-beta.yml file** this should still publish a beta release - - make sure to not update the version in the package.json during this step, that step comes later + - make sure to not update the version in the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` during this step, that step comes later - make sure to not remove the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step. + - commit the merge `git commit -am "merge release into beta"` - merge master into this new branch too e.g. `git merge origin/master --no-ff` - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts - **make sure to not update the CHANGELOG.md file** in this step. It should match the changelog on `origin/release` at this stage. - make sure not to update the `release-plan` config in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` + - make sure not to update the `@ember-tooling/blueprint-blueprint` versions (i.e. not workspace dependencies) in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` + - make sure not to add any files from `packages/blueprint-blueprint` or `packages/blueprint-model` in this merge (those files only exist on main) - commit the merge `git commit -am "merge master into beta"` - update the versions in package.jsons - update the alpha version in package.json to be a beta i.e. if the incoming merge is `"version": "6.6.0-alpha.3",` update it to `"version": "6.6.0-beta.0",` - - update the alpha version in `packages/addon-blueprint/package.json` to be a beta - - update the alpha version in `packages/app-blueprint/package.json` to be a beta + - update the alpha version in `packages/addon-blueprint/package.json` to be the same beta version + - update the alpha version in `packages/app-blueprint/package.json` to be the same beta version - update the `ember-cli` reference in `packages/app-blueprint/files/package.json` to be the same as the version you just put in the top level package.json - commit the version changes `git commit -am "update versions"` - Update blueprint dependencies to beta @@ -86,8 +99,10 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data= ``` +- run `pnpm lint:fix` - update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@beta` - manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json +- run `pnpm install` to make sure the lock file is up to date - commit this update `git commit -am "update blueprint dependencies to beta"` - push and open a PR targeting `beta` with a PR title like `Prepare 6.5-beta` - mark this PR as an `enchancement` if the next beta is a minor release @@ -104,9 +119,9 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - create a new branch to merge `beta` into `master` e.g. `git checkout --no-track -b merge-beta origin/master` - merge beta into this new branch e.g. `git merge origin/beta --no-ff` - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts - - make sure to not update the version in the package.json during this step, that step comes later + - make sure to not update the version in the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` during this step, that step comes later - make sure to not update the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step. - - make sure not to update the `@ember-tooling/blueprint-blueprint` or `@ember-tooling/blueprint-model` away from being `workspace: *` dependencies. On master they always use the latest and don't use semver. + - make sure not to update the `@ember-tooling/blueprint-blueprint` or `@ember-tooling/blueprint-model` away from being `workspace: *` dependencies in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`. On master they always use the latest and don't use semver. - **make sure to not update any .github/workflows/plan-release.yml file** this should still plan a beta release - **make sure to not update any .github/workflows/publish.yml file** this should still publish a beta release - **make sure to not update the CHANGELOG.md file** in this step. @@ -116,7 +131,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - e.g. if the current alpha is `"version": "6.6.0-alpha.3",` update it to be `"version": "6.7.0-alpha.0",` - manually update the alpha version in `packages/addon-blueprint/package.json` to be the same alpha - manually update the alpha version in `packages/app-blueprint/package.json` to be the same alpha -- commit this change to the version in package.json: `git commit -am "update to the next alpha version"` +- update the `ember-cli` reference in `packages/app-blueprint/files/package.json` to be the same alpha +- commit this change `git commit -am "update to the next alpha version"` - Update blueprint dependencies to alpha ``` @@ -124,8 +140,10 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i ``` - note: ember-data (aka warp-drive) should only ever be updated on master as a separate PR. It is no longer part of the release process +- run `pnpm lint:fix` - update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@alpha` - make sure the app-blueprint still has a `~` after the above step +- run `pnpm install` to make sure the lock file is up to date - commit this update `git commit -am "update blueprint dependencies to alpha"` - push and open a PR targeting `master` with a PR title like `Prepare 6.6-alpha` - mark this PR as an `enchancement` if the next alpha is a minor release From 70c9f0310a5a33b3d8be20f581e2a1dccd5de5cc Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 26 Jan 2026 11:54:32 +0000 Subject: [PATCH 05/49] don't run CI on markdown only change --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 521c32c4df..d800afcc0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,11 @@ on: - next - "v*" - "lts-*" + paths-ignore: + - "**.md" pull_request: + paths-ignore: + - "**.md" workflow_dispatch: merge_group: schedule: From 89acb151bf0e51b1548a3dbbeaedbe506fe4fc77 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Fri, 30 Jan 2026 14:34:04 -0500 Subject: [PATCH 06/49] Remove tracked-built-ins (it comes built in with ember-source 6.8+) --- packages/app-blueprint/files/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 31c2721471..2ab8cc018e 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -92,8 +92,7 @@ "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", - "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0<% if (typescript) { %>", + "stylelint-config-standard": "^36.0.1<% if (typescript) { %>", "typescript": "^5.9.3", "typescript-eslint": "^8.53.1<% } %>", "webpack": "^5.104.1" From b67cb6f0ba51d6a087db4dca2e07f7bd4e7d7c35 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Fri, 30 Jan 2026 14:37:09 -0500 Subject: [PATCH 07/49] Update fixtures --- packages/addon-blueprint/index.js | 4 ---- tests/fixtures/app/defaults/package.json | 1 - tests/fixtures/app/embroider-no-ember-data/package.json | 1 - tests/fixtures/app/embroider-no-welcome/package.json | 1 - tests/fixtures/app/embroider-pnpm/package.json | 1 - tests/fixtures/app/embroider-yarn/package.json | 1 - tests/fixtures/app/embroider/package.json | 1 - tests/fixtures/app/no-ember-data/package.json | 1 - tests/fixtures/app/npm/package.json | 1 - tests/fixtures/app/pnpm/package.json | 1 - .../app/typescript-embroider-no-ember-data/package.json | 1 - tests/fixtures/app/typescript-embroider/package.json | 1 - tests/fixtures/app/typescript-no-ember-data/package.json | 1 - tests/fixtures/app/typescript/package.json | 1 - .../app/with-blueprint-override-lint-fail/package.json | 3 +-- tests/fixtures/app/yarn/package.json | 1 - 16 files changed, 1 insertion(+), 20 deletions(-) diff --git a/packages/addon-blueprint/index.js b/packages/addon-blueprint/index.js index e6fea7bc89..ebb33fec64 100644 --- a/packages/addon-blueprint/index.js +++ b/packages/addon-blueprint/index.js @@ -90,10 +90,6 @@ module.exports = { // @see https://github.com/emberjs/rfcs/blob/master/text/0811-element-modifiers.md#detailed-design delete contents.devDependencies['ember-modifier']; - // Per RFC #812, addons should not have this dependency. - // @see https://github.com/emberjs/rfcs/blob/master/text/0812-tracked-built-ins.md#detailed-design - delete contents.devDependencies['tracked-built-ins']; - // 100% of addons don't need ember-cli-app-version, make it opt-in instead delete contents.devDependencies['ember-cli-app-version']; diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 0ea4afc39a..3c9ad0a3f6 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index e28fb0d14b..592716d166 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index a856e84939..d841d6eab5 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index 3706f827e2..cbd2a9f610 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -73,7 +73,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index 8e0e7b5101..4358b6c83b 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -73,7 +73,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 486bf131f8..4f18df1698 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -73,7 +73,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index c1d9f260ce..87ff460a0c 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -71,7 +71,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index ce36c898de..0aaef6c732 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -71,7 +71,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 557be21ab7..0b57dee862 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index 07e54913a0..52fa252c6d 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -79,7 +79,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.53.1", "webpack": "^5.104.1" diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index 20d019c044..6fbc0543b9 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -91,7 +91,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.53.1", "webpack": "^5.104.1" diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index bae0284579..6b571e6962 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -78,7 +78,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.53.1", "webpack": "^5.104.1" diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index 62b0c38c79..f7a94393d6 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -90,7 +90,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.53.1", "webpack": "^5.104.1" diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json index ed74176c60..593d8a188c 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -66,8 +66,7 @@ "qunit-dom": "^1.6.0", "stylelint": "^16.10.0", "stylelint-config-standard": "^36.0.1", - "stylelint-prettier": "^5.0.2", - "tracked-built-ins": "^3.1.0" + "stylelint-prettier": "^5.0.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index 33c02f4b44..8719dab990 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.104.1" }, "engines": { From 2c3fe9c25f5fcb92d76bb86231c522f96f295d6c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Feb 2026 18:51:59 +0000 Subject: [PATCH 08/49] Initial plan From 0faa4d4f3d22d18876bc8a4e1f2f65cbab0d39c6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Feb 2026 18:56:48 +0000 Subject: [PATCH 09/49] Add warpDrive support to app-blueprint with tilde dependencies and proper newline spacing Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- .../app-blueprint/files/_js_eslint.config.mjs | 6 +++-- .../app-blueprint/files/_ts_eslint.config.mjs | 7 +++--- packages/app-blueprint/files/app/app.ts | 2 +- .../app-blueprint/files/app/services/store.ts | 17 +++++++++++++ .../app-blueprint/files/ember-cli-build.js | 25 +++++++++++-------- packages/app-blueprint/files/package.json | 10 ++++++-- .../app-blueprint/files/tests/test-helper.ts | 3 ++- packages/app-blueprint/index.js | 6 +++++ 8 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 packages/app-blueprint/files/app/services/store.ts diff --git a/packages/app-blueprint/files/_js_eslint.config.mjs b/packages/app-blueprint/files/_js_eslint.config.mjs index a29e5cd3bd..4e1cb4db64 100644 --- a/packages/app-blueprint/files/_js_eslint.config.mjs +++ b/packages/app-blueprint/files/_js_eslint.config.mjs @@ -16,7 +16,8 @@ import globals from 'globals'; import js from '@eslint/js'; import ember from 'eslint-plugin-ember/recommended'; -import eslintConfigPrettier from 'eslint-config-prettier'; +<% if (warpDrive) { %>import WarpDrive from 'eslint-plugin-warp-drive/recommended'; +<% } %>import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; import n from 'eslint-plugin-n'; @@ -38,7 +39,8 @@ export default [ eslintConfigPrettier, ember.configs.base, ember.configs.gjs, - /** + <% if (warpDrive) { %>...WarpDrive, + <% } %>/** * Ignores must be in their own object * https://eslint.org/docs/latest/use/configure/ignore */ diff --git a/packages/app-blueprint/files/_ts_eslint.config.mjs b/packages/app-blueprint/files/_ts_eslint.config.mjs index 5232ee68dd..9dfb3cedca 100644 --- a/packages/app-blueprint/files/_ts_eslint.config.mjs +++ b/packages/app-blueprint/files/_ts_eslint.config.mjs @@ -20,8 +20,8 @@ import js from '@eslint/js'; import ts from 'typescript-eslint'; import ember from 'eslint-plugin-ember/recommended'; - -import eslintConfigPrettier from 'eslint-config-prettier'; +<% if (warpDrive) { %>import WarpDrive from 'eslint-plugin-warp-drive/recommended'; +<% } %>import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; import n from 'eslint-plugin-n'; @@ -54,7 +54,8 @@ export default ts.config( ember.configs.base, ember.configs.gjs, ember.configs.gts, - eslintConfigPrettier, + <% if (warpDrive) { %>...WarpDrive, + <% } %>eslintConfigPrettier, /** * Ignores must be in their own object * https://eslint.org/docs/latest/use/configure/ignore diff --git a/packages/app-blueprint/files/app/app.ts b/packages/app-blueprint/files/app/app.ts index ac9033799f..dea884f275 100644 --- a/packages/app-blueprint/files/app/app.ts +++ b/packages/app-blueprint/files/app/app.ts @@ -1,4 +1,4 @@ -<% if (emberData) { %>import '@warp-drive/ember/install'; +<% if (warpDrive) { %>import '@warp-drive/ember/install'; <% } %>import Application from '@ember/application'; import Resolver from 'ember-resolver'; import loadInitializers from 'ember-load-initializers'; diff --git a/packages/app-blueprint/files/app/services/store.ts b/packages/app-blueprint/files/app/services/store.ts new file mode 100644 index 0000000000..fae48c6060 --- /dev/null +++ b/packages/app-blueprint/files/app/services/store.ts @@ -0,0 +1,17 @@ +import { useLegacyStore } from '@warp-drive/legacy'; +import { JSONAPICache } from '@warp-drive/json-api'; + +const Store = useLegacyStore({ + linksMode: false, + cache: JSONAPICache, + handlers: [ + // -- your handlers here + ], + schemas: [ + // -- your schemas here + ], +}); + +type Store = InstanceType; + +export default Store; diff --git a/packages/app-blueprint/files/ember-cli-build.js b/packages/app-blueprint/files/ember-cli-build.js index 4680730da9..b6afacfe80 100644 --- a/packages/app-blueprint/files/ember-cli-build.js +++ b/packages/app-blueprint/files/ember-cli-build.js @@ -1,22 +1,25 @@ 'use strict'; const EmberApp = require('ember-cli/lib/broccoli/ember-app'); - +<% if (warpDrive) {%>const { setConfig } = require('@warp-drive/core/build-config'); +<% } %> module.exports = function (defaults) { const app = new EmberApp(defaults, { - <% if (emberData) {%>emberData: { - deprecations: { - // New projects can safely leave this deprecation disabled. - // If upgrading, to opt-into the deprecated behavior, set this to true and then follow: - // https://deprecations.emberjs.com/id/ember-data-deprecate-store-extends-ember-object - // before upgrading to Ember Data 6.0 - DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false, - }, - }, - <% } %><% if (typescript) {%>'ember-cli-babel': { enableTypeScriptTransform: true }, + <% if (typescript) {%>'ember-cli-babel': { enableTypeScriptTransform: true }, <% } %>// Add options here }); +<% if (warpDrive) {%> + setConfig(app, __dirname, { + // this should be the most recent . version for + // which all deprecations have been fully resolved + // and should be updated when that changes + compatWith: '5.8', + deprecations: { + // ... list individual deprecations that have been resolved here + }, + }); +<% } %> <% if (embroider) { %>const { Webpack } = require('@embroider/webpack'); return require('@embroider/compat').compatBuild(app, Webpack, { diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 2ab8cc018e..a05ca1741b 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -56,7 +56,12 @@ "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9<% if (emberData) {%>", - "@warp-drive/core-types": "~5.7.0<% }} %>", + "@warp-drive/core-types": "~5.7.0<% }} %><% if (warpDrive) { %>", + "@warp-drive/core": "~5.8.0", + "@warp-drive/ember": "~5.8.0", + "@warp-drive/json-api": "~5.8.0", + "@warp-drive/legacy": "~5.8.0", + "@warp-drive/utilities": "~5.8.0<% } %>", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", @@ -84,7 +89,8 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.5<% if (warpDrive) { %>", + "eslint-plugin-warp-drive": "^5.8.0<% } %>", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", diff --git a/packages/app-blueprint/files/tests/test-helper.ts b/packages/app-blueprint/files/tests/test-helper.ts index f5e1c9916e..4bc7e42f57 100644 --- a/packages/app-blueprint/files/tests/test-helper.ts +++ b/packages/app-blueprint/files/tests/test-helper.ts @@ -1,4 +1,5 @@ -import Application from '<%= modulePrefix %>/app'; +<% if (warpDrive) { %>import '@warp-drive/ember/install'; +<% } %>import Application from '<%= modulePrefix %>/app'; import config from '<%= modulePrefix %>/config/environment'; import * as QUnit from 'qunit'; import { setApplication } from '@ember/test-helpers'; diff --git a/packages/app-blueprint/index.js b/packages/app-blueprint/index.js index fdbce6cc9c..3847a52967 100644 --- a/packages/app-blueprint/index.js +++ b/packages/app-blueprint/index.js @@ -80,6 +80,7 @@ module.exports = { embroider, lang: options.lang, emberData: options.emberData, + warpDrive: options.warpDrive ?? options.emberData, ciProvider: options.ciProvider, typescript: options.typescript, strict: options.strict, @@ -109,6 +110,11 @@ module.exports = { files = files.filter((file) => !file.includes('ember-data/')); } + const warpDrive = options.warpDrive ?? options.emberData; + if (!warpDrive) { + files = files.filter((file) => !file.includes('services/store.ts')); + } + if (options.strict) { files = files.filter((file) => !file.endsWith('.hbs')); } else { From 829e9565075aa787d2bb911fd9132ea8a0bd5b7e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Feb 2026 18:58:29 +0000 Subject: [PATCH 10/49] Remove duplicate warpDrive assignment in index.js Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/app-blueprint/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/app-blueprint/index.js b/packages/app-blueprint/index.js index 3847a52967..231ba326f4 100644 --- a/packages/app-blueprint/index.js +++ b/packages/app-blueprint/index.js @@ -110,8 +110,7 @@ module.exports = { files = files.filter((file) => !file.includes('ember-data/')); } - const warpDrive = options.warpDrive ?? options.emberData; - if (!warpDrive) { + if (!options.warpDrive && !options.emberData) { files = files.filter((file) => !file.includes('services/store.ts')); } From a472c2b07fec96ed5a1b00d86ba4351c792e373d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Feb 2026 19:04:55 +0000 Subject: [PATCH 11/49] Remove @warp-drive/core-types from package.json Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/app-blueprint/files/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index a05ca1741b..208bfc14cc 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -55,8 +55,7 @@ "@glint/template": "^1.7.3", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", - "@types/rsvp": "^4.0.9<% if (emberData) {%>", - "@warp-drive/core-types": "~5.7.0<% }} %><% if (warpDrive) { %>", + "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>", "@warp-drive/core": "~5.8.0", "@warp-drive/ember": "~5.8.0", "@warp-drive/json-api": "~5.8.0", From 7d011a9c73f8dac2df3cbc1a83899653c520e4c4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 13:23:05 +0000 Subject: [PATCH 12/49] Fix template syntax in package.json for warpDrive condition Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/app-blueprint/files/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 208bfc14cc..670ddad3c5 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -55,8 +55,8 @@ "@glint/template": "^1.7.3", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", - "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>", - "@warp-drive/core": "~5.8.0", + "@types/rsvp": "^4.0.9<% } %>", + <% if (warpDrive) { %>"@warp-drive/core": "~5.8.0", "@warp-drive/ember": "~5.8.0", "@warp-drive/json-api": "~5.8.0", "@warp-drive/legacy": "~5.8.0", From 3101b16eac3320144cdbd75cc9744c3234455452 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 13:28:54 +0000 Subject: [PATCH 13/49] Fix template syntax to match pattern in package.json Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/app-blueprint/files/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 670ddad3c5..208bfc14cc 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -55,8 +55,8 @@ "@glint/template": "^1.7.3", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", - "@types/rsvp": "^4.0.9<% } %>", - <% if (warpDrive) { %>"@warp-drive/core": "~5.8.0", + "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>", + "@warp-drive/core": "~5.8.0", "@warp-drive/ember": "~5.8.0", "@warp-drive/json-api": "~5.8.0", "@warp-drive/legacy": "~5.8.0", From 875efcf97d30f8af3152923424ca19d5fe25e5bf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 14:00:50 +0000 Subject: [PATCH 14/49] Fix warpDrive default value to prevent undefined errors in templates Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/app-blueprint/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-blueprint/index.js b/packages/app-blueprint/index.js index 231ba326f4..0cf9ff5371 100644 --- a/packages/app-blueprint/index.js +++ b/packages/app-blueprint/index.js @@ -80,7 +80,7 @@ module.exports = { embroider, lang: options.lang, emberData: options.emberData, - warpDrive: options.warpDrive ?? options.emberData, + warpDrive: options.warpDrive ?? options.emberData ?? false, ciProvider: options.ciProvider, typescript: options.typescript, strict: options.strict, From d606142925852ffcba14e2f8d5d4ad7ed0760e85 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:24:20 +0000 Subject: [PATCH 15/49] Add warpDrive default to addon-blueprint locals Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/addon-blueprint/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addon-blueprint/index.js b/packages/addon-blueprint/index.js index ebb33fec64..167f159192 100644 --- a/packages/addon-blueprint/index.js +++ b/packages/addon-blueprint/index.js @@ -244,6 +244,7 @@ module.exports = { embroider: false, lang: options.lang, emberData: options.emberData, + warpDrive: options.warpDrive ?? options.emberData ?? false, ciProvider: options.ciProvider, typescript: options.typescript, strict: options.strict, From ae9c2160207f1766fd55ec66b891c331629cbeb6 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 5 Feb 2026 12:20:01 +0000 Subject: [PATCH 16/49] Revert "Update `isbinaryfile`" This reverts commit 29a14672729a5070918076cd278a22d930175770. --- package.json | 2 +- packages/blueprint-model/utilities/file-info.js | 6 +++--- pnpm-lock.yaml | 10 ++-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index e65733632f..8646576871 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "inquirer": "^13.1.0", "is-git-url": "^1.0.0", "is-language-code": "^5.1.0", - "isbinaryfile": "^6.0.0", + "isbinaryfile": "^5.0.4", "lodash": "^4.17.21", "markdown-it": "^14.1.0", "markdown-it-terminal": "^0.4.0", diff --git a/packages/blueprint-model/utilities/file-info.js b/packages/blueprint-model/utilities/file-info.js index 87153adb79..8a83239088 100644 --- a/packages/blueprint-model/utilities/file-info.js +++ b/packages/blueprint-model/utilities/file-info.js @@ -6,7 +6,7 @@ const { default: chalk } = require('chalk'); const EditFileDiff = require('./edit-file-diff'); const EOL = require('os').EOL; const rxEOL = new RegExp(EOL, 'g'); -const { isBinaryFileSync } = require('isbinaryfile'); +const isBinaryFile = require('isbinaryfile').isBinaryFileSync; const hash = require('promise.hash.helper'); const canEdit = require('./open-editor').canEdit; const processTemplate = require('./process-template'); @@ -58,7 +58,7 @@ class FileInfo { /* ignore */ } - let canDiff = !isBinaryFileSync(this.inputPath) && (!outputPathIsFile || !isBinaryFileSync(this.outputPath)); + let canDiff = !isBinaryFile(this.inputPath) && (!outputPathIsFile || !isBinaryFile(this.outputPath)); if (canDiff) { promptOptions.choices.push({ key: 'd', name: 'Diff', value: 'diff' }); @@ -106,7 +106,7 @@ class FileInfo { return readFile(path).then((content) => lstat(path).then((fileStat) => { - if (isBinaryFileSync(content, fileStat.size)) { + if (isBinaryFile(content, fileStat.size)) { return content; } else { try { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3b264e0e7b..a6b76fb6b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -180,8 +180,8 @@ importers: specifier: ^5.1.0 version: 5.1.0 isbinaryfile: - specifier: ^6.0.0 - version: 6.0.0 + specifier: ^5.0.4 + version: 5.0.4 lodash: specifier: ^4.17.21 version: 4.17.21 @@ -3343,10 +3343,6 @@ packages: resolution: {integrity: sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==} engines: {node: '>= 18.0.0'} - isbinaryfile@6.0.0: - resolution: {integrity: sha512-2FN2B8MAqKv6d5TaKsLvMrwMcghxwHTpcKy0L5mhNbRqjNqo2++SpCqN6eG1lCC1GmTQgvrYJYXv2+Chvyevag==} - engines: {node: '>= 24.0.0'} - isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} @@ -8920,8 +8916,6 @@ snapshots: isbinaryfile@5.0.4: {} - isbinaryfile@6.0.0: {} - isexe@2.0.0: {} isexe@3.1.1: {} From 87b56d6b56c194c281204a355f9f76687a503c2a Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 5 Feb 2026 12:21:50 +0000 Subject: [PATCH 17/49] remove unused isbinaryfile from ember-cli package --- package.json | 1 - pnpm-lock.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/package.json b/package.json index 8646576871..0cb25c2beb 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,6 @@ "inquirer": "^13.1.0", "is-git-url": "^1.0.0", "is-language-code": "^5.1.0", - "isbinaryfile": "^5.0.4", "lodash": "^4.17.21", "markdown-it": "^14.1.0", "markdown-it-terminal": "^0.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a6b76fb6b0..a005ed2d03 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -179,9 +179,6 @@ importers: is-language-code: specifier: ^5.1.0 version: 5.1.0 - isbinaryfile: - specifier: ^5.0.4 - version: 5.0.4 lodash: specifier: ^4.17.21 version: 4.17.21 From 2eb4cf91332c48a9eb12517db1acef51e918e4df Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Thu, 5 Feb 2026 13:23:57 +0000 Subject: [PATCH 18/49] Prepare Alpha Release using 'release-plan' --- .release-plan.json | 54 ++++++++++++++--------- CHANGELOG.md | 17 +++++++ package.json | 2 +- packages/addon-blueprint/package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- packages/app-blueprint/package.json | 2 +- packages/blueprint-model/package.json | 2 +- 7 files changed, 54 insertions(+), 27 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index 28ff610025..713ec062f4 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -1,60 +1,60 @@ { "solution": { "ember-cli": { - "impact": "minor", - "oldVersion": "6.12.0-alpha.0", - "newVersion": "6.12.0-alpha.1", + "impact": "patch", + "oldVersion": "6.12.0-alpha.1", + "newVersion": "6.12.0-alpha.2", "tagName": "alpha", "constraints": [ { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" + "impact": "patch", + "reason": "Appears in changelog section :bug: Bug Fix" }, { "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-addon-blueprint" + "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" }, { "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-addon-blueprint" }, { "impact": "patch", - "reason": "Appears in changelog section :house: Internal" + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" } ], "pkgJSONPath": "./package.json" }, "@ember-tooling/classic-build-addon-blueprint": { - "impact": "minor", - "oldVersion": "6.12.0-alpha.0", - "newVersion": "6.12.0-alpha.1", + "impact": "patch", + "oldVersion": "6.12.0-alpha.1", + "newVersion": "6.12.0-alpha.2", "tagName": "alpha", "constraints": [ { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" + "impact": "patch", + "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" }, { "impact": "patch", - "reason": "Appears in changelog section :house: Internal" + "reason": "Appears in changelog section :bug: Bug Fix" } ], "pkgJSONPath": "./packages/addon-blueprint/package.json" }, "@ember-tooling/classic-build-app-blueprint": { - "impact": "minor", - "oldVersion": "6.12.0-alpha.0", - "newVersion": "6.12.0-alpha.1", + "impact": "patch", + "oldVersion": "6.12.0-alpha.1", + "newVersion": "6.12.0-alpha.2", "tagName": "alpha", "constraints": [ { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" + "impact": "patch", + "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" }, { "impact": "patch", - "reason": "Appears in changelog section :house: Internal" + "reason": "Appears in changelog section :bug: Bug Fix" } ], "pkgJSONPath": "./packages/app-blueprint/package.json" @@ -63,8 +63,18 @@ "oldVersion": "0.3.0" }, "@ember-tooling/blueprint-model": { - "oldVersion": "0.6.0" + "impact": "patch", + "oldVersion": "0.6.0", + "newVersion": "0.6.1", + "tagName": "latest", + "constraints": [ + { + "impact": "patch", + "reason": "Appears in changelog section :bug: Bug Fix" + } + ], + "pkgJSONPath": "./packages/blueprint-model/package.json" } }, - "description": "## Release (2026-01-26)\n\n* ember-cli 6.12.0-alpha.1 (minor)\n* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.1 (minor)\n* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.1 (minor)\n\n#### :rocket: Enhancement\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10923](https://github.com/ember-cli/ember-cli/pull/10923) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10930](https://github.com/ember-cli/ember-cli/pull/10930) Prepare 6.12-alpha ([@mansona](https://github.com/mansona))\n * [#10926](https://github.com/ember-cli/ember-cli/pull/10926) Prepare Beta Release ([@mansona](https://github.com/mansona))\n * [#10929](https://github.com/ember-cli/ember-cli/pull/10929) Prepare 6.11-beta ([@mansona](https://github.com/mansona))\n * [#10918](https://github.com/ember-cli/ember-cli/pull/10918) Prepare Stable Release ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" + "description": "## Release (2026-02-05)\n\n* ember-cli 6.12.0-alpha.2 (patch)\n* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.2 (patch)\n* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.2 (patch)\n* @ember-tooling/blueprint-model 0.6.1 (patch)\n\n#### :bug: Bug Fix\n* `ember-cli`, `@ember-tooling/blueprint-model`\n * [#10941](https://github.com/ember-cli/ember-cli/pull/10941) Downgrade isbinaryfile ([@mansona](https://github.com/mansona))\n* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli`\n * [#10932](https://github.com/ember-cli/ember-cli/pull/10932) Remove tracked-built-ins (it comes built in with ember-source 6.8+) ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 2\n- Chris Manson ([@mansona](https://github.com/mansona))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d6614aa00..b5edc1a087 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # ember-cli Changelog +## Release (2026-02-05) + +* ember-cli 6.12.0-alpha.2 (patch) +* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.2 (patch) +* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.2 (patch) +* @ember-tooling/blueprint-model 0.6.1 (patch) + +#### :bug: Bug Fix +* `ember-cli`, `@ember-tooling/blueprint-model` + * [#10941](https://github.com/ember-cli/ember-cli/pull/10941) Downgrade isbinaryfile ([@mansona](https://github.com/mansona)) +* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli` + * [#10932](https://github.com/ember-cli/ember-cli/pull/10932) Remove tracked-built-ins (it comes built in with ember-source 6.8+) ([@NullVoxPopuli](https://github.com/NullVoxPopuli)) + +#### Committers: 2 +- Chris Manson ([@mansona](https://github.com/mansona)) +- [@NullVoxPopuli](https://github.com/NullVoxPopuli) + ## Release (2026-01-26) * ember-cli 6.12.0-alpha.1 (minor) diff --git a/package.json b/package.json index 0cb25c2beb..53fd2e2534 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.12.0-alpha.1", + "version": "6.12.0-alpha.2", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index dc433d3f86..3c1f5e617d 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.12.0-alpha.1", + "version": "6.12.0-alpha.2", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 2ab8cc018e..71edc34ab6 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.12.0-alpha.1", + "ember-cli": "~6.12.0-alpha.2", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index 2d44bf4c88..1383493947 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.12.0-alpha.1", + "version": "6.12.0-alpha.2", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/blueprint-model/package.json b/packages/blueprint-model/package.json index a8d0c441c9..9965ed5138 100644 --- a/packages/blueprint-model/package.json +++ b/packages/blueprint-model/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/blueprint-model", - "version": "0.6.0", + "version": "0.6.1", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", From 914927d1bea7f3c24f09d0a906958c667badc493 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 06:38:23 +0000 Subject: [PATCH 19/49] Fix blank line spacing in eslint config templates when warpDrive is disabled Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/app-blueprint/files/_js_eslint.config.mjs | 6 ++++-- packages/app-blueprint/files/_ts_eslint.config.mjs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/app-blueprint/files/_js_eslint.config.mjs b/packages/app-blueprint/files/_js_eslint.config.mjs index 4e1cb4db64..1b375559c8 100644 --- a/packages/app-blueprint/files/_js_eslint.config.mjs +++ b/packages/app-blueprint/files/_js_eslint.config.mjs @@ -16,8 +16,10 @@ import globals from 'globals'; import js from '@eslint/js'; import ember from 'eslint-plugin-ember/recommended'; -<% if (warpDrive) { %>import WarpDrive from 'eslint-plugin-warp-drive/recommended'; -<% } %>import eslintConfigPrettier from 'eslint-config-prettier'; +<% if (warpDrive) { %> +import WarpDrive from 'eslint-plugin-warp-drive/recommended'; +<% } %> +import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; import n from 'eslint-plugin-n'; diff --git a/packages/app-blueprint/files/_ts_eslint.config.mjs b/packages/app-blueprint/files/_ts_eslint.config.mjs index 9dfb3cedca..be84ec6605 100644 --- a/packages/app-blueprint/files/_ts_eslint.config.mjs +++ b/packages/app-blueprint/files/_ts_eslint.config.mjs @@ -20,8 +20,10 @@ import js from '@eslint/js'; import ts from 'typescript-eslint'; import ember from 'eslint-plugin-ember/recommended'; -<% if (warpDrive) { %>import WarpDrive from 'eslint-plugin-warp-drive/recommended'; -<% } %>import eslintConfigPrettier from 'eslint-config-prettier'; +<% if (warpDrive) { %> +import WarpDrive from 'eslint-plugin-warp-drive/recommended'; +<% } %> +import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; import n from 'eslint-plugin-n'; From 9f5da8f7ff0a6d1d53476bfe166a50cb41406e82 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 13:50:45 +0000 Subject: [PATCH 20/49] Fix eslint config template to not add extra blank lines when warpDrive is disabled Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/app-blueprint/files/_js_eslint.config.mjs | 6 ++---- packages/app-blueprint/files/_ts_eslint.config.mjs | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/app-blueprint/files/_js_eslint.config.mjs b/packages/app-blueprint/files/_js_eslint.config.mjs index 1b375559c8..e4c0229f9a 100644 --- a/packages/app-blueprint/files/_js_eslint.config.mjs +++ b/packages/app-blueprint/files/_js_eslint.config.mjs @@ -15,10 +15,8 @@ import globals from 'globals'; import js from '@eslint/js'; -import ember from 'eslint-plugin-ember/recommended'; -<% if (warpDrive) { %> -import WarpDrive from 'eslint-plugin-warp-drive/recommended'; -<% } %> +import ember from 'eslint-plugin-ember/recommended';<% if (warpDrive) { %> +import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %> import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; import n from 'eslint-plugin-n'; diff --git a/packages/app-blueprint/files/_ts_eslint.config.mjs b/packages/app-blueprint/files/_ts_eslint.config.mjs index be84ec6605..c15c1de856 100644 --- a/packages/app-blueprint/files/_ts_eslint.config.mjs +++ b/packages/app-blueprint/files/_ts_eslint.config.mjs @@ -19,10 +19,8 @@ import js from '@eslint/js'; import ts from 'typescript-eslint'; -import ember from 'eslint-plugin-ember/recommended'; -<% if (warpDrive) { %> -import WarpDrive from 'eslint-plugin-warp-drive/recommended'; -<% } %> +import ember from 'eslint-plugin-ember/recommended';<% if (warpDrive) { %> +import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %> import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; import n from 'eslint-plugin-n'; From 90cb9fd0be187ee7e2b166d0ab5e98987b448da7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 7 Feb 2026 14:36:14 +0000 Subject: [PATCH 21/49] Add blank line after warpDrive conditional in TypeScript eslint template Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> --- packages/app-blueprint/files/_ts_eslint.config.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/app-blueprint/files/_ts_eslint.config.mjs b/packages/app-blueprint/files/_ts_eslint.config.mjs index c15c1de856..31dd559784 100644 --- a/packages/app-blueprint/files/_ts_eslint.config.mjs +++ b/packages/app-blueprint/files/_ts_eslint.config.mjs @@ -21,6 +21,7 @@ import ts from 'typescript-eslint'; import ember from 'eslint-plugin-ember/recommended';<% if (warpDrive) { %> import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %> + import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; import n from 'eslint-plugin-n'; From 07f39d678eb303d55a2e185b3170c18a39bf9baa Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 7 Feb 2026 16:26:19 +0000 Subject: [PATCH 22/49] update release-plan for OIDC --- .github/workflows/plan-alpha-release.yml | 65 +++++-------------- .github/workflows/plan-beta-release.yml | 65 +++++-------------- .github/workflows/plan-stable-release.yml | 65 +++++-------------- .github/workflows/publish-beta.yml | 42 ------------ .github/workflows/publish-stable.yml | 42 ------------ .../{publish-alpha.yml => publish.yml} | 8 +-- 6 files changed, 48 insertions(+), 239 deletions(-) delete mode 100644 .github/workflows/publish-beta.yml delete mode 100644 .github/workflows/publish-stable.yml rename .github/workflows/{publish-alpha.yml => publish.yml} (79%) diff --git a/.github/workflows/plan-alpha-release.yml b/.github/workflows/plan-alpha-release.yml index d3f2aefaff..124d87fea1 100644 --- a/.github/workflows/plan-alpha-release.yml +++ b/.github/workflows/plan-alpha-release.yml @@ -9,78 +9,41 @@ on: types: - labeled - unlabeled - branches: - - master concurrency: group: plan-release # only the latest one of these should ever be running cancel-in-progress: true jobs: - is-this-a-release: - name: "Is this a release?" + should-run-release-plan-prepare: + name: Should we run release-plan prepare? runs-on: ubuntu-latest outputs: - command: ${{ steps.check-release.outputs.command }} - + should-prepare: ${{ steps.should-prepare.outputs.should-prepare }} steps: - - uses: actions/checkout@v6 + - uses: release-plan/actions/should-prepare-release@v1 with: - fetch-depth: 2 ref: "master" - # This will only cause the `is-this-a-release` job to have a "command" of `release` - # when the .release-plan.json file was changed on the last commit. - - id: check-release - run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT + id: should-prepare create-prepare-release-pr: name: Create Prepare Release PR runs-on: ubuntu-latest timeout-minutes: 5 - needs: is-this-a-release + needs: should-run-release-plan-prepare permissions: contents: write issues: read pull-requests: write - # only run on push event or workflow dispatch if plan wasn't updated (don't create a release plan when we're releasing) - # only run on labeled event if the PR has already been merged - if: ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && needs.is-this-a-release.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true) - + if: needs.should-run-release-plan-prepare.outputs.should-prepare == 'true' steps: - - uses: actions/checkout@v6 - # We need to download lots of history so that - # github-changelog can discover what's changed since the last release + - uses: release-plan/actions/prepare@v1 + name: Run release-plan prepare with: - fetch-depth: 0 ref: "master" - - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: pnpm - - run: pnpm install --frozen-lockfile - - name: "Generate Explanation and Prep Changelogs" - id: explanation - run: | - set +e - pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2) - - if [ $? -ne 0 ]; then - release_plan_output=$(cat release-plan-stderr.txt) - else - release_plan_output=$(jq .description .release-plan.json -r) - rm release-plan-stderr.txt - - if [ $(jq '.solution | length' .release-plan.json) -eq 1 ]; then - new_version=$(jq -r '.solution[].newVersion' .release-plan.json) - echo "new_version=v$new_version" >> $GITHUB_OUTPUT - fi - fi - echo 'text<> $GITHUB_OUTPUT - echo "$release_plan_output" >> $GITHUB_OUTPUT - echo 'EOF' >> $GITHUB_OUTPUT env: GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} + id: explanation # this is needed because our fixtures are highly dependent on the exact version of ember-cli in the monorepo # and release-plan updates the version during the plan phase @@ -90,12 +53,14 @@ jobs: run: | sed -i 's/"ember-cli".*/"ember-cli": "~'$(jq -r .version package.json)'",/' packages/app-blueprint/files/package.json - - uses: peter-evans/create-pull-request@v7 + - uses: peter-evans/create-pull-request@v8 + name: Create Prepare Release PR with: - commit-message: "Prepare Alpha Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'" + commit-message: "Prepare Alpha Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'" labels: "internal" + sign-commits: true branch: releaseplan-preview - title: Prepare Alpha Release ${{ steps.explanation.outputs.new_version }} + title: Prepare Alpha Release ${{ steps.explanation.outputs.new-version }} # this doesn't use secrets.GITHUB_TOKEN because we want CI to run on the PR that it opens. # See: https://docs.github.com/en/actions/how-tos/security-for-github-actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow token: ${{ secrets.RELEASE_PLAN_GH_PAT }} diff --git a/.github/workflows/plan-beta-release.yml b/.github/workflows/plan-beta-release.yml index bbdf3becd5..9bf1f450df 100644 --- a/.github/workflows/plan-beta-release.yml +++ b/.github/workflows/plan-beta-release.yml @@ -8,78 +8,41 @@ on: types: - labeled - unlabeled - branches: - - beta concurrency: group: plan-release-beta # only the latest one of these should ever be running cancel-in-progress: true jobs: - is-this-a-release: - name: "Is this a release?" + should-run-release-plan-prepare: + name: Should we run release-plan prepare? runs-on: ubuntu-latest outputs: - command: ${{ steps.check-release.outputs.command }} - + should-prepare: ${{ steps.should-prepare.outputs.should-prepare }} steps: - - uses: actions/checkout@v4 + - uses: release-plan/actions/should-prepare-release@v1 with: - fetch-depth: 2 ref: "beta" - # This will only cause the `is-this-a-release` job to have a "command" of `release` - # when the .release-plan.json file was changed on the last commit. - - id: check-release - run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT + id: should-prepare create-prepare-release-pr: name: Create Prepare Release PR runs-on: ubuntu-latest timeout-minutes: 5 - needs: is-this-a-release + needs: should-run-release-plan-prepare permissions: contents: write issues: read pull-requests: write - # only run on push event or workflow dispatch if plan wasn't updated (don't create a release plan when we're releasing) - # only run on labeled event if the PR has already been merged - if: ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && needs.is-this-a-release.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true) - + if: needs.should-run-release-plan-prepare.outputs.should-prepare == 'true' steps: - - uses: actions/checkout@v4 - # We need to download lots of history so that - # github-changelog can discover what's changed since the last release + - uses: release-plan/actions/prepare@v1 + name: Run release-plan prepare with: - fetch-depth: 0 ref: "beta" - - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: pnpm - - run: pnpm install --frozen-lockfile - - name: "Generate Explanation and Prep Changelogs" - id: explanation - run: | - set +e - pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2) - - if [ $? -ne 0 ]; then - release_plan_output=$(cat release-plan-stderr.txt) - else - release_plan_output=$(jq .description .release-plan.json -r) - rm release-plan-stderr.txt - - if [ $(jq '.solution | length' .release-plan.json) -eq 1 ]; then - new_version=$(jq -r '.solution[].newVersion' .release-plan.json) - echo "new_version=v$new_version" >> $GITHUB_OUTPUT - fi - fi - echo 'text<> $GITHUB_OUTPUT - echo "$release_plan_output" >> $GITHUB_OUTPUT - echo 'EOF' >> $GITHUB_OUTPUT env: GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} + id: explanation # this is needed because our fixtures are highly dependent on the exact version of ember-cli in the monorepo # and release-plan updates the version during the plan phase @@ -89,12 +52,14 @@ jobs: run: | sed -i 's/"ember-cli".*/"ember-cli": "~'$(jq -r .version package.json)'",/' packages/app-blueprint/files/package.json - - uses: peter-evans/create-pull-request@v7 + - uses: peter-evans/create-pull-request@v8 + name: Create Prepare Release PR with: - commit-message: "Prepare Beta Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'" + commit-message: "Prepare Beta Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'" labels: "internal" + sign-commits: true branch: release-preview-beta - title: Prepare Beta Release ${{ steps.explanation.outputs.new_version }} + title: Prepare Beta Release ${{ steps.explanation.outputs.new-version }} # this doesn't use secrets.GITHUB_TOKEN because we want CI to run on the PR that it opens. # See: https://docs.github.com/en/actions/how-tos/security-for-github-actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow token: ${{ secrets.RELEASE_PLAN_GH_PAT }} diff --git a/.github/workflows/plan-stable-release.yml b/.github/workflows/plan-stable-release.yml index 494018a53a..21080fa16e 100644 --- a/.github/workflows/plan-stable-release.yml +++ b/.github/workflows/plan-stable-release.yml @@ -8,78 +8,41 @@ on: types: - labeled - unlabeled - branches: - - release concurrency: group: plan-release-stable # only the latest one of these should ever be running cancel-in-progress: true jobs: - is-this-a-release: - name: "Is this a release?" + should-run-release-plan-prepare: + name: Should we run release-plan prepare? runs-on: ubuntu-latest outputs: - command: ${{ steps.check-release.outputs.command }} - + should-prepare: ${{ steps.should-prepare.outputs.should-prepare }} steps: - - uses: actions/checkout@v4 + - uses: release-plan/actions/should-prepare-release@v1 with: - fetch-depth: 2 ref: "release" - # This will only cause the `is-this-a-release` job to have a "command" of `release` - # when the .release-plan.json file was changed on the last commit. - - id: check-release - run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT + id: should-prepare create-prepare-release-pr: name: Create Prepare Release PR runs-on: ubuntu-latest timeout-minutes: 5 - needs: is-this-a-release + needs: should-run-release-plan-prepare permissions: contents: write issues: read pull-requests: write - # only run on push event or workflow dispatch if plan wasn't updated (don't create a release plan when we're releasing) - # only run on labeled event if the PR has already been merged - if: ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && needs.is-this-a-release.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true) - + if: needs.should-run-release-plan-prepare.outputs.should-prepare == 'true' steps: - - uses: actions/checkout@v4 - # We need to download lots of history so that - # github-changelog can discover what's changed since the last release + - uses: release-plan/actions/prepare@v1 + name: Run release-plan prepare with: - fetch-depth: 0 ref: "release" - - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 - with: - node-version: 20 - cache: pnpm - - run: pnpm install --frozen-lockfile - - name: "Generate Explanation and Prep Changelogs" - id: explanation - run: | - set +e - pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2) - - if [ $? -ne 0 ]; then - release_plan_output=$(cat release-plan-stderr.txt) - else - release_plan_output=$(jq .description .release-plan.json -r) - rm release-plan-stderr.txt - - if [ $(jq '.solution | length' .release-plan.json) -eq 1 ]; then - new_version=$(jq -r '.solution[].newVersion' .release-plan.json) - echo "new_version=v$new_version" >> $GITHUB_OUTPUT - fi - fi - echo 'text<> $GITHUB_OUTPUT - echo "$release_plan_output" >> $GITHUB_OUTPUT - echo 'EOF' >> $GITHUB_OUTPUT env: GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} + id: explanation # this is needed because our fixtures are highly dependent on the exact version of ember-cli in the monorepo # and release-plan updates the version during the plan phase @@ -89,12 +52,14 @@ jobs: run: | sed -i 's/"ember-cli".*/"ember-cli": "~'$(jq -r .version package.json)'",/' packages/app-blueprint/files/package.json - - uses: peter-evans/create-pull-request@v7 + - uses: peter-evans/create-pull-request@v8 + name: Create Prepare Release PR with: - commit-message: "Prepare Stable Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'" + commit-message: "Prepare Alpha Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'" labels: "internal" + sign-commits: true branch: release-preview-stable - title: Prepare Stable Release ${{ steps.explanation.outputs.new_version }} + title: Prepare Alpha Release ${{ steps.explanation.outputs.new-version }} # this doesn't use secrets.GITHUB_TOKEN because we want CI to run on the PR that it opens. # See: https://docs.github.com/en/actions/how-tos/security-for-github-actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow token: ${{ secrets.RELEASE_PLAN_GH_PAT }} diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml deleted file mode 100644 index 199b4ecdf4..0000000000 --- a/.github/workflows/publish-beta.yml +++ /dev/null @@ -1,42 +0,0 @@ -# For every push to the primary branch with .release-plan.json modified, -# runs release-plan. - -name: Publish Stable (Beta) - -on: - workflow_dispatch: - push: - branches: - - beta - paths: - - ".release-plan.json" - -concurrency: - group: publish-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -jobs: - publish: - name: "NPM Publish" - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - id-token: write - attestations: write - - steps: - - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 - with: - node-version: 20 - # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable - registry-url: "https://registry.npmjs.org" - cache: pnpm - - run: pnpm install --frozen-lockfile - - name: Publish to NPM - run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish --github-prerelease --publish-branch=beta - env: - GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-stable.yml b/.github/workflows/publish-stable.yml deleted file mode 100644 index 821e6c11b2..0000000000 --- a/.github/workflows/publish-stable.yml +++ /dev/null @@ -1,42 +0,0 @@ -# For every push to the primary branch with .release-plan.json modified, -# runs release-plan. - -name: Publish Stable (Release) - -on: - workflow_dispatch: - push: - branches: - - release - paths: - - ".release-plan.json" - -concurrency: - group: publish-${{ github.head_ref || github.ref }} - cancel-in-progress: true - -jobs: - publish: - name: "NPM Publish" - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - id-token: write - attestations: write - - steps: - - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 - with: - node-version: 20 - # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable - registry-url: "https://registry.npmjs.org" - cache: pnpm - - run: pnpm install --frozen-lockfile - - name: Publish to NPM - run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish --publish-branch=release - env: - GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-alpha.yml b/.github/workflows/publish.yml similarity index 79% rename from .github/workflows/publish-alpha.yml rename to .github/workflows/publish.yml index b63f51a28a..e4c9518f51 100644 --- a/.github/workflows/publish-alpha.yml +++ b/.github/workflows/publish.yml @@ -22,22 +22,20 @@ jobs: runs-on: ubuntu-latest permissions: contents: write - pull-requests: write id-token: write attestations: write steps: - uses: actions/checkout@v6 - uses: pnpm/action-setup@v4 - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v6 with: - node-version: 20 - # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable + node-version: 22 registry-url: "https://registry.npmjs.org" cache: pnpm + - run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC - run: pnpm install --frozen-lockfile - name: Publish to NPM run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish --github-prerelease env: GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} From c11b9ce6502292c3288d57b6720ffa79b0dd4bd7 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 7 Feb 2026 18:58:47 +0000 Subject: [PATCH 23/49] add conditional to release-plan publish based on branch --- .github/workflows/publish.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e4c9518f51..189b432889 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -36,6 +36,12 @@ jobs: - run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC - run: pnpm install --frozen-lockfile - name: Publish to NPM - run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish --github-prerelease + # pass --github-prerelease when we are only branch other than release + run: | + if [ ${{ github.ref }} = "refs/heads/release" ]; then + pnpm release-plan publish + else + pnpm release-plan publish --github-prerelease + fi env: GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} From 73c42ea01f6a5ee7b2c274a395185cbaf26c74d5 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 7 Feb 2026 20:56:35 +0000 Subject: [PATCH 24/49] Prepare Alpha Release using 'release-plan' --- .release-plan.json | 64 +++-------------------- CHANGELOG.md | 11 ++++ package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- 4 files changed, 20 insertions(+), 59 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index 713ec062f4..ac34de69df 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -2,79 +2,29 @@ "solution": { "ember-cli": { "impact": "patch", - "oldVersion": "6.12.0-alpha.1", - "newVersion": "6.12.0-alpha.2", + "oldVersion": "6.12.0-alpha.2", + "newVersion": "6.12.0-alpha.3", "tagName": "alpha", "constraints": [ { "impact": "patch", - "reason": "Appears in changelog section :bug: Bug Fix" - }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" - }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-addon-blueprint" - }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" + "reason": "Appears in changelog section :house: Internal" } ], "pkgJSONPath": "./package.json" }, "@ember-tooling/classic-build-addon-blueprint": { - "impact": "patch", - "oldVersion": "6.12.0-alpha.1", - "newVersion": "6.12.0-alpha.2", - "tagName": "alpha", - "constraints": [ - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" - }, - { - "impact": "patch", - "reason": "Appears in changelog section :bug: Bug Fix" - } - ], - "pkgJSONPath": "./packages/addon-blueprint/package.json" + "oldVersion": "6.12.0-alpha.2" }, "@ember-tooling/classic-build-app-blueprint": { - "impact": "patch", - "oldVersion": "6.12.0-alpha.1", - "newVersion": "6.12.0-alpha.2", - "tagName": "alpha", - "constraints": [ - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" - }, - { - "impact": "patch", - "reason": "Appears in changelog section :bug: Bug Fix" - } - ], - "pkgJSONPath": "./packages/app-blueprint/package.json" + "oldVersion": "6.12.0-alpha.2" }, "@ember-tooling/blueprint-blueprint": { "oldVersion": "0.3.0" }, "@ember-tooling/blueprint-model": { - "impact": "patch", - "oldVersion": "0.6.0", - "newVersion": "0.6.1", - "tagName": "latest", - "constraints": [ - { - "impact": "patch", - "reason": "Appears in changelog section :bug: Bug Fix" - } - ], - "pkgJSONPath": "./packages/blueprint-model/package.json" + "oldVersion": "0.6.1" } }, - "description": "## Release (2026-02-05)\n\n* ember-cli 6.12.0-alpha.2 (patch)\n* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.2 (patch)\n* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.2 (patch)\n* @ember-tooling/blueprint-model 0.6.1 (patch)\n\n#### :bug: Bug Fix\n* `ember-cli`, `@ember-tooling/blueprint-model`\n * [#10941](https://github.com/ember-cli/ember-cli/pull/10941) Downgrade isbinaryfile ([@mansona](https://github.com/mansona))\n* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli`\n * [#10932](https://github.com/ember-cli/ember-cli/pull/10932) Remove tracked-built-ins (it comes built in with ember-source 6.8+) ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 2\n- Chris Manson ([@mansona](https://github.com/mansona))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n" + "description": "## Release (2026-02-07)\n\n* ember-cli 6.12.0-alpha.3 (patch)\n\n#### :house: Internal\n* `ember-cli`\n * [#10945](https://github.com/ember-cli/ember-cli/pull/10945) update release-plan for OIDC ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index b5edc1a087..2044b508db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # ember-cli Changelog +## Release (2026-02-07) + +* ember-cli 6.12.0-alpha.3 (patch) + +#### :house: Internal +* `ember-cli` + * [#10945](https://github.com/ember-cli/ember-cli/pull/10945) update release-plan for OIDC ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + ## Release (2026-02-05) * ember-cli 6.12.0-alpha.2 (patch) diff --git a/package.json b/package.json index 53fd2e2534..293728f360 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.12.0-alpha.2", + "version": "6.12.0-alpha.3", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 71edc34ab6..e1bbf4bbed 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.12.0-alpha.2", + "ember-cli": "~6.12.0-alpha.3", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", From d78176f0af71aa25dc64d535242ddfa428545b94 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 7 Feb 2026 21:05:43 +0000 Subject: [PATCH 25/49] bump in-range versions --- packages/addon-blueprint/package.json | 6 +- packages/app-blueprint/files/package.json | 20 +++--- packages/blueprint-model/package.json | 6 +- pnpm-lock.yaml | 88 ++++++++--------------- 4 files changed, 44 insertions(+), 76 deletions(-) diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index 3c1f5e617d..c093e693d6 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -15,10 +15,10 @@ "chalk": "^5.6.2", "ember-cli-normalize-entity-name": "^1.0.0", "ember-cli-string-utils": "^1.1.0", - "fs-extra": "^11.3.0", - "lodash": "^4.17.21", + "fs-extra": "^11.3.3", + "lodash": "^4.17.23", "silent-error": "^1.1.1", - "sort-package-json": "^2.12.0", + "sort-package-json": "^2.15.1", "walk-sync": "^3.0.0" }, "release-plan": { diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index e1bbf4bbed..dae8a49d24 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -28,9 +28,9 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6<% if (typescript && emberData) { %>", + "@babel/plugin-proposal-decorators": "^7.29.0<% if (typescript && emberData) { %>", "@ember-data/adapter": "~5.7.0", "@ember-data/graph": "~5.7.0", "@ember-data/json-api": "~5.7.0", @@ -45,14 +45,14 @@ "@ember/test-helpers": "^5.4.1<% if (embroider) { %>", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9<% } %>", - "@embroider/macros": "^1.19.6<% if (embroider) { %>", + "@embroider/macros": "^1.19.7<% if (embroider) { %>", "@embroider/webpack": "^4.1.2<% } %>", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2<% if (typescript) { %>", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9<% if (emberData) {%>", @@ -62,7 +62,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~6.12.0-alpha.3", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -72,11 +72,11 @@ "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0<% if (welcome) { %>", "ember-welcome-page": "^7.0.2<% } %>", @@ -84,7 +84,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -94,8 +94,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1<% if (typescript) { %>", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1<% } %>", - "webpack": "^5.104.1" + "typescript-eslint": "^8.54.0<% } %>", + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/packages/blueprint-model/package.json b/packages/blueprint-model/package.json index 9965ed5138..7eef9f3646 100644 --- a/packages/blueprint-model/package.json +++ b/packages/blueprint-model/package.json @@ -10,10 +10,10 @@ "dependencies": { "chalk": "^5.6.2", "diff": "^7.0.0", - "isbinaryfile": "^5.0.4", - "lodash": "^4.17.21", + "isbinaryfile": "^5.0.7", + "lodash": "^4.17.23", "promise.hash.helper": "^1.0.8", - "quick-temp": "^0.1.8", + "quick-temp": "^0.1.9", "silent-error": "^1.1.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a005ed2d03..7b655de164 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -376,17 +376,17 @@ importers: specifier: ^1.1.0 version: 1.1.0 fs-extra: - specifier: ^11.3.0 - version: 11.3.0 + specifier: ^11.3.3 + version: 11.3.3 lodash: - specifier: ^4.17.21 - version: 4.17.21 + specifier: ^4.17.23 + version: 4.17.23 silent-error: specifier: ^1.1.1 version: 1.1.1 sort-package-json: - specifier: ^2.12.0 - version: 2.12.0 + specifier: ^2.15.1 + version: 2.15.1 walk-sync: specifier: ^3.0.0 version: 3.0.0 @@ -414,16 +414,16 @@ importers: specifier: ^7.0.0 version: 7.0.0 isbinaryfile: - specifier: ^5.0.4 - version: 5.0.4 + specifier: ^5.0.7 + version: 5.0.7 lodash: - specifier: ^4.17.21 - version: 4.17.21 + specifier: ^4.17.23 + version: 4.17.23 promise.hash.helper: specifier: ^1.0.8 version: 1.0.8 quick-temp: - specifier: ^0.1.8 + specifier: ^0.1.9 version: 0.1.9 silent-error: specifier: ^1.1.1 @@ -2048,10 +2048,6 @@ packages: resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==} engines: {node: '>=0.10.0'} - detect-indent@7.0.1: - resolution: {integrity: sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==} - engines: {node: '>=12.20'} - detect-indent@7.0.2: resolution: {integrity: sha512-y+8xyqdGLL+6sh0tVeHcfP/QDd8gUgbasolJJpY7NgeQGSZ739bDtSiaiDgtoicy+mtYB81dKLxO9xRhCyIB3A==} engines: {node: '>=12.20'} @@ -2456,14 +2452,6 @@ packages: fb-watchman@2.0.2: resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==} - fdir@6.4.2: - resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==} - peerDependencies: - picomatch: ^3 || ^4 - peerDependenciesMeta: - picomatch: - optional: true - fdir@6.5.0: resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} engines: {node: '>=12.0.0'} @@ -2643,10 +2631,6 @@ packages: resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} - fs-extra@11.3.0: - resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==} - engines: {node: '>=14.14'} - fs-extra@11.3.3: resolution: {integrity: sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==} engines: {node: '>=14.14'} @@ -3336,8 +3320,8 @@ packages: isarray@2.0.5: resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} - isbinaryfile@5.0.4: - resolution: {integrity: sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==} + isbinaryfile@5.0.7: + resolution: {integrity: sha512-gnWD14Jh3FzS3CPhF0AxNOJ8CxqeblPTADzI38r0wt8ZyQl5edpy75myt08EG2oKvpyiqSqsx+Wkz9vtkbTqYQ==} engines: {node: '>= 18.0.0'} isexe@2.0.0: @@ -3577,6 +3561,9 @@ packages: lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + lodash@4.17.23: + resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==} + log-symbols@2.2.0: resolution: {integrity: sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==} engines: {node: '>=4'} @@ -4739,8 +4726,8 @@ packages: sort-object-keys@2.0.1: resolution: {integrity: sha512-R89fO+z3x7hiKPXX5P0qim+ge6Y60AjtlW+QQpRozrrNcR1lw9Pkpm5MLB56HoNvdcLHL4wbpq16OcvGpEDJIg==} - sort-package-json@2.12.0: - resolution: {integrity: sha512-/HrPQAeeLaa+vbAH/znjuhwUluuiM/zL5XX9kop8UpDgjtyWKt43hGDk2vd/TBdDpzIyzIHVUgmYofzYrAQjew==} + sort-package-json@2.15.1: + resolution: {integrity: sha512-9x9+o8krTT2saA9liI4BljNjwAbvUnWf11Wq+i/iZt8nl2UGYnf3TH5uBydE7VALmP7AGwlfszuEeL8BDyb0YA==} hasBin: true sort-package-json@3.6.0: @@ -5013,10 +5000,6 @@ packages: tiny-lr@2.0.0: resolution: {integrity: sha512-f6nh0VMRvhGx4KCeK1lQ/jaL0Zdb5WdR+Jk8q9OSUQnaSDxAEGH1fgqLZ+cMl5EW3F2MGnCsalBO1IsnnogW1Q==} - tinyglobby@0.2.10: - resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==} - engines: {node: '>=12.0.0'} - tinyglobby@0.2.15: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} @@ -6350,7 +6333,7 @@ snapshots: async@2.6.4: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 async@3.2.6: {} @@ -7280,8 +7263,6 @@ snapshots: detect-file@1.0.0: {} - detect-indent@7.0.1: {} - detect-indent@7.0.2: {} detect-newline@4.0.1: {} @@ -7904,10 +7885,6 @@ snapshots: dependencies: bser: 2.1.1 - fdir@6.4.2(picomatch@4.0.2): - optionalDependencies: - picomatch: 4.0.2 - fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 @@ -8146,12 +8123,6 @@ snapshots: jsonfile: 6.1.0 universalify: 2.0.1 - fs-extra@11.3.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.1.0 - universalify: 2.0.1 - fs-extra@11.3.3: dependencies: graceful-fs: 4.2.11 @@ -8200,7 +8171,7 @@ snapshots: dependencies: glob: 7.2.3 iconv-lite: 0.4.24 - lodash: 4.17.21 + lodash: 4.17.23 mkdirp: 0.5.6 rimraf: 2.7.1 @@ -8692,7 +8663,7 @@ snapshots: cli-width: 2.2.1 external-editor: 3.1.0 figures: 2.0.0 - lodash: 4.17.21 + lodash: 4.17.23 mute-stream: 0.0.7 run-async: 2.4.1 rxjs: 6.6.7 @@ -8911,7 +8882,7 @@ snapshots: isarray@2.0.5: {} - isbinaryfile@5.0.4: {} + isbinaryfile@5.0.7: {} isexe@2.0.0: {} @@ -9192,6 +9163,8 @@ snapshots: lodash@4.17.21: {} + lodash@4.17.23: {} + log-symbols@2.2.0: dependencies: chalk: 2.4.2 @@ -9974,7 +9947,7 @@ snapshots: quibble@0.9.2: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 resolve: 1.22.11 quick-temp@0.1.9: @@ -10501,16 +10474,16 @@ snapshots: sort-object-keys@2.0.1: {} - sort-package-json@2.12.0: + sort-package-json@2.15.1: dependencies: - detect-indent: 7.0.1 + detect-indent: 7.0.2 detect-newline: 4.0.1 get-stdin: 9.0.0 git-hooks-list: 3.1.0 is-plain-obj: 4.1.0 semver: 7.7.3 sort-object-keys: 1.1.3 - tinyglobby: 0.2.10 + tinyglobby: 0.2.15 sort-package-json@3.6.0: dependencies: @@ -10896,11 +10869,6 @@ snapshots: transitivePeerDependencies: - supports-color - tinyglobby@0.2.10: - dependencies: - fdir: 6.4.2(picomatch@4.0.2) - picomatch: 4.0.2 - tinyglobby@0.2.15: dependencies: fdir: 6.5.0(picomatch@4.0.3) From f488c0f991f718276e9076f9fec7509557157f4a Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 7 Feb 2026 22:12:10 +0000 Subject: [PATCH 26/49] update fixtures --- tests/fixtures/addon/defaults/package.json | 14 ++++++------- tests/fixtures/addon/pnpm/package.json | 14 ++++++------- tests/fixtures/addon/typescript/package.json | 18 ++++++++--------- tests/fixtures/addon/yarn/package.json | 14 ++++++------- tests/fixtures/app/defaults/package.json | 16 +++++++-------- .../app/embroider-no-ember-data/package.json | 16 +++++++-------- .../app/embroider-no-welcome/package.json | 16 +++++++-------- .../fixtures/app/embroider-pnpm/package.json | 16 +++++++-------- .../fixtures/app/embroider-yarn/package.json | 16 +++++++-------- tests/fixtures/app/embroider/package.json | 16 +++++++-------- tests/fixtures/app/no-ember-data/package.json | 16 +++++++-------- tests/fixtures/app/npm/package.json | 16 +++++++-------- tests/fixtures/app/pnpm/package.json | 16 +++++++-------- .../package.json | 20 +++++++++---------- .../app/typescript-embroider/package.json | 20 +++++++++---------- .../app/typescript-no-ember-data/package.json | 20 +++++++++---------- tests/fixtures/app/typescript/package.json | 20 +++++++++---------- tests/fixtures/app/yarn/package.json | 16 +++++++-------- 18 files changed, 150 insertions(+), 150 deletions(-) diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index 78039dea90..3c737e9e6d 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -30,17 +30,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", "ember-cli-htmlbars": "^6.3.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/test-setup": "^4.0.0", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -59,7 +59,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -67,7 +67,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -76,7 +76,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json index 355c0e4a1c..709ae26f50 100644 --- a/tests/fixtures/addon/pnpm/package.json +++ b/tests/fixtures/addon/pnpm/package.json @@ -30,17 +30,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", "ember-cli-htmlbars": "^6.3.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/test-setup": "^4.0.0", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -59,7 +59,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -68,7 +68,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -77,7 +77,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/typescript/package.json b/tests/fixtures/addon/typescript/package.json index e9cddda9c7..5c25e7a61f 100644 --- a/tests/fixtures/addon/typescript/package.json +++ b/tests/fixtures/addon/typescript/package.json @@ -48,24 +48,24 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", "ember-cli-htmlbars": "^6.3.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/test-setup": "^4.0.0", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -83,7 +83,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -91,7 +91,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -102,8 +102,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.54.0", + "webpack": "^5.105.0" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 9057f4b57a..c3f0ab1221 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -30,17 +30,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", "ember-cli-htmlbars": "^6.3.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/test-setup": "^4.0.0", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -59,7 +59,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -68,7 +68,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -77,7 +77,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 3c9ad0a3f6..0d68756852 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -51,11 +51,11 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -63,7 +63,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index 592716d166..fff6e71543 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,18 +44,18 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-htmlbars": "^6.3.0", "ember-cli-inject-live-reload": "^2.1.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -63,7 +63,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index d841d6eab5..83ec78d0be 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,7 +44,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -52,18 +52,18 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index cbd2a9f610..1db87563a3 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,7 +44,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -52,11 +52,11 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -64,7 +64,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -73,7 +73,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index 4358b6c83b..de01f786c8 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,7 +44,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -52,11 +52,11 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -64,7 +64,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -73,7 +73,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 4f18df1698..c8f7f38a6d 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,7 +44,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -52,11 +52,11 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -64,7 +64,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -73,7 +73,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index 87ff460a0c..4bd9dff377 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -50,11 +50,11 @@ "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", "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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -62,7 +62,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -71,7 +71,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 0aaef6c732..c2f9840957 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -51,18 +51,18 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -71,7 +71,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 0b57dee862..22a9484f8f 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -51,11 +51,11 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -63,7 +63,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index 52fa252c6d..3a3475e2f1 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -28,21 +28,21 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -51,18 +51,18 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-htmlbars": "^6.3.0", "ember-cli-inject-live-reload": "^2.1.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -70,7 +70,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -80,8 +80,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.54.0", + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index 6fbc0543b9..caad721ba0 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -28,9 +28,9 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember-data/adapter": "~5.7.0", "@ember-data/graph": "~5.7.0", "@ember-data/json-api": "~5.7.0", @@ -45,14 +45,14 @@ "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -62,7 +62,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -70,11 +70,11 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -82,7 +82,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -92,8 +92,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.54.0", + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index 6b571e6962..cfe42dc08b 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -28,18 +28,18 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -48,7 +48,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -57,11 +57,11 @@ "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", "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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -69,7 +69,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -79,8 +79,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.54.0", + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index f7a94393d6..f3050d5180 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -28,9 +28,9 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember-data/adapter": "~5.7.0", "@ember-data/graph": "~5.7.0", "@ember-data/json-api": "~5.7.0", @@ -43,13 +43,13 @@ "@warp-drive/ember": "~5.7.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -59,7 +59,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -69,11 +69,11 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -81,7 +81,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -91,8 +91,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.54.0", + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index 8719dab990..9fc368fe2c 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -51,11 +51,11 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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.12.0-alpha.1", + "ember-source": "~6.12.0-alpha.3", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", @@ -63,7 +63,7 @@ "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.0" }, "engines": { "node": ">= 20.19" From 8325ca8857ea47e2689ce48cda164c12b4e3d782 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 7 Feb 2026 23:09:39 +0000 Subject: [PATCH 27/49] Prepare Alpha Release using 'release-plan' --- .release-plan.json | 62 ++++++++++++++++++++--- CHANGELOG.md | 14 +++++ package.json | 2 +- packages/addon-blueprint/package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- packages/app-blueprint/package.json | 2 +- packages/blueprint-model/package.json | 2 +- 7 files changed, 75 insertions(+), 11 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index ac34de69df..6622b45c55 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -2,10 +2,22 @@ "solution": { "ember-cli": { "impact": "patch", - "oldVersion": "6.12.0-alpha.2", - "newVersion": "6.12.0-alpha.3", + "oldVersion": "6.12.0-alpha.3", + "newVersion": "6.12.0-alpha.4", "tagName": "alpha", "constraints": [ + { + "impact": "patch", + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-addon-blueprint" + }, + { + "impact": "patch", + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" + }, + { + "impact": "patch", + "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" + }, { "impact": "patch", "reason": "Appears in changelog section :house: Internal" @@ -14,17 +26,55 @@ "pkgJSONPath": "./package.json" }, "@ember-tooling/classic-build-addon-blueprint": { - "oldVersion": "6.12.0-alpha.2" + "impact": "patch", + "oldVersion": "6.12.0-alpha.2", + "newVersion": "6.12.0-alpha.3", + "tagName": "alpha", + "constraints": [ + { + "impact": "patch", + "reason": "Appears in changelog section :house: Internal" + }, + { + "impact": "patch", + "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" + } + ], + "pkgJSONPath": "./packages/addon-blueprint/package.json" }, "@ember-tooling/classic-build-app-blueprint": { - "oldVersion": "6.12.0-alpha.2" + "impact": "patch", + "oldVersion": "6.12.0-alpha.2", + "newVersion": "6.12.0-alpha.3", + "tagName": "alpha", + "constraints": [ + { + "impact": "patch", + "reason": "Appears in changelog section :house: Internal" + }, + { + "impact": "patch", + "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" + } + ], + "pkgJSONPath": "./packages/app-blueprint/package.json" }, "@ember-tooling/blueprint-blueprint": { "oldVersion": "0.3.0" }, "@ember-tooling/blueprint-model": { - "oldVersion": "0.6.1" + "impact": "patch", + "oldVersion": "0.6.1", + "newVersion": "0.6.2", + "tagName": "latest", + "constraints": [ + { + "impact": "patch", + "reason": "Appears in changelog section :house: Internal" + } + ], + "pkgJSONPath": "./packages/blueprint-model/package.json" } }, - "description": "## Release (2026-02-07)\n\n* ember-cli 6.12.0-alpha.3 (patch)\n\n#### :house: Internal\n* `ember-cli`\n * [#10945](https://github.com/ember-cli/ember-cli/pull/10945) update release-plan for OIDC ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" + "description": "## Release (2026-02-07)\n\n* ember-cli 6.12.0-alpha.4 (patch)\n* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.3 (patch)\n* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.3 (patch)\n* @ember-tooling/blueprint-model 0.6.2 (patch)\n\n#### :house: Internal\n* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-model`, `ember-cli`\n * [#10947](https://github.com/ember-cli/ember-cli/pull/10947) bump in-range versions ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 2044b508db..ee5d8e3479 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ ## Release (2026-02-07) +* ember-cli 6.12.0-alpha.4 (patch) +* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.3 (patch) +* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.3 (patch) +* @ember-tooling/blueprint-model 0.6.2 (patch) + +#### :house: Internal +* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-model`, `ember-cli` + * [#10947](https://github.com/ember-cli/ember-cli/pull/10947) bump in-range versions ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + +## Release (2026-02-07) + * ember-cli 6.12.0-alpha.3 (patch) #### :house: Internal diff --git a/package.json b/package.json index 293728f360..73deec0151 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.12.0-alpha.3", + "version": "6.12.0-alpha.4", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index c093e693d6..a1193a68b1 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.12.0-alpha.2", + "version": "6.12.0-alpha.3", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index dae8a49d24..0d514443f5 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.12.0-alpha.3", + "ember-cli": "~6.12.0-alpha.4", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index 1383493947..26937be70f 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.12.0-alpha.2", + "version": "6.12.0-alpha.3", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/blueprint-model/package.json b/packages/blueprint-model/package.json index 7eef9f3646..a3ae46fef4 100644 --- a/packages/blueprint-model/package.json +++ b/packages/blueprint-model/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/blueprint-model", - "version": "0.6.1", + "version": "0.6.2", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", From c065f135e8c15607728379c81c59d220cb23cddb Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 9 Feb 2026 21:46:42 +0000 Subject: [PATCH 28/49] Prepare Stable Release using 'release-plan' --- .release-plan.json | 6 +++--- CHANGELOG.md | 18 ++++++++++++++++++ package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index 005386592e..df4356dd87 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -2,8 +2,8 @@ "solution": { "ember-cli": { "impact": "patch", - "oldVersion": "6.10.0", - "newVersion": "6.10.1", + "oldVersion": "6.10.1", + "newVersion": "6.10.2", "tagName": "latest", "constraints": [ { @@ -24,5 +24,5 @@ "oldVersion": "6.10.0" } }, - "description": "## Release (2026-02-08)\n\n* ember-cli 6.10.1 (patch)\n\n#### :bug: Bug Fix\n* `ember-cli`\n * [#10949](https://github.com/ember-cli/ember-cli/pull/10949) [backport release] remove unused isbinaryfile from ember-cli package ([@mansona](https://github.com/mansona))\n * [#10940](https://github.com/ember-cli/ember-cli/pull/10940) [bugfix release] remove fixturify-project from dependencies ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `ember-cli`\n * [#10951](https://github.com/ember-cli/ember-cli/pull/10951) Fix PR name for stable release-plan pull request ([@mansona](https://github.com/mansona))\n * [#10950](https://github.com/ember-cli/ember-cli/pull/10950) [backport release] update release-plan for OIDC ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" + "description": "## Release (2026-02-09)\n\n* ember-cli 6.10.2 (patch)\n\n#### :bug: Bug Fix\n* `ember-cli`\n * [#10949](https://github.com/ember-cli/ember-cli/pull/10949) [backport release] remove unused isbinaryfile from ember-cli package ([@mansona](https://github.com/mansona))\n * [#10940](https://github.com/ember-cli/ember-cli/pull/10940) [bugfix release] remove fixturify-project from dependencies ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `ember-cli`\n * [#10952](https://github.com/ember-cli/ember-cli/pull/10952) add correct --publish-branch to pnpm publish ([@mansona](https://github.com/mansona))\n * [#10951](https://github.com/ember-cli/ember-cli/pull/10951) Fix PR name for stable release-plan pull request ([@mansona](https://github.com/mansona))\n * [#10950](https://github.com/ember-cli/ember-cli/pull/10950) [backport release] update release-plan for OIDC ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index ddadb2a720..f08b93e106 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # ember-cli Changelog +## Release (2026-02-09) + +* ember-cli 6.10.2 (patch) + +#### :bug: Bug Fix +* `ember-cli` + * [#10949](https://github.com/ember-cli/ember-cli/pull/10949) [backport release] remove unused isbinaryfile from ember-cli package ([@mansona](https://github.com/mansona)) + * [#10940](https://github.com/ember-cli/ember-cli/pull/10940) [bugfix release] remove fixturify-project from dependencies ([@mansona](https://github.com/mansona)) + +#### :house: Internal +* `ember-cli` + * [#10952](https://github.com/ember-cli/ember-cli/pull/10952) add correct --publish-branch to pnpm publish ([@mansona](https://github.com/mansona)) + * [#10951](https://github.com/ember-cli/ember-cli/pull/10951) Fix PR name for stable release-plan pull request ([@mansona](https://github.com/mansona)) + * [#10950](https://github.com/ember-cli/ember-cli/pull/10950) [backport release] update release-plan for OIDC ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + ## Release (2026-02-08) * ember-cli 6.10.1 (patch) diff --git a/package.json b/package.json index 2966c28216..1f74d8ba8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.10.1", + "version": "6.10.2", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 316eecb33c..bb3c923cdc 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.10.1", + "ember-cli": "~6.10.2", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.2.0", "ember-cli-clean-css": "^3.0.0", From be46501c721c6dedadbc75c9220f296d9f069168 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 9 Feb 2026 21:46:47 +0000 Subject: [PATCH 29/49] Prepare Alpha Release using 'release-plan' --- .release-plan.json | 60 +++-------------------- CHANGELOG.md | 19 +++++++ package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- 4 files changed, 28 insertions(+), 55 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index 6622b45c55..8444230d03 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -2,21 +2,13 @@ "solution": { "ember-cli": { "impact": "patch", - "oldVersion": "6.12.0-alpha.3", - "newVersion": "6.12.0-alpha.4", + "oldVersion": "6.12.0-alpha.4", + "newVersion": "6.12.0-alpha.5", "tagName": "alpha", "constraints": [ { "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-addon-blueprint" - }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" - }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" + "reason": "Appears in changelog section :bug: Bug Fix" }, { "impact": "patch", @@ -26,55 +18,17 @@ "pkgJSONPath": "./package.json" }, "@ember-tooling/classic-build-addon-blueprint": { - "impact": "patch", - "oldVersion": "6.12.0-alpha.2", - "newVersion": "6.12.0-alpha.3", - "tagName": "alpha", - "constraints": [ - { - "impact": "patch", - "reason": "Appears in changelog section :house: Internal" - }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" - } - ], - "pkgJSONPath": "./packages/addon-blueprint/package.json" + "oldVersion": "6.12.0-alpha.3" }, "@ember-tooling/classic-build-app-blueprint": { - "impact": "patch", - "oldVersion": "6.12.0-alpha.2", - "newVersion": "6.12.0-alpha.3", - "tagName": "alpha", - "constraints": [ - { - "impact": "patch", - "reason": "Appears in changelog section :house: Internal" - }, - { - "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/blueprint-model" - } - ], - "pkgJSONPath": "./packages/app-blueprint/package.json" + "oldVersion": "6.12.0-alpha.3" }, "@ember-tooling/blueprint-blueprint": { "oldVersion": "0.3.0" }, "@ember-tooling/blueprint-model": { - "impact": "patch", - "oldVersion": "0.6.1", - "newVersion": "0.6.2", - "tagName": "latest", - "constraints": [ - { - "impact": "patch", - "reason": "Appears in changelog section :house: Internal" - } - ], - "pkgJSONPath": "./packages/blueprint-model/package.json" + "oldVersion": "0.6.2" } }, - "description": "## Release (2026-02-07)\n\n* ember-cli 6.12.0-alpha.4 (patch)\n* @ember-tooling/classic-build-addon-blueprint 6.12.0-alpha.3 (patch)\n* @ember-tooling/classic-build-app-blueprint 6.12.0-alpha.3 (patch)\n* @ember-tooling/blueprint-model 0.6.2 (patch)\n\n#### :house: Internal\n* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `@ember-tooling/blueprint-model`, `ember-cli`\n * [#10947](https://github.com/ember-cli/ember-cli/pull/10947) bump in-range versions ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" + "description": "## Release (2026-02-09)\n\n* ember-cli 6.12.0-alpha.5 (patch)\n\n#### :bug: Bug Fix\n* `ember-cli`\n * [#10949](https://github.com/ember-cli/ember-cli/pull/10949) [backport release] remove unused isbinaryfile from ember-cli package ([@mansona](https://github.com/mansona))\n * [#10940](https://github.com/ember-cli/ember-cli/pull/10940) [bugfix release] remove fixturify-project from dependencies ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `ember-cli`\n * [#10955](https://github.com/ember-cli/ember-cli/pull/10955) Merge beta into master ([@mansona](https://github.com/mansona))\n * [#10952](https://github.com/ember-cli/ember-cli/pull/10952) add correct --publish-branch to pnpm publish ([@mansona](https://github.com/mansona))\n * [#10951](https://github.com/ember-cli/ember-cli/pull/10951) Fix PR name for stable release-plan pull request ([@mansona](https://github.com/mansona))\n * [#10950](https://github.com/ember-cli/ember-cli/pull/10950) [backport release] update release-plan for OIDC ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index ee5d8e3479..0bab3dcac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # ember-cli Changelog +## Release (2026-02-09) + +* ember-cli 6.12.0-alpha.5 (patch) + +#### :bug: Bug Fix +* `ember-cli` + * [#10949](https://github.com/ember-cli/ember-cli/pull/10949) [backport release] remove unused isbinaryfile from ember-cli package ([@mansona](https://github.com/mansona)) + * [#10940](https://github.com/ember-cli/ember-cli/pull/10940) [bugfix release] remove fixturify-project from dependencies ([@mansona](https://github.com/mansona)) + +#### :house: Internal +* `ember-cli` + * [#10955](https://github.com/ember-cli/ember-cli/pull/10955) Merge beta into master ([@mansona](https://github.com/mansona)) + * [#10952](https://github.com/ember-cli/ember-cli/pull/10952) add correct --publish-branch to pnpm publish ([@mansona](https://github.com/mansona)) + * [#10951](https://github.com/ember-cli/ember-cli/pull/10951) Fix PR name for stable release-plan pull request ([@mansona](https://github.com/mansona)) + * [#10950](https://github.com/ember-cli/ember-cli/pull/10950) [backport release] update release-plan for OIDC ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + ## Release (2026-02-07) * ember-cli 6.12.0-alpha.4 (patch) diff --git a/package.json b/package.json index 057c3fc3f5..dadf71c88a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.12.0-alpha.4", + "version": "6.12.0-alpha.5", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 0d514443f5..90882a73f8 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.12.0-alpha.4", + "ember-cli": "~6.12.0-alpha.5", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", From bb8a4001a5910ddf2f0d8385bf31146d2b2cf5ce Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 17 Feb 2026 20:30:11 +0000 Subject: [PATCH 30/49] update blueprint dependencies to latest --- package.json | 2 +- packages/app-blueprint/files/package.json | 24 +++++++++---------- pnpm-lock.yaml | 17 +++++++------ tests/fixtures/addon/defaults/package.json | 18 +++++++------- tests/fixtures/addon/pnpm/package.json | 18 +++++++------- tests/fixtures/addon/typescript/package.json | 22 ++++++++--------- tests/fixtures/addon/yarn/package.json | 18 +++++++------- tests/fixtures/app/defaults/package.json | 20 ++++++++-------- .../app/embroider-no-ember-data/package.json | 20 ++++++++-------- .../app/embroider-no-welcome/package.json | 20 ++++++++-------- .../fixtures/app/embroider-pnpm/package.json | 20 ++++++++-------- .../fixtures/app/embroider-yarn/package.json | 20 ++++++++-------- tests/fixtures/app/embroider/package.json | 20 ++++++++-------- tests/fixtures/app/no-ember-data/package.json | 20 ++++++++-------- tests/fixtures/app/npm/package.json | 20 ++++++++-------- tests/fixtures/app/pnpm/package.json | 20 ++++++++-------- .../package.json | 24 +++++++++---------- .../app/typescript-embroider/package.json | 24 +++++++++---------- .../app/typescript-no-ember-data/package.json | 24 +++++++++---------- tests/fixtures/app/typescript/package.json | 24 +++++++++---------- tests/fixtures/app/yarn/package.json | 20 ++++++++-------- 21 files changed, 209 insertions(+), 206 deletions(-) diff --git a/package.json b/package.json index 1f74d8ba8a..c6595e8217 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@ember-tooling/blueprint-model": "^0.5.0", "@ember-tooling/classic-build-addon-blueprint": "workspace:*", "@ember-tooling/classic-build-app-blueprint": "workspace:*", - "@ember/app-blueprint": "~6.10.0", + "@ember/app-blueprint": "~6.11.0", "@pnpm/find-workspace-dir": "^1000.1.3", "babel-remove-types": "^1.0.2", "broccoli": "^4.0.0", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index bb3c923cdc..3015d7400f 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -28,9 +28,9 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6<% if (typescript && emberData) { %>", + "@babel/plugin-proposal-decorators": "^7.29.0<% if (typescript && emberData) { %>", "@ember-data/adapter": "~5.7.0", "@ember-data/graph": "~5.7.0", "@ember-data/json-api": "~5.7.0", @@ -45,14 +45,14 @@ "@ember/test-helpers": "^5.4.1<% if (embroider) { %>", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9<% } %>", - "@embroider/macros": "^1.19.6<% if (embroider) { %>", + "@embroider/macros": "^1.19.7<% if (embroider) { %>", "@embroider/webpack": "^4.1.2<% } %>", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2<% if (typescript) { %>", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9<% if (emberData) {%>", @@ -62,7 +62,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~6.10.2", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -72,31 +72,31 @@ "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>", "ember-data": "~5.7.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.10.0", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0<% if (welcome) { %>", "ember-welcome-page": "^7.0.2<% } %>", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0<% if (typescript) { %>", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1<% } %>", - "webpack": "^5.104.1" + "typescript-eslint": "^8.56.0<% } %>", + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 592ef2b26c..682dfaccc8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: workspace:* version: link:packages/app-blueprint '@ember/app-blueprint': - specifier: ~6.10.0 - version: 6.10.4 + specifier: ~6.11.0 + version: 6.11.0 '@pnpm/find-workspace-dir': specifier: ^1000.1.3 version: 1000.1.3 @@ -533,8 +533,8 @@ packages: '@ember-tooling/blueprint-model@0.5.0': resolution: {integrity: sha512-2zAebSmmzpUO2wt6EyfX5TlcmvB9cTkteuZ3QhPmXLMthUpU5nUifcz3hlYcXPK7WM0HdO9qL4GdGQCoxhzaGg==} - '@ember/app-blueprint@6.10.4': - resolution: {integrity: sha512-9MrxcopYDau1s7icCoQJxPGYg+x0g86PPMqr4YzKKyzLYl33PbyH2zFwZahGOiUNVfc9itdB1TfXdIU64fBnqQ==} + '@ember/app-blueprint@6.11.0': + resolution: {integrity: sha512-zsY7HqSktkVH9vRup8g0jC8+lvRk0bvEeQ22zUVej5H1WHRZzN70N9nGH3Oibgo/d4qZIZT7WNqktm1ctxDYYQ==} '@eslint-community/eslint-utils@4.4.1': resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} @@ -2763,11 +2763,13 @@ packages: glob@10.4.5: resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true glob@11.0.3: resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==} engines: {node: 20 || >=22} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true glob@13.0.0: @@ -2776,11 +2778,11 @@ packages: glob@5.0.15: resolution: {integrity: sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me global-modules@1.0.0: resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==} @@ -4949,6 +4951,7 @@ packages: tar@6.2.1: resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} + deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me temp@0.9.4: resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==} @@ -5714,7 +5717,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@ember/app-blueprint@6.10.4': + '@ember/app-blueprint@6.11.0': dependencies: chalk: 4.1.2 ejs: 3.1.10 diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index d690a13292..ffb9c24ee1 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -30,17 +30,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", "ember-cli-htmlbars": "^6.3.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/test-setup": "^4.0.0", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -59,24 +59,24 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.11.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json index 55e8e9a6c2..cf3d8484d3 100644 --- a/tests/fixtures/addon/pnpm/package.json +++ b/tests/fixtures/addon/pnpm/package.json @@ -30,17 +30,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", "ember-cli-htmlbars": "^6.3.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/test-setup": "^4.0.0", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -59,7 +59,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.11.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -67,17 +67,17 @@ "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/typescript/package.json b/tests/fixtures/addon/typescript/package.json index 9de8889ccb..7a0b7eb07f 100644 --- a/tests/fixtures/addon/typescript/package.json +++ b/tests/fixtures/addon/typescript/package.json @@ -48,24 +48,24 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", "ember-cli-htmlbars": "^6.3.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/test-setup": "^4.0.0", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -83,27 +83,27 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.11.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "rimraf": "^5.0.10", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.56.0", + "webpack": "^5.105.2" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 8e2aa91f0d..1c28612682 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -30,17 +30,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", "ember-cli-htmlbars": "^6.3.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/test-setup": "^4.0.0", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -59,7 +59,7 @@ "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-source": "~6.11.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", @@ -67,17 +67,17 @@ "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 20766c2a6b..0a9c49fc6b 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -51,29 +51,29 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index f128a2e560..c8b3ef63b7 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,36 +44,36 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-htmlbars": "^6.3.0", "ember-cli-inject-live-reload": "^2.1.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index b5e388971a..8939c26252 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,7 +44,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -52,28 +52,28 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index f07497b5fd..ded74dc225 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,7 +44,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -52,29 +52,29 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index e7e6362990..e929cd6eb8 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,7 +44,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -52,29 +52,29 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index b4a76d020f..9c5dce2f98 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -27,14 +27,14 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", @@ -44,7 +44,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -52,29 +52,29 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index 8702893bec..07892ce4a8 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -50,29 +50,29 @@ "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", "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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 9248e02d15..f790758e6e 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -51,28 +51,28 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 64689de45e..9c9954f9f0 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -51,29 +51,29 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index e41e65a029..c6481cbfcb 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -28,21 +28,21 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -51,38 +51,38 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-htmlbars": "^6.3.0", "ember-cli-inject-live-reload": "^2.1.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.56.0", + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index 9e51445964..df456346c6 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -28,9 +28,9 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember-data/adapter": "~5.7.0", "@ember-data/graph": "~5.7.0", "@ember-data/json-api": "~5.7.0", @@ -45,14 +45,14 @@ "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@embroider/webpack": "^4.1.2", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -62,7 +62,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -70,31 +70,31 @@ "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.56.0", + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index 8ec8509969..f94c62af5d 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -28,18 +28,18 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -48,7 +48,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -57,31 +57,31 @@ "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", "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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.56.0", + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index 8de430d7bd..919afc51f1 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -28,9 +28,9 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember-data/adapter": "~5.7.0", "@ember-data/graph": "~5.7.0", "@ember-data/json-api": "~5.7.0", @@ -43,13 +43,13 @@ "@warp-drive/ember": "~5.7.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.4", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", @@ -59,7 +59,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -69,31 +69,31 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.56.0", + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index f74a4215a0..e8b3ecb281 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -27,12 +27,12 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.19.7", "@eslint/js": "^9.39.2", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", @@ -41,7 +41,7 @@ "ember-auto-import": "^2.12.0", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.0", + "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", @@ -51,29 +51,29 @@ "ember-cli-terser": "^4.0.2", "ember-data": "~5.7.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-beta.1", + "ember-source": "~6.11.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.2" }, "engines": { "node": ">= 20.19" From c9bfeaf67de7f58440f6cc448183ac62544167fe Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 17 Feb 2026 21:34:54 +0000 Subject: [PATCH 31/49] Prepare Stable Release using 'release-plan' --- .release-plan.json | 40 ++++++++++++++++++----- CHANGELOG.md | 16 +++++++++ package.json | 2 +- packages/addon-blueprint/package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- packages/app-blueprint/package.json | 2 +- 6 files changed, 52 insertions(+), 12 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index df4356dd87..f2df725801 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -1,28 +1,52 @@ { "solution": { "ember-cli": { - "impact": "patch", - "oldVersion": "6.10.1", - "newVersion": "6.10.2", + "impact": "minor", + "oldVersion": "6.10.2", + "newVersion": "6.11.0", "tagName": "latest", "constraints": [ + { + "impact": "minor", + "reason": "Appears in changelog section :rocket: Enhancement" + }, { "impact": "patch", - "reason": "Appears in changelog section :bug: Bug Fix" + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" }, { "impact": "patch", - "reason": "Appears in changelog section :house: Internal" + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-addon-blueprint" } ], "pkgJSONPath": "./package.json" }, "@ember-tooling/classic-build-addon-blueprint": { - "oldVersion": "6.10.0" + "impact": "minor", + "oldVersion": "6.10.0", + "newVersion": "6.11.0", + "tagName": "latest", + "constraints": [ + { + "impact": "minor", + "reason": "Appears in changelog section :rocket: Enhancement" + } + ], + "pkgJSONPath": "./packages/addon-blueprint/package.json" }, "@ember-tooling/classic-build-app-blueprint": { - "oldVersion": "6.10.0" + "impact": "minor", + "oldVersion": "6.10.0", + "newVersion": "6.11.0", + "tagName": "latest", + "constraints": [ + { + "impact": "minor", + "reason": "Appears in changelog section :rocket: Enhancement" + } + ], + "pkgJSONPath": "./packages/app-blueprint/package.json" } }, - "description": "## Release (2026-02-09)\n\n* ember-cli 6.10.2 (patch)\n\n#### :bug: Bug Fix\n* `ember-cli`\n * [#10949](https://github.com/ember-cli/ember-cli/pull/10949) [backport release] remove unused isbinaryfile from ember-cli package ([@mansona](https://github.com/mansona))\n * [#10940](https://github.com/ember-cli/ember-cli/pull/10940) [bugfix release] remove fixturify-project from dependencies ([@mansona](https://github.com/mansona))\n\n#### :house: Internal\n* `ember-cli`\n * [#10952](https://github.com/ember-cli/ember-cli/pull/10952) add correct --publish-branch to pnpm publish ([@mansona](https://github.com/mansona))\n * [#10951](https://github.com/ember-cli/ember-cli/pull/10951) Fix PR name for stable release-plan pull request ([@mansona](https://github.com/mansona))\n * [#10950](https://github.com/ember-cli/ember-cli/pull/10950) [backport release] update release-plan for OIDC ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" + "description": "## Release (2026-02-17)\n\n* ember-cli 6.11.0 (minor)\n* @ember-tooling/classic-build-addon-blueprint 6.11.0 (minor)\n* @ember-tooling/classic-build-app-blueprint 6.11.0 (minor)\n\n#### :rocket: Enhancement\n* `ember-cli`, `@ember-tooling/classic-build-app-blueprint`\n * [#10960](https://github.com/ember-cli/ember-cli/pull/10960) Promote Beta and update all dependencies for 6.11 release ([@mansona](https://github.com/mansona))\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10929](https://github.com/ember-cli/ember-cli/pull/10929) Prepare 6.11-beta ([@mansona](https://github.com/mansona))\n * [#10919](https://github.com/ember-cli/ember-cli/pull/10919) Prepare 6.11-alpha ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index f08b93e106..673ca6a7e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # ember-cli Changelog +## Release (2026-02-17) + +* ember-cli 6.11.0 (minor) +* @ember-tooling/classic-build-addon-blueprint 6.11.0 (minor) +* @ember-tooling/classic-build-app-blueprint 6.11.0 (minor) + +#### :rocket: Enhancement +* `ember-cli`, `@ember-tooling/classic-build-app-blueprint` + * [#10960](https://github.com/ember-cli/ember-cli/pull/10960) Promote Beta and update all dependencies for 6.11 release ([@mansona](https://github.com/mansona)) +* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint` + * [#10929](https://github.com/ember-cli/ember-cli/pull/10929) Prepare 6.11-beta ([@mansona](https://github.com/mansona)) + * [#10919](https://github.com/ember-cli/ember-cli/pull/10919) Prepare 6.11-alpha ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + ## Release (2026-02-09) * ember-cli 6.10.2 (patch) diff --git a/package.json b/package.json index c6595e8217..ef27776a0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.10.2", + "version": "6.11.0", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index 035a20cd97..51d8494b1b 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.10.0", + "version": "6.11.0", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 3015d7400f..83ea225567 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.10.2", + "ember-cli": "~6.11.0", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index 819017b93d..3067925f60 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.10.0", + "version": "6.11.0", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", From 5aac57d80818cd90c6380315fe23a9324a9877d3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 12:09:56 +0000 Subject: [PATCH 32/49] Initial plan From 7bb343aaa636bd7bbf0f4e4711cc3817872dadc3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 12:14:24 +0000 Subject: [PATCH 33/49] Replace `temp` package with Node.js built-in `fs.mkdtemp`/`fs.mkdtempSync` - Replace `temp.mkdir()` with `fs.mkdtemp()` in lib/tasks/install-blueprint.js - Replace `temp.mkdirSync()` with `fs.mkdtempSync()` in lib/commands/test.js - Replace `temp.mkdirSync()` with `fs.mkdtempSync()` in test files - Remove `temp` dependency from package.json Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Agent-Logs-Url: https://github.com/ember-cli/ember-cli/sessions/3b87bbe0-9fb7-4e6b-9c1f-184fdaa6ae23 --- lib/commands/test.js | 6 ++---- lib/tasks/install-blueprint.js | 10 ++------- package.json | 1 - pnpm-lock.yaml | 21 ------------------- .../utilities/clean-remove-test.js | 4 ++-- tests/unit/utilities/insert-into-file-test.js | 6 +++--- 6 files changed, 9 insertions(+), 39 deletions(-) diff --git a/lib/commands/test.js b/lib/commands/test.js index c9c22bb765..5dda94ff7d 100644 --- a/lib/commands/test.js +++ b/lib/commands/test.js @@ -4,16 +4,14 @@ const Command = require('../models/command'); const Watcher = require('../models/watcher'); const Builder = require('../models/builder'); const SilentError = require('silent-error'); +const os = require('os'); const path = require('path'); const Win = require('../utilities/windows-admin'); const fs = require('fs'); -const temp = require('temp'); const util = require('util'); const PortFinder = require('portfinder'); let getPort = util.promisify(PortFinder.getPort); -temp.track(); - let defaultPort = 7357; const ClassicOptions = [ @@ -99,7 +97,7 @@ module.exports = Command.extend({ }, tmp() { - return temp.mkdirSync('tests-dist-'); + return fs.mkdtempSync(path.join(os.tmpdir(), 'tests-dist-')); }, _generateCustomConfigs(options) { diff --git a/lib/tasks/install-blueprint.js b/lib/tasks/install-blueprint.js index 0a9237af74..f44c0418ab 100644 --- a/lib/tasks/install-blueprint.js +++ b/lib/tasks/install-blueprint.js @@ -3,8 +3,7 @@ const fs = require('fs-extra'); const Blueprint = require('../models/blueprint'); const Task = require('../models/task'); -const util = require('util'); -const temp = require('temp'); +const os = require('os'); const path = require('path'); const merge = require('lodash/merge'); const { execa } = require('execa'); @@ -17,11 +16,6 @@ const { isExperimentEnabled } = require('@ember-tooling/blueprint-model/utilitie const NOT_FOUND_REGEXP = /npm ERR! 404 {2}'(\S+)' is not in the npm registry/; -// Automatically track and cleanup temp files at exit -temp.track(); - -let mkdirTemp = util.promisify(temp.mkdir); - class InstallBlueprintTask extends Task { async run(options) { let cwd = process.cwd(); @@ -115,7 +109,7 @@ class InstallBlueprintTask extends Task { } _createTempFolder() { - return mkdirTemp('ember-cli'); + return fs.mkdtemp(path.join(os.tmpdir(), 'ember-cli-')); } _resolvePackageJSON(directoryPath) { diff --git a/package.json b/package.json index dadf71c88a..05089b7eef 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,6 @@ "silent-error": "^1.1.1", "sort-package-json": "^3.6.0", "symlink-or-copy": "^1.3.1", - "temp": "0.9.4", "testem": "^3.17.0", "tiny-lr": "^2.0.0", "tree-sync": "^2.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 160a28b0ac..81e013c5f0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -239,9 +239,6 @@ importers: symlink-or-copy: specifier: ^1.3.1 version: 1.3.1 - temp: - specifier: 0.9.4 - version: 0.9.4 testem: specifier: ^3.17.0 version: 3.17.0(bufferutil@4.0.8)(ejs@3.1.10)(handlebars@4.7.8)(underscore@1.13.7)(utf-8-validate@5.0.10) @@ -4476,11 +4473,6 @@ packages: rfdc@1.4.1: resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==} - rimraf@2.6.3: - resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==} - deprecated: Rimraf versions prior to v4 are no longer supported - hasBin: true - rimraf@2.7.1: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} deprecated: Rimraf versions prior to v4 are no longer supported @@ -4957,10 +4949,6 @@ packages: resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} - temp@0.9.4: - resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==} - engines: {node: '>=6.0.0'} - test-exclude@6.0.0: resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} engines: {node: '>=8'} @@ -10139,10 +10127,6 @@ snapshots: rfdc@1.4.1: {} - rimraf@2.6.3: - dependencies: - glob: 7.2.3 - rimraf@2.7.1: dependencies: glob: 7.2.3 @@ -10735,11 +10719,6 @@ snapshots: mkdirp: 1.0.4 yallist: 4.0.0 - temp@0.9.4: - dependencies: - mkdirp: 0.5.6 - rimraf: 2.6.3 - test-exclude@6.0.0: dependencies: '@istanbuljs/schema': 0.1.3 diff --git a/tests/integration/utilities/clean-remove-test.js b/tests/integration/utilities/clean-remove-test.js index 319abef0f9..3a239830ef 100644 --- a/tests/integration/utilities/clean-remove-test.js +++ b/tests/integration/utilities/clean-remove-test.js @@ -2,7 +2,7 @@ const { expect } = require('chai'); const cleanRemove = require('../../../lib/utilities/clean-remove'); -const temp = require('temp'); +const os = require('os'); const path = require('path'); const fs = require('fs-extra'); @@ -13,7 +13,7 @@ describe('clean-remove', function () { let nestedPath = 'nested1/nested2'; beforeEach(function () { - tempDir = temp.mkdirSync('clean-remove'); + tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'clean-remove-')); process.chdir(tempDir); fileInfo = { diff --git a/tests/unit/utilities/insert-into-file-test.js b/tests/unit/utilities/insert-into-file-test.js index a6507cf69c..98d6c3f1a4 100644 --- a/tests/unit/utilities/insert-into-file-test.js +++ b/tests/unit/utilities/insert-into-file-test.js @@ -1,9 +1,9 @@ 'use strict'; const fs = require('fs-extra'); +const os = require('os'); const path = require('path'); -const temp = require('temp'); -const EOL = require('os').EOL; +const EOL = os.EOL; const insertIntoFile = require('../../../lib/utilities/insert-into-file'); const { expect } = require('chai'); @@ -12,7 +12,7 @@ describe('insertIntoFile()', function () { let tempDir, filePath; beforeEach(function () { - tempDir = temp.mkdirSync('insert-into-file-test'); + tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'insert-into-file-test-')); filePath = path.join(tempDir, 'foo-bar-baz.txt'); }); From 4fbaec0ce326f56a99dac3599d671ce1f9ed467f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 18:26:32 +0000 Subject: [PATCH 34/49] Update ember-cli-htmlbars to ^7.0.0 in app-blueprint and fixtures Co-authored-by: kategengler <444218+kategengler@users.noreply.github.com> Agent-Logs-Url: https://github.com/ember-cli/ember-cli/sessions/f9714610-71e7-483f-8487-4986e59917c7 --- packages/app-blueprint/files/package.json | 2 +- tests/fixtures/app/defaults/package.json | 2 +- tests/fixtures/app/embroider-no-ember-data/package.json | 2 +- tests/fixtures/app/embroider-no-welcome/package.json | 2 +- tests/fixtures/app/embroider-pnpm/package.json | 2 +- tests/fixtures/app/embroider-yarn/package.json | 2 +- tests/fixtures/app/embroider/package.json | 2 +- tests/fixtures/app/no-ember-data/package.json | 2 +- tests/fixtures/app/npm/package.json | 2 +- tests/fixtures/app/pnpm/package.json | 2 +- .../app/typescript-embroider-no-ember-data/package.json | 2 +- tests/fixtures/app/typescript-embroider/package.json | 2 +- tests/fixtures/app/typescript-no-ember-data/package.json | 2 +- tests/fixtures/app/typescript/package.json | 2 +- tests/fixtures/app/yarn/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 90882a73f8..9a881f0a8f 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -66,7 +66,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>", diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 0d68756852..66b244de51 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index fff6e71543..80e60500e5 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.3.0", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 83ec78d0be..56a4e8af63 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index 1db87563a3..74f6fed5b2 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index de01f786c8..9b12e17ba8 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index c8f7f38a6d..a7a8c7853a 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index 4bd9dff377..1ede8962f2 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index c2f9840957..3076b02575 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 22a9484f8f..069b750ef3 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index 3a3475e2f1..c3bce92db5 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -55,7 +55,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.3.0", diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index caad721ba0..ed908ec04e 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -66,7 +66,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index cfe42dc08b..53564508a9 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -52,7 +52,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index f3050d5180..3ca4e06dec 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -63,7 +63,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index 9fc368fe2c..0cb9dcbcd3 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", From 315a800d03993c918fa54e8615ddd1b018a2d8c7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 18:39:50 +0000 Subject: [PATCH 35/49] Update ember-cli-htmlbars to ^7.0.0 in addon fixtures Co-authored-by: kategengler <444218+kategengler@users.noreply.github.com> Agent-Logs-Url: https://github.com/ember-cli/ember-cli/sessions/fb9c7b8a-0df0-44ad-b4c5-d29368fa829d --- tests/fixtures/addon/defaults/package.json | 2 +- tests/fixtures/addon/pnpm/package.json | 2 +- tests/fixtures/addon/typescript/package.json | 2 +- tests/fixtures/addon/yarn/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index 3c737e9e6d..7358e90446 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json index 709ae26f50..a42f333bc5 100644 --- a/tests/fixtures/addon/pnpm/package.json +++ b/tests/fixtures/addon/pnpm/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { diff --git a/tests/fixtures/addon/typescript/package.json b/tests/fixtures/addon/typescript/package.json index 5c25e7a61f..d3b20e71d8 100644 --- a/tests/fixtures/addon/typescript/package.json +++ b/tests/fixtures/addon/typescript/package.json @@ -50,7 +50,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index c3f0ab1221..9450b96a62 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { From ecac67b2260d47d7e67bd2d97e72384f793e8fec Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Sat, 28 Mar 2026 14:29:26 -0400 Subject: [PATCH 36/49] Support ember-source (ESM) -- without addon vendor paths Port of https://github.com/ember-cli/ember-cli/pull/10971 to the release branch --- lib/broccoli/ember-app.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js index 267a9ac10b..0de6c2e0d9 100644 --- a/lib/broccoli/ember-app.js +++ b/lib/broccoli/ember-app.js @@ -342,13 +342,15 @@ class EmberApp { this.vendorFiles = omitBy( merge( - { - 'ember.js': { - development: emberSource.paths.debug, - production: emberSource.paths.prod, - }, - 'ember-testing.js': [emberSource.paths.testing, { type: 'test' }], - }, + emberSource.paths + ? { + 'ember.js': { + development: emberSource.paths.debug, + production: emberSource.paths.prod, + }, + 'ember-testing.js': [emberSource.paths.testing, { type: 'test' }], + } + : {}, this.options.vendorFiles ), isNull From bed8202c2db229a760ef1bb8bb27f314332b4113 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Fri, 30 Jan 2026 14:34:04 -0500 Subject: [PATCH 37/49] Remove tracked-built-ins (it comes built in with ember-source 6.8+) --- packages/app-blueprint/files/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 83ea225567..2bbd7d260d 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -92,8 +92,7 @@ "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", - "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0<% if (typescript) { %>", + "stylelint-config-standard": "^36.0.1<% if (typescript) { %>", "typescript": "^5.9.3", "typescript-eslint": "^8.56.0<% } %>", "webpack": "^5.105.2" From 474daeea3952dc928d7b7342fd27babe1d1d11ba Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Fri, 30 Jan 2026 14:37:09 -0500 Subject: [PATCH 38/49] Update fixtures --- packages/addon-blueprint/index.js | 4 ---- tests/fixtures/app/defaults/package.json | 1 - tests/fixtures/app/embroider-no-ember-data/package.json | 1 - tests/fixtures/app/embroider-no-welcome/package.json | 1 - tests/fixtures/app/embroider-pnpm/package.json | 1 - tests/fixtures/app/embroider-yarn/package.json | 1 - tests/fixtures/app/embroider/package.json | 1 - tests/fixtures/app/no-ember-data/package.json | 1 - tests/fixtures/app/npm/package.json | 1 - tests/fixtures/app/pnpm/package.json | 1 - .../app/typescript-embroider-no-ember-data/package.json | 1 - tests/fixtures/app/typescript-embroider/package.json | 1 - tests/fixtures/app/typescript-no-ember-data/package.json | 1 - tests/fixtures/app/typescript/package.json | 1 - .../app/with-blueprint-override-lint-fail/package.json | 3 +-- tests/fixtures/app/yarn/package.json | 1 - 16 files changed, 1 insertion(+), 20 deletions(-) diff --git a/packages/addon-blueprint/index.js b/packages/addon-blueprint/index.js index e6fea7bc89..ebb33fec64 100644 --- a/packages/addon-blueprint/index.js +++ b/packages/addon-blueprint/index.js @@ -90,10 +90,6 @@ module.exports = { // @see https://github.com/emberjs/rfcs/blob/master/text/0811-element-modifiers.md#detailed-design delete contents.devDependencies['ember-modifier']; - // Per RFC #812, addons should not have this dependency. - // @see https://github.com/emberjs/rfcs/blob/master/text/0812-tracked-built-ins.md#detailed-design - delete contents.devDependencies['tracked-built-ins']; - // 100% of addons don't need ember-cli-app-version, make it opt-in instead delete contents.devDependencies['ember-cli-app-version']; diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 0a9c49fc6b..43c3f04dc5 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index c8b3ef63b7..8842b1af80 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 8939c26252..d5fd8b8931 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index ded74dc225..e0339a4cd8 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -73,7 +73,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index e929cd6eb8..3aad673d8f 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -73,7 +73,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 9c5dce2f98..eae38bab1a 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -73,7 +73,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index 07892ce4a8..37110292e2 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -71,7 +71,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index f790758e6e..8712ac7d3c 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -71,7 +71,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 9c9954f9f0..8d0dbf3122 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index c6481cbfcb..55ed56cece 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -79,7 +79,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.56.0", "webpack": "^5.105.2" diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index df456346c6..4b274dfa6c 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -91,7 +91,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.56.0", "webpack": "^5.105.2" diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index f94c62af5d..7594199e86 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -78,7 +78,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.56.0", "webpack": "^5.105.2" diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index 919afc51f1..98fd5063cc 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -90,7 +90,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.56.0", "webpack": "^5.105.2" diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json index ed74176c60..593d8a188c 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -66,8 +66,7 @@ "qunit-dom": "^1.6.0", "stylelint": "^16.10.0", "stylelint-config-standard": "^36.0.1", - "stylelint-prettier": "^5.0.2", - "tracked-built-ins": "^3.1.0" + "stylelint-prettier": "^5.0.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index e8b3ecb281..4729595ebd 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -72,7 +72,6 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "webpack": "^5.105.2" }, "engines": { From 87f1ac471c065e909d2dd005b6f528184c6b77a2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 18:26:32 +0000 Subject: [PATCH 39/49] Update ember-cli-htmlbars to ^7.0.0 in app-blueprint and fixtures Co-authored-by: kategengler <444218+kategengler@users.noreply.github.com> Agent-Logs-Url: https://github.com/ember-cli/ember-cli/sessions/f9714610-71e7-483f-8487-4986e59917c7 --- packages/app-blueprint/files/package.json | 2 +- tests/fixtures/app/defaults/package.json | 2 +- tests/fixtures/app/embroider-no-ember-data/package.json | 2 +- tests/fixtures/app/embroider-no-welcome/package.json | 2 +- tests/fixtures/app/embroider-pnpm/package.json | 2 +- tests/fixtures/app/embroider-yarn/package.json | 2 +- tests/fixtures/app/embroider/package.json | 2 +- tests/fixtures/app/no-ember-data/package.json | 2 +- tests/fixtures/app/npm/package.json | 2 +- tests/fixtures/app/pnpm/package.json | 2 +- .../app/typescript-embroider-no-ember-data/package.json | 2 +- tests/fixtures/app/typescript-embroider/package.json | 2 +- tests/fixtures/app/typescript-no-ember-data/package.json | 2 +- tests/fixtures/app/typescript/package.json | 2 +- tests/fixtures/app/yarn/package.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 83ea225567..11cc7a51ff 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -66,7 +66,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>", diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 0a9c49fc6b..2a6c294f1e 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index c8b3ef63b7..7fc4c8ef94 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.3.0", diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 8939c26252..4f62c48907 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index ded74dc225..03e84ae1eb 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index e929cd6eb8..3dbcc6b300 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 9c5dce2f98..63f6c24c79 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -48,7 +48,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index 07892ce4a8..0add273f76 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index f790758e6e..0bd70eeec2 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 9c9954f9f0..2d64338b1e 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index c6481cbfcb..1832be1588 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -55,7 +55,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.3.0", diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index df456346c6..9b0fb0aa31 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -66,7 +66,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-data": "~5.7.0", "ember-load-initializers": "^3.0.1", diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index f94c62af5d..513c5cbb0c 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -52,7 +52,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index 919afc51f1..44038713a6 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -63,7 +63,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index e8b3ecb281..c19a3cad58 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -45,7 +45,7 @@ "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", From e066f54178330bac46edd3bbf1b8573844270d5c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 24 Mar 2026 18:39:50 +0000 Subject: [PATCH 40/49] Update ember-cli-htmlbars to ^7.0.0 in addon fixtures Co-authored-by: kategengler <444218+kategengler@users.noreply.github.com> Agent-Logs-Url: https://github.com/ember-cli/ember-cli/sessions/fb9c7b8a-0df0-44ad-b4c5-d29368fa829d --- tests/fixtures/addon/defaults/package.json | 2 +- tests/fixtures/addon/pnpm/package.json | 2 +- tests/fixtures/addon/typescript/package.json | 2 +- tests/fixtures/addon/yarn/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index ffb9c24ee1..6ca0274c7d 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json index cf3d8484d3..5892b3a994 100644 --- a/tests/fixtures/addon/pnpm/package.json +++ b/tests/fixtures/addon/pnpm/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { diff --git a/tests/fixtures/addon/typescript/package.json b/tests/fixtures/addon/typescript/package.json index 7a0b7eb07f..49a903d106 100644 --- a/tests/fixtures/addon/typescript/package.json +++ b/tests/fixtures/addon/typescript/package.json @@ -50,7 +50,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 1c28612682..070a8180a3 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^6.3.0", + "ember-cli-htmlbars": "^7.0.0", "ember-template-imports": "^4.4.0" }, "devDependencies": { From 5b7095e73e726aa854c8647e0b32417d68caba1a Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 29 Mar 2026 00:18:54 +0000 Subject: [PATCH 41/49] Prepare Stable Release using 'release-plan' --- .release-plan.json | 34 +++++++++++------------ CHANGELOG.md | 18 ++++++++++++ package.json | 2 +- packages/addon-blueprint/package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- packages/app-blueprint/package.json | 2 +- 6 files changed, 39 insertions(+), 21 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index f2df725801..a00091b4b6 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -1,18 +1,18 @@ { "solution": { "ember-cli": { - "impact": "minor", - "oldVersion": "6.10.2", - "newVersion": "6.11.0", + "impact": "patch", + "oldVersion": "6.11.0", + "newVersion": "6.11.1", "tagName": "latest", "constraints": [ { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" + "impact": "patch", + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" }, { "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" + "reason": "Appears in changelog section :bug: Bug Fix" }, { "impact": "patch", @@ -22,31 +22,31 @@ "pkgJSONPath": "./package.json" }, "@ember-tooling/classic-build-addon-blueprint": { - "impact": "minor", - "oldVersion": "6.10.0", - "newVersion": "6.11.0", + "impact": "patch", + "oldVersion": "6.11.0", + "newVersion": "6.11.1", "tagName": "latest", "constraints": [ { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" + "impact": "patch", + "reason": "Appears in changelog section :bug: Bug Fix" } ], "pkgJSONPath": "./packages/addon-blueprint/package.json" }, "@ember-tooling/classic-build-app-blueprint": { - "impact": "minor", - "oldVersion": "6.10.0", - "newVersion": "6.11.0", + "impact": "patch", + "oldVersion": "6.11.0", + "newVersion": "6.11.1", "tagName": "latest", "constraints": [ { - "impact": "minor", - "reason": "Appears in changelog section :rocket: Enhancement" + "impact": "patch", + "reason": "Appears in changelog section :bug: Bug Fix" } ], "pkgJSONPath": "./packages/app-blueprint/package.json" } }, - "description": "## Release (2026-02-17)\n\n* ember-cli 6.11.0 (minor)\n* @ember-tooling/classic-build-addon-blueprint 6.11.0 (minor)\n* @ember-tooling/classic-build-app-blueprint 6.11.0 (minor)\n\n#### :rocket: Enhancement\n* `ember-cli`, `@ember-tooling/classic-build-app-blueprint`\n * [#10960](https://github.com/ember-cli/ember-cli/pull/10960) Promote Beta and update all dependencies for 6.11 release ([@mansona](https://github.com/mansona))\n* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10929](https://github.com/ember-cli/ember-cli/pull/10929) Prepare 6.11-beta ([@mansona](https://github.com/mansona))\n * [#10919](https://github.com/ember-cli/ember-cli/pull/10919) Prepare 6.11-alpha ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n" + "description": "## Release (2026-03-29)\n\n* ember-cli 6.11.1 (patch)\n* @ember-tooling/classic-build-addon-blueprint 6.11.1 (patch)\n* @ember-tooling/classic-build-app-blueprint 6.11.1 (patch)\n\n#### :bug: Bug Fix\n* `@ember-tooling/classic-build-app-blueprint`, `ember-cli`\n * [#10975](https://github.com/ember-cli/ember-cli/pull/10975) Backport: Update ember-cli-htmlbars to ^7.0.0 in app-blueprint ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli`\n * [#10974](https://github.com/ember-cli/ember-cli/pull/10974) Backport: Remove tracked-built-ins (it comes built in with ember-source 6.8+) ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n* `ember-cli`\n * [#10972](https://github.com/ember-cli/ember-cli/pull/10972) Support ember-source (ESM) -- without addon vendor paths ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 2\n- NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 673ca6a7e3..96fc98434e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # ember-cli Changelog +## Release (2026-03-29) + +* ember-cli 6.11.1 (patch) +* @ember-tooling/classic-build-addon-blueprint 6.11.1 (patch) +* @ember-tooling/classic-build-app-blueprint 6.11.1 (patch) + +#### :bug: Bug Fix +* `@ember-tooling/classic-build-app-blueprint`, `ember-cli` + * [#10975](https://github.com/ember-cli/ember-cli/pull/10975) Backport: Update ember-cli-htmlbars to ^7.0.0 in app-blueprint ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) +* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli` + * [#10974](https://github.com/ember-cli/ember-cli/pull/10974) Backport: Remove tracked-built-ins (it comes built in with ember-source 6.8+) ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) +* `ember-cli` + * [#10972](https://github.com/ember-cli/ember-cli/pull/10972) Support ember-source (ESM) -- without addon vendor paths ([@NullVoxPopuli](https://github.com/NullVoxPopuli)) + +#### Committers: 2 +- NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) +- [@NullVoxPopuli](https://github.com/NullVoxPopuli) + ## Release (2026-02-17) * ember-cli 6.11.0 (minor) diff --git a/package.json b/package.json index ef27776a0d..9c83d50412 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.11.0", + "version": "6.11.1", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index 51d8494b1b..1710ab4ee5 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.11.0", + "version": "6.11.1", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 30f375e363..ee2e19ce0a 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.11.0", + "ember-cli": "~6.11.1", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index 3067925f60..1bda458c7d 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.11.0", + "version": "6.11.1", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", From 7e5c09f234d9dc61048c166cf2db851bfc5ee3f4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 29 Mar 2026 00:47:07 +0000 Subject: [PATCH 42/49] Add use-ember-modules: true to blueprint optional-features.json Agent-Logs-Url: https://github.com/ember-cli/ember-cli/sessions/c17b92cc-f6fb-4755-89c5-9e9e20828af8 Co-authored-by: kategengler <444218+kategengler@users.noreply.github.com> --- packages/addon-blueprint/files/config/optional-features.json | 3 ++- packages/app-blueprint/files/config/optional-features.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addon-blueprint/files/config/optional-features.json b/packages/addon-blueprint/files/config/optional-features.json index b26286e2ec..f84cd7eed7 100644 --- a/packages/addon-blueprint/files/config/optional-features.json +++ b/packages/addon-blueprint/files/config/optional-features.json @@ -2,5 +2,6 @@ "application-template-wrapper": false, "default-async-observers": true, "jquery-integration": false, - "template-only-glimmer-components": true + "template-only-glimmer-components": true, + "use-ember-modules": true } diff --git a/packages/app-blueprint/files/config/optional-features.json b/packages/app-blueprint/files/config/optional-features.json index 5329dd9913..756228612b 100644 --- a/packages/app-blueprint/files/config/optional-features.json +++ b/packages/app-blueprint/files/config/optional-features.json @@ -3,5 +3,6 @@ "default-async-observers": true, "jquery-integration": false, "template-only-glimmer-components": true, - "no-implicit-route-model": true + "no-implicit-route-model": true, + "use-ember-modules": true } From 8a1474d19b73fc744961243b19e49b4155657ec5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 29 Mar 2026 00:47:07 +0000 Subject: [PATCH 43/49] Add use-ember-modules: true to blueprint optional-features.json Agent-Logs-Url: https://github.com/ember-cli/ember-cli/sessions/c17b92cc-f6fb-4755-89c5-9e9e20828af8 Co-authored-by: kategengler <444218+kategengler@users.noreply.github.com> --- packages/addon-blueprint/files/config/optional-features.json | 3 ++- packages/app-blueprint/files/config/optional-features.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addon-blueprint/files/config/optional-features.json b/packages/addon-blueprint/files/config/optional-features.json index b26286e2ec..f84cd7eed7 100644 --- a/packages/addon-blueprint/files/config/optional-features.json +++ b/packages/addon-blueprint/files/config/optional-features.json @@ -2,5 +2,6 @@ "application-template-wrapper": false, "default-async-observers": true, "jquery-integration": false, - "template-only-glimmer-components": true + "template-only-glimmer-components": true, + "use-ember-modules": true } diff --git a/packages/app-blueprint/files/config/optional-features.json b/packages/app-blueprint/files/config/optional-features.json index 5329dd9913..756228612b 100644 --- a/packages/app-blueprint/files/config/optional-features.json +++ b/packages/app-blueprint/files/config/optional-features.json @@ -3,5 +3,6 @@ "default-async-observers": true, "jquery-integration": false, "template-only-glimmer-components": true, - "no-implicit-route-model": true + "no-implicit-route-model": true, + "use-ember-modules": true } From 7aa1f3da794bf16e6152bc1d97fb9804c1fcb7be Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 29 Mar 2026 03:37:18 +0100 Subject: [PATCH 44/49] Prepare Stable Release using 'release-plan' --- .release-plan.json | 22 +++++++++------------- CHANGELOG.md | 13 +++++++++++++ package.json | 2 +- packages/addon-blueprint/package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- packages/app-blueprint/package.json | 2 +- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.release-plan.json b/.release-plan.json index a00091b4b6..bbc34da72d 100644 --- a/.release-plan.json +++ b/.release-plan.json @@ -2,29 +2,25 @@ "solution": { "ember-cli": { "impact": "patch", - "oldVersion": "6.11.0", - "newVersion": "6.11.1", + "oldVersion": "6.11.1", + "newVersion": "6.11.2", "tagName": "latest", "constraints": [ { "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" - }, - { - "impact": "patch", - "reason": "Appears in changelog section :bug: Bug Fix" + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-addon-blueprint" }, { "impact": "patch", - "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-addon-blueprint" + "reason": "Has dependency `workspace:*` on @ember-tooling/classic-build-app-blueprint" } ], "pkgJSONPath": "./package.json" }, "@ember-tooling/classic-build-addon-blueprint": { "impact": "patch", - "oldVersion": "6.11.0", - "newVersion": "6.11.1", + "oldVersion": "6.11.1", + "newVersion": "6.11.2", "tagName": "latest", "constraints": [ { @@ -36,8 +32,8 @@ }, "@ember-tooling/classic-build-app-blueprint": { "impact": "patch", - "oldVersion": "6.11.0", - "newVersion": "6.11.1", + "oldVersion": "6.11.1", + "newVersion": "6.11.2", "tagName": "latest", "constraints": [ { @@ -48,5 +44,5 @@ "pkgJSONPath": "./packages/app-blueprint/package.json" } }, - "description": "## Release (2026-03-29)\n\n* ember-cli 6.11.1 (patch)\n* @ember-tooling/classic-build-addon-blueprint 6.11.1 (patch)\n* @ember-tooling/classic-build-app-blueprint 6.11.1 (patch)\n\n#### :bug: Bug Fix\n* `@ember-tooling/classic-build-app-blueprint`, `ember-cli`\n * [#10975](https://github.com/ember-cli/ember-cli/pull/10975) Backport: Update ember-cli-htmlbars to ^7.0.0 in app-blueprint ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli`\n * [#10974](https://github.com/ember-cli/ember-cli/pull/10974) Backport: Remove tracked-built-ins (it comes built in with ember-source 6.8+) ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n* `ember-cli`\n * [#10972](https://github.com/ember-cli/ember-cli/pull/10972) Support ember-source (ESM) -- without addon vendor paths ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 2\n- NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n" + "description": "## Release (2026-03-29)\n\n* ember-cli 6.11.2 (patch)\n* @ember-tooling/classic-build-addon-blueprint 6.11.2 (patch)\n* @ember-tooling/classic-build-app-blueprint 6.11.2 (patch)\n\n#### :bug: Bug Fix\n* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`\n * [#10977](https://github.com/ember-cli/ember-cli/pull/10977) Backport: Enable use-ember-modules in blueprint optional-features.json ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n\n#### Committers: 1\n- NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent))\n" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 96fc98434e..b707be94b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ ## Release (2026-03-29) +* ember-cli 6.11.2 (patch) +* @ember-tooling/classic-build-addon-blueprint 6.11.2 (patch) +* @ember-tooling/classic-build-app-blueprint 6.11.2 (patch) + +#### :bug: Bug Fix +* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint` + * [#10977](https://github.com/ember-cli/ember-cli/pull/10977) Backport: Enable use-ember-modules in blueprint optional-features.json ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) + +#### Committers: 1 +- NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) + +## Release (2026-03-29) + * ember-cli 6.11.1 (patch) * @ember-tooling/classic-build-addon-blueprint 6.11.1 (patch) * @ember-tooling/classic-build-app-blueprint 6.11.1 (patch) diff --git a/package.json b/package.json index 9c83d50412..1c5c1c295b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.11.1", + "version": "6.11.2", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index 1710ab4ee5..e3a708c601 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.11.1", + "version": "6.11.2", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index ee2e19ce0a..70a46364d7 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -60,7 +60,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.11.1", + "ember-cli": "~6.11.2", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index 1bda458c7d..bea1addb10 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.11.1", + "version": "6.11.2", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", From 8cf2969471f0ac1ccdc00a51f78dd40d3b7bb224 Mon Sep 17 00:00:00 2001 From: Katie Gengler Date: Tue, 31 Mar 2026 11:47:25 -0400 Subject: [PATCH 45/49] Update publish.yml to use PAT so that output repos workflow will run --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c6f9721439..9e485eb9c3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -48,4 +48,4 @@ jobs: pnpm release-plan publish --github-prerelease fi env: - GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} + GITHUB_AUTH: ${{ secrets.RELEASE_PLAN_GH_PAT }} From da1db28fbb41ae8d35178aa3ba5ce9669684fa48 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 3 Apr 2026 23:35:58 +0100 Subject: [PATCH 46/49] bump node on publish.yml and stop updating npm --- .github/workflows/publish.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9e485eb9c3..b8d1bf34a2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,10 +32,9 @@ jobs: - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v6 with: - node-version: 22 + node-version: 24 registry-url: "https://registry.npmjs.org" cache: pnpm - - run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC - run: pnpm install --frozen-lockfile - name: Publish to NPM # pass --github-prerelease when we are only branch other than release From cbe2b0ab71f9f2c2a64f9e05435c1a9080f9ef99 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Fri, 3 Apr 2026 23:58:36 +0100 Subject: [PATCH 47/49] update versions --- packages/addon-blueprint/package.json | 2 +- packages/app-blueprint/files/package.json | 2 +- packages/app-blueprint/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index a9eedbe071..752f58f80b 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.12.0-alpha.3", + "version": "6.12.0-beta.0", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index c2c73cf414..7712624cef 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -64,7 +64,7 @@ "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", "ember-auto-import": "^2.12.0", - "ember-cli": "~6.11.2", + "ember-cli": "~6.12.0-beta.0", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index f494b78e87..72f1263d96 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.12.0-alpha.3", + "version": "6.12.0-beta.0", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", From 884f0051943d32bcd913ab1f42f87faf277ed01a Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 4 Apr 2026 22:46:20 +0100 Subject: [PATCH 48/49] update blueprint dependencies to beta --- package.json | 2 +- packages/app-blueprint/files/package.json | 57 +++++++------- pnpm-lock.yaml | 75 +++++++++---------- tests/fixtures/addon/defaults/package.json | 18 ++--- tests/fixtures/addon/pnpm/package.json | 18 ++--- tests/fixtures/addon/typescript/package.json | 22 +++--- tests/fixtures/addon/yarn/package.json | 18 ++--- tests/fixtures/app/defaults/package.json | 20 ++--- .../app/embroider-no-ember-data/package.json | 18 ++--- .../app/embroider-no-welcome/package.json | 20 ++--- .../fixtures/app/embroider-pnpm/package.json | 20 ++--- .../fixtures/app/embroider-yarn/package.json | 20 ++--- tests/fixtures/app/embroider/package.json | 20 ++--- tests/fixtures/app/no-ember-data/package.json | 18 ++--- tests/fixtures/app/npm/package.json | 20 ++--- tests/fixtures/app/pnpm/package.json | 20 ++--- .../package.json | 22 +++--- .../app/typescript-embroider/package.json | 46 ++++++------ .../app/typescript-no-ember-data/package.json | 22 +++--- tests/fixtures/app/typescript/package.json | 46 ++++++------ tests/fixtures/app/yarn/package.json | 20 ++--- 21 files changed, 268 insertions(+), 274 deletions(-) diff --git a/package.json b/package.json index f49cf95edf..1767a7c462 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "@ember-tooling/blueprint-model": "^0.5.0", "@ember-tooling/classic-build-addon-blueprint": "workspace:*", "@ember-tooling/classic-build-app-blueprint": "workspace:*", - "@ember/app-blueprint": "~6.12.0-alpha.1", + "@ember/app-blueprint": "~6.12.0-beta.1", "@pnpm/find-workspace-dir": "^1000.1.3", "babel-remove-types": "^1.0.2", "broccoli": "^4.0.0", diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 7712624cef..95e402c267 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -31,65 +31,64 @@ "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", "@babel/plugin-proposal-decorators": "^7.29.0<% if (typescript && emberData) { %>", - "@ember-data/adapter": "~5.7.0", - "@ember-data/graph": "~5.7.0", - "@ember-data/json-api": "~5.7.0", - "@ember-data/legacy-compat": "~5.7.0", - "@ember-data/model": "~5.7.0", - "@ember-data/request": "~5.7.0", - "@ember-data/request-utils": "~5.7.0", - "@ember-data/serializer": "~5.7.0", - "@ember-data/store": "~5.7.0", - "@warp-drive/ember": "~5.7.0<% } %>", + "@ember-data/adapter": "~5.8.1", + "@ember-data/graph": "~5.8.1", + "@ember-data/json-api": "~5.8.1", + "@ember-data/legacy-compat": "~5.8.1", + "@ember-data/model": "~5.8.1", + "@ember-data/request": "~5.8.1", + "@ember-data/request-utils": "~5.8.1", + "@ember-data/serializer": "~5.8.1", + "@ember-data/store": "~5.8.1", + "@warp-drive/ember": "~5.8.1", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1<% if (embroider) { %>", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9<% } %>", - "@embroider/macros": "^1.19.7<% if (embroider) { %>", + "@embroider/macros": "^1.20.2<% if (embroider) { %>", "@embroider/webpack": "^4.1.2<% } %>", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2<% if (typescript) { %>", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.4", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>", - "@warp-drive/core": "~5.8.0", - "@warp-drive/ember": "~5.8.0", - "@warp-drive/json-api": "~5.8.0", - "@warp-drive/legacy": "~5.8.0", - "@warp-drive/utilities": "~5.8.0<% } %>", + "@warp-drive/core": "~5.8.1", + "@warp-drive/json-api": "~5.8.1", + "@warp-drive/legacy": "~5.8.1", + "@warp-drive/utilities": "~5.8.1<% } %>", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~6.12.0-beta.0", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>", - "ember-data": "~5.7.0<% } %>", + "ember-data": "~5.8.1<% } %>", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0<% if (welcome) { %>", "ember-welcome-page": "^7.0.2<% } %>", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", + "eslint-plugin-n": "^17.24.0", "eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>", - "eslint-plugin-warp-drive": "^5.8.0<% } %>", + "eslint-plugin-warp-drive": "^5.8.1<% } %>", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", @@ -99,8 +98,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1<% if (typescript) { %>", "typescript": "^5.9.3", - "typescript-eslint": "^8.56.0<% } %>", - "webpack": "^5.105.2" + "typescript-eslint": "^8.58.0<% } %>", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b64b94e95..38ddcd9d75 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,11 +9,11 @@ importers: .: dependencies: '@ember-tooling/blueprint-blueprint': - specifier: workspace:* - version: link:packages/blueprint-blueprint + specifier: ^0.2.1 + version: 0.2.1 '@ember-tooling/blueprint-model': - specifier: workspace:* - version: link:packages/blueprint-model + specifier: ^0.5.0 + version: 0.5.0 '@ember-tooling/classic-build-addon-blueprint': specifier: workspace:* version: link:packages/addon-blueprint @@ -21,8 +21,8 @@ importers: specifier: workspace:* version: link:packages/app-blueprint '@ember/app-blueprint': - specifier: ~6.12.0-alpha.1 - version: 6.12.0-alpha.1 + specifier: ~6.12.0-beta.1 + version: 6.12.0-beta.1 '@pnpm/find-workspace-dir': specifier: ^1000.1.3 version: 1000.1.3 @@ -361,8 +361,8 @@ importers: packages/addon-blueprint: dependencies: '@ember-tooling/blueprint-model': - specifier: workspace:* - version: link:../blueprint-model + specifier: ^0.5.0 + version: 0.5.0 chalk: specifier: ^5.6.2 version: 5.6.2 @@ -391,8 +391,8 @@ importers: packages/app-blueprint: dependencies: '@ember-tooling/blueprint-model': - specifier: workspace:* - version: link:../blueprint-model + specifier: ^0.5.0 + version: 0.5.0 chalk: specifier: ^5.6.2 version: 5.6.2 @@ -400,32 +400,6 @@ importers: specifier: ^1.1.0 version: 1.1.0 - packages/blueprint-blueprint: {} - - packages/blueprint-model: - dependencies: - chalk: - specifier: ^5.6.2 - version: 5.6.2 - diff: - specifier: ^7.0.0 - version: 7.0.0 - isbinaryfile: - specifier: ^5.0.7 - version: 5.0.7 - lodash: - specifier: ^4.17.23 - version: 4.17.23 - promise.hash.helper: - specifier: ^1.0.8 - version: 1.0.8 - quick-temp: - specifier: ^0.1.9 - version: 0.1.9 - silent-error: - specifier: ^1.1.1 - version: 1.1.1 - packages: '@ampproject/remapping@2.3.0': @@ -550,8 +524,14 @@ packages: engines: {node: '>=0.1.95'} hasBin: true - '@ember/app-blueprint@6.12.0-alpha.1': - resolution: {integrity: sha512-dn/Ht8X7PMxCi571D/oB/576kZgDt40/hD3jIb1Tx0wM/ZBoh/9wiSVmP44CDM1IqsKMCjE1TGmKt7ph+oZkng==} + '@ember-tooling/blueprint-blueprint@0.2.1': + resolution: {integrity: sha512-eZ5qicL3gfFFbmzLaSiEWPSmoRUJGnqg+dQmU0R81vv+0Ni7W/cS7MXx1l4HpN9B7Yg4M9GgdQTkeJnb6abQug==} + + '@ember-tooling/blueprint-model@0.5.0': + resolution: {integrity: sha512-2zAebSmmzpUO2wt6EyfX5TlcmvB9cTkteuZ3QhPmXLMthUpU5nUifcz3hlYcXPK7WM0HdO9qL4GdGQCoxhzaGg==} + + '@ember/app-blueprint@6.12.0-beta.1': + resolution: {integrity: sha512-lJKO+eKewS4KwyJiP2hgToLuPD051WGwz+uyt28BFMDOew2N3MM1CTwdbW0I1I7FXLjdCzoTRQDYlnk1F2Vn3w==} '@eslint-community/eslint-utils@4.4.1': resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} @@ -975,6 +955,7 @@ packages: '@xmldom/xmldom@0.8.10': resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==} engines: {node: '>=10.0.0'} + deprecated: this version has critical issues, please update to the latest version abab@2.0.6: resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==} @@ -5694,12 +5675,26 @@ snapshots: exec-sh: 0.3.6 minimist: 1.2.8 - '@ember/app-blueprint@6.12.0-alpha.1': + '@ember-tooling/blueprint-blueprint@0.2.1': {} + + '@ember-tooling/blueprint-model@0.5.0': + dependencies: + chalk: 4.1.2 + diff: 7.0.0 + isbinaryfile: 5.0.7 + lodash: 4.17.23 + promise.hash.helper: 1.0.8 + quick-temp: 0.1.9 + silent-error: 1.1.1 + transitivePeerDependencies: + - supports-color + + '@ember/app-blueprint@6.12.0-beta.1': dependencies: chalk: 4.1.2 ejs: 3.1.10 ember-cli-string-utils: 1.1.0 - lodash: 4.17.21 + lodash: 4.17.23 sort-package-json: 3.6.0 walk-sync: 3.0.0 diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index 6ca0274c7d..18367c97c0 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-template-imports": "^4.4.0" }, "devDependencies": { @@ -40,17 +40,17 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/test-setup": "^4.0.0", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -58,12 +58,12 @@ "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -76,7 +76,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json index 5892b3a994..e42ae2d771 100644 --- a/tests/fixtures/addon/pnpm/package.json +++ b/tests/fixtures/addon/pnpm/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-template-imports": "^4.4.0" }, "devDependencies": { @@ -40,17 +40,17 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/test-setup": "^4.0.0", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -58,13 +58,13 @@ "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -77,7 +77,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/typescript/package.json b/tests/fixtures/addon/typescript/package.json index 49a903d106..64e7885d2a 100644 --- a/tests/fixtures/addon/typescript/package.json +++ b/tests/fixtures/addon/typescript/package.json @@ -50,7 +50,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-template-imports": "^4.4.0" }, "devDependencies": { @@ -58,23 +58,23 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/test-setup": "^4.0.0", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.4", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -82,12 +82,12 @@ "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -102,8 +102,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.56.0", - "webpack": "^5.105.2" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 070a8180a3..f674bdea9c 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -32,7 +32,7 @@ "dependencies": { "@babel/core": "^7.29.0", "ember-cli-babel": "^8.3.1", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-template-imports": "^4.4.0" }, "devDependencies": { @@ -40,17 +40,17 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/test-setup": "^4.0.0", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -58,13 +58,13 @@ "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -77,7 +77,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 6aefa72239..5f4f607558 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -32,34 +32,34 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index 2489c09c61..51636a2f0a 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -34,32 +34,32 @@ "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index 4df2bc7c5e..ff67a39f23 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -34,32 +34,32 @@ "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index 7cd5a62413..fe9eca5129 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -34,33 +34,33 @@ "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -73,7 +73,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index c209f70c49..5b70f14dbe 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -34,33 +34,33 @@ "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -73,7 +73,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index 834ced2092..63ea5b1bcc 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -34,33 +34,33 @@ "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -73,7 +73,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index e1b403e182..651d5ec16d 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -32,20 +32,20 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -53,12 +53,12 @@ "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -71,7 +71,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index b7219274ea..480869c122 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -32,33 +32,33 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -71,7 +71,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 697eba9ce0..45754159f9 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -32,34 +32,34 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index c122b52aef..241cbcc570 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -35,38 +35,38 @@ "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.4", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -80,8 +80,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.56.0", - "webpack": "^5.105.2" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index ec210e7717..0716910baa 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -31,54 +31,54 @@ "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", "@babel/plugin-proposal-decorators": "^7.29.0", - "@ember-data/adapter": "~5.7.0", - "@ember-data/graph": "~5.7.0", - "@ember-data/json-api": "~5.7.0", - "@ember-data/legacy-compat": "~5.7.0", - "@ember-data/model": "~5.7.0", - "@ember-data/request": "~5.7.0", - "@ember-data/request-utils": "~5.7.0", - "@ember-data/serializer": "~5.7.0", - "@ember-data/store": "~5.7.0", - "@warp-drive/ember": "~5.7.0", + "@ember-data/adapter": "~5.8.1", + "@ember-data/graph": "~5.8.1", + "@ember-data/json-api": "~5.8.1", + "@ember-data/legacy-compat": "~5.8.1", + "@ember-data/model": "~5.8.1", + "@ember-data/request": "~5.8.1", + "@ember-data/request-utils": "~5.8.1", + "@ember-data/serializer": "~5.8.1", + "@ember-data/store": "~5.8.1", + "@warp-drive/ember": "~5.8.1", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.7", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.4", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", - "@warp-drive/core-types": "~5.7.0", + "@warp-drive/core-types": "~5.8.1", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -92,8 +92,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.56.0", - "webpack": "^5.105.2" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index 94e5487489..61a872f686 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -33,26 +33,26 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.4", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", @@ -60,12 +60,12 @@ "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -79,8 +79,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.56.0", - "webpack": "^5.105.2" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index 8afddedf48..594e00dbb8 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -31,53 +31,53 @@ "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", "@babel/plugin-proposal-decorators": "^7.29.0", - "@ember-data/adapter": "~5.7.0", - "@ember-data/graph": "~5.7.0", - "@ember-data/json-api": "~5.7.0", - "@ember-data/legacy-compat": "~5.7.0", - "@ember-data/model": "~5.7.0", - "@ember-data/request": "~5.7.0", - "@ember-data/request-utils": "~5.7.0", - "@ember-data/serializer": "~5.7.0", - "@ember-data/store": "~5.7.0", - "@warp-drive/ember": "~5.7.0", + "@ember-data/adapter": "~5.8.1", + "@ember-data/graph": "~5.8.1", + "@ember-data/json-api": "~5.8.1", + "@ember-data/legacy-compat": "~5.8.1", + "@ember-data/model": "~5.8.1", + "@ember-data/request": "~5.8.1", + "@ember-data/request-utils": "~5.8.1", + "@ember-data/serializer": "~5.8.1", + "@ember-data/store": "~5.8.1", + "@warp-drive/ember": "~5.8.1", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.4", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", - "@warp-drive/core-types": "~5.7.0", + "@warp-drive/core-types": "~5.8.1", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -91,8 +91,8 @@ "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.56.0", - "webpack": "^5.105.2" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index 3d0a1f009c..2813b67e64 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -32,34 +32,34 @@ "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.7", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", "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", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -72,7 +72,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.105.2" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" From 83cde1423a850a10e3fb7b02a0250ea0052edb8d Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sat, 4 Apr 2026 23:00:31 +0100 Subject: [PATCH 49/49] fix missing ejs template bracket --- packages/app-blueprint/files/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 95e402c267..3031f680c4 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -40,7 +40,7 @@ "@ember-data/request-utils": "~5.8.1", "@ember-data/serializer": "~5.8.1", "@ember-data/store": "~5.8.1", - "@warp-drive/ember": "~5.8.1", + "@warp-drive/ember": "~5.8.1<% } %>", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1<% if (embroider) { %>", "@embroider/compat": "^3.9.3",