Skip to content

chore: ember v6.4 #2901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"pnpm": {
"overrides": {
"ember-composable-helpers": "npm:@nullvoxpopuli/ember-composable-helpers@^5.2.9"
"ember-composable-helpers": "npm:@nullvoxpopuli/ember-composable-helpers@^5.2.10"
},
"patchedDependencies": {
"@embroider/core": "patches/@embroider__core.patch",
Expand Down
16 changes: 8 additions & 8 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,25 @@
"@ember/render-modifiers": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-waiters": "^3.1.0",
"@embroider/addon-shim": "^1.9.0",
"@embroider/macros": "^1.16.12",
"@embroider/addon-shim": "^1.10.0",
"@embroider/macros": "^1.18.0",
"@embroider/util": "^1.13.2",
"@floating-ui/dom": "^1.6.12",
"@hashicorp/design-system-tokens": "workspace:^2.3.0",
"@hashicorp/flight-icons": "workspace:^3.11.0",
"@lezer/highlight": "^1.2.1",
"@nullvoxpopuli/ember-composable-helpers": "^5.2.9",
"@nullvoxpopuli/ember-composable-helpers": "^5.2.10",
"clipboard-polyfill": "^4.1.1",
"codemirror-lang-hcl": "^0.0.0-beta.2",
"decorator-transforms": "^2.3.0",
"ember-a11y-refocus": "^4.1.4",
"ember-cli-sass": "^11.0.1",
"ember-concurrency": "^4.0.2",
"ember-concurrency": "^4.0.4",
"ember-element-helper": "^0.8.6",
"ember-focus-trap": "^1.1.1",
"ember-get-config": "^2.1.1",
"ember-modifier": "^4.2.0",
"ember-power-select": "^8.6.2",
"ember-modifier": "^4.2.2",
"ember-power-select": "^8.7.1",
"ember-stargate": "^0.5.0",
"ember-style-modifier": "^4.4.0",
"ember-truth-helpers": "^4.0.3",
Expand Down Expand Up @@ -95,8 +95,8 @@
"@types/prismjs": "^1.26.5",
"babel-plugin-ember-template-compilation": "^2.4.1",
"concurrently": "^9.1.2",
"ember-basic-dropdown": "^8.4.0",
"ember-source": "^5.12.0",
"ember-basic-dropdown": "^8.6.1",
"ember-source": "^6.4.0",
"ember-template-lint": "^7.0.2",
"ember-template-lint-plugin-prettier": "^5.0.0",
"eslint": "^9.23.0",
Expand Down
1,512 changes: 779 additions & 733 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions showcase/.ember-cli
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
/**
Ember CLI sends analytics information by default. The data is completely
anonymous, but there are times when you might want to disable this behavior.

Setting `disableAnalytics` to true will prevent any data from being sent.
*/
"disableAnalytics": true,

/**
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
Expand Down
3 changes: 0 additions & 3 deletions showcase/.stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@

# compiled output
/dist/

# addons
/.node_modules.ember-try/
5 changes: 5 additions & 0 deletions showcase/app/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import Application from '@ember/application';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
import config from 'showcase/config/environment';
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';

if (macroCondition(isDevelopingApp())) {
importSync('./deprecation-workflow');
}

export default class App extends Application {
modulePrefix = config.modulePrefix;
Expand Down
34 changes: 34 additions & 0 deletions showcase/app/deprecation-workflow.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: MPL-2.0
*/

import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';

/**
* Docs: https://github.com/ember-cli/ember-cli-deprecation-workflow
*/
setupDeprecationWorkflow({
/**
false by default, but if a developer / team wants to be more aggressive about being proactive with
handling their deprecations, this should be set to "true"
*/
throwOnUnhandled: false,
workflow: [
/* ... handlers ... */
/* to generate this list, run your app for a while (or run the test suite),
* and then run in the browser console:
*
* deprecationWorkflow.flushDeprecations()
*
* And copy the handlers here
*/
/* example: */
/* { handler: 'silence', matchId: 'template-action' }, */
{ handler: 'throw', matchId: 'ember-modifier.use-destroyables' },
{ handler: 'throw', matchId: 'ember-modifier.use-modify' },
{ handler: 'throw', matchId: 'ember-modifier.no-args-property' },
{ handler: 'throw', matchId: 'ember-modifier.no-element-property' },
{ handler: 'silence', matchId: 'importing-inject-from-ember-service' },
],
});
14 changes: 0 additions & 14 deletions showcase/config/deprecation-workflow.js

This file was deleted.

5 changes: 2 additions & 3 deletions showcase/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
"packages": [
{
"name": "ember-cli",
"version": "5.12.0",
"version": "6.4.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--no-welcome",
"--pnpm",
"--ci-provider=github",
"--typescript",
"--no-welcome",
"--no-ember-data"
]
}
Expand Down
2 changes: 1 addition & 1 deletion showcase/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
module.exports = async function () {
return {
command: 'ember test --filter="integration" --reporter xunit',
usePnpm: true,
packageManager: 'pnpm',
scenarios: [
{
name: 'ember-lts-3.28',
Expand Down
6 changes: 3 additions & 3 deletions showcase/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
'use strict';

const browsers = [
'last 2 Chrome versions',
'last 2 Firefox versions',
'last 2 Safari versions',
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions',
];

module.exports = {
Expand Down
40 changes: 21 additions & 19 deletions showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@
"@ember/optional-features": "^2.2.0",
"@ember/render-modifiers": "^2.1.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^4.0.4",
"@ember/test-helpers": "^5.2.1",
"@ember/test-waiters": "^3.1.0",
"@embroider/test-setup": "^3.0.3",
"@embroider/macros": "^1.18.0",
"@embroider/test-setup": "^4.0.0",
"@eslint/js": "^9.27.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand All @@ -64,62 +65,63 @@
"concurrently": "^9.1.2",
"ember-a11y-testing": "^7.1.2",
"ember-auto-import": "^2.10.0",
"ember-basic-dropdown": "^8.4.0",
"ember-basic-dropdown": "^8.6.1",
"ember-body-class": "^3.0.0",
"ember-cli": "~5.12.0",
"ember-cli": "~6.4.0",
"ember-cli-app-version": "^7.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-dependency-checker": "^3.3.3",
"ember-cli-deprecation-workflow": "^3.0.2",
"ember-cli-deprecation-workflow": "^3.3.0",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sass": "^11.0.1",
"ember-cli-sri": "^2.1.1",
"ember-cli-string-helpers": "^6.1.0",
"ember-cli-string-utils": "^1.1.0",
"ember-cli-terser": "^4.0.2",
"ember-concurrency": "^4.0.2",
"ember-concurrency": "^4.0.4",
"ember-deep-tracked": "^2.0.1",
"ember-load-initializers": "^2.1.2",
"ember-math-helpers": "^3.0.0",
"ember-modifier": "^4.2.0",
"ember-page-title": "^8.2.3",
"ember-power-select": "^8.6.2",
"ember-qunit": "^9.0.1",
"ember-resolver": "^13.1.0",
"ember-load-initializers": "^3.0.1",
"ember-math-helpers": "^5.0.0",
"ember-modifier": "^4.2.2",
"ember-page-title": "^9.0.2",
"ember-power-select": "^8.7.1",
"ember-qunit": "^9.0.3",
"ember-resolver": "^13.1.1",
"ember-router-generator": "^2.0.0",
"ember-set-helper": "^3.0.1",
"ember-source": "~5.12.0",
"ember-source": "~6.4.0",
"ember-source-channel-url": "^3.0.0",
"ember-style-modifier": "^4.4.0",
"ember-template-imports": "^4.3.0",
"ember-template-lint": "^7.7.0",
"ember-truth-helpers": "^4.0.3",
"ember-try": "^3.0.0",
"ember-try": "^4.0.0",
"ember-unique-id-helper-polyfill": "^1.2.2",
"eslint": "^9.27.0",
"eslint-config-prettier": "^10.1.5",
"eslint-plugin-ember": "^12.5.0",
"eslint-plugin-n": "^17.18.0",
"eslint-plugin-qunit": "^8.1.2",
"fs-extra": "^11.2.0",
"fs-extra": "^11.3.0",
"globals": "^16.1.0",
"loader.js": "^4.7.0",
"postcss": "^8.5.3",
"prettier": "^3.5.3",
"prettier-plugin-ember-template-tag": "^2.0.5",
"qunit": "^2.23.1",
"qunit": "^2.24.1",
"qunit-dom": "^3.4.0",
"sass": "^1.87.0",
"sinon": "^19.0.2",
"stylelint": "^16.19.1",
"stylelint-config-rational-order": "^0.1.2",
"stylelint-config-standard-scss": "^14.0.0",
"tabbable": "^6.2.0",
"tracked-built-ins": "^3.4.0",
"tracked-built-ins": "^4.0.0",
"typescript": "^5.8.3",
"typescript-eslint": "^8.32.1",
"webpack": "^5.99.7"
"webpack": "^5.99.9"
},
"engines": {
"node": ">= 22"
Expand Down
1 change: 0 additions & 1 deletion showcase/tests/test-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ if (useMiddlewareReporter()) {
}

setup(QUnit.assert);

setupEmberOnerrorValidation();
loadTests();
start();
5 changes: 5 additions & 0 deletions website/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import Application from '@ember/application';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
import config from 'website/config/environment';
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';

if (macroCondition(isDevelopingApp())) {
importSync('./deprecation-workflow');
}

export default class App extends Application {
modulePrefix = config.modulePrefix;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,28 @@
* SPDX-License-Identifier: MPL-2.0
*/

self.deprecationWorkflow = self.deprecationWorkflow || {};
self.deprecationWorkflow.config = {
import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';

/**
* Docs: https://github.com/ember-cli/ember-cli-deprecation-workflow
*/
setupDeprecationWorkflow({
/**
false by default, but if a developer / team wants to be more aggressive about being proactive with
handling their deprecations, this should be set to "true"
*/
throwOnUnhandled: false,
workflow: [
/* ... handlers ... */
/* to generate this list, run your app for a while (or run the test suite),
* and then run in the browser console:
*
* deprecationWorkflow.flushDeprecations()
*
* And copy the handlers here
*/
/* example: */
/* { handler: 'silence', matchId: 'template-action' }, */
{ handler: 'silence', matchId: 'remove-owner-inject' },
{ handler: 'silence', matchId: 'ember-modifier.function-based-options' },
{ handler: 'throw', matchId: 'deprecate-auto-location' },
Expand All @@ -20,4 +39,4 @@ self.deprecationWorkflow.config = {
{ handler: 'throw', matchId: 'hds.components.modal.header' },
{ handler: 'throw', matchId: 'hds.components.sidenav.header.iconbutton' },
],
};
});
2 changes: 1 addition & 1 deletion website/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "5.12.0",
"version": "6.4.0",
"blueprints": [
{
"name": "app",
Expand Down
Loading