[WIP] chore: ember 6.4

package.json

@@ -19,7 +19,7 @@
     "@glint/core": "^1.5.2",
     "dotenv": "^16.4.7"
   },
-  "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
+  "packageManager": "pnpm@10.11.0+sha512.6540583f41cc5f628eb3d9773ecee802f4f9ef9923cc45b69890fb47991d4b092964694ec3a4f738a420c918a333062c8b925d312f42e4f0c263eb603551f977",
   "engines": {
     "pnpm": ">= 10.0.0"
   },

packages/components/package.json

@@ -85,7 +85,6 @@
     "@ember/test-helpers": "^4.0.4",
     "@embroider/addon-dev": "^7.1.4",
     "@glimmer/component": "^1.1.2",
-    "@glimmer/tracking": "^1.1.2",
     "@glint/core": "^1.5.2",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
@@ -97,7 +96,7 @@
     "babel-plugin-ember-template-compilation": "^2.4.1",
     "concurrently": "^9.1.2",
     "ember-basic-dropdown": "^8.4.0",
-    "ember-source": "^5.12.0",
+    "ember-source": "^6.4.0",
     "ember-template-lint": "^7.0.2",
     "ember-template-lint-plugin-prettier": "^5.0.0",
     "eslint": "^9.23.0",
@@ -119,9 +118,6 @@
     "typescript": "^5.8.2",
     "webpack": "^5.97.1"
   },
-  "peerDependencies": {
-    "ember-source": "^3.28.0 || ^4.0.0 || ^5.3.0"
-  },
   "ember": {
     "edition": "octane"
   },

showcase/.ember-cli

@@ -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.

showcase/.gitignore

@@ -14,12 +14,5 @@
 /testem.log
 /yarn-error.log
 
-# ember-try
-/.node_modules.ember-try/
-/npm-shrinkwrap.json.ember-try
-/package.json.ember-try
-/package-lock.json.ember-try
-/yarn.lock.ember-try
-
 # broccoli-debug
 /DEBUG/

showcase/.prettierignore

@@ -8,6 +8,7 @@
 /coverage/
 !.*
 .*/
-
-# ember-try
-/.node_modules.ember-try/
+/pnpm-lock.yaml
+ember-cli-update.json
+*.html
+*.scss

showcase/.prettierrc.js

@@ -2,19 +2,17 @@
 
 module.exports = {
   plugins: ['prettier-plugin-ember-template-tag'],
-  templateSingleQuote: false,
-  trailingComma: 'es5',
   overrides: [
     {
-      files: '*.{js,ts,gjs,gts}',
+      files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
       options: {
         singleQuote: true,
+        templateSingleQuote: false,
       },
     },
     {
       files: '*.hbs',
       options: {
-        singleQuote: false,
         printWidth: 120,
       },
     },

showcase/.template-lintrc.js

@@ -1,8 +1,7 @@
 'use strict';
 
 module.exports = {
-  plugins: ['ember-template-lint-plugin-prettier'],
-  extends: ['recommended', 'ember-template-lint-plugin-prettier:recommended'],
+  extends: 'recommended',
   rules: {
     'no-html-comments': false,
     'no-trailing-spaces': true,
@@ -15,14 +14,4 @@ module.exports = {
     'no-builtin-form-components': false,
   },
   ignore: ['blueprints/**', 'tests/**'],
-  overrides: [
-    // temporary fix until the prettier plugin works with `.gts/gjs` files
-    // https://github.com/ember-template-lint/ember-template-lint-plugin-prettier/issues/268
-    {
-      files: ['**/*.{gjs,gts}'],
-      rules: {
-        prettier: false,
-      },
-    },
-  ],
 };

showcase/app/app.ts

@@ -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;

showcase/app/components/mock/app/main/generic-advanced-table.gts

@@ -471,7 +471,7 @@ const SAMPLE_MODEL = [
 
 const updateModelWithSelectAllState = (
   modelData: HdsAdvancedTableSignature['Args']['model'],
-  selectAllState: boolean
+  selectAllState: boolean,
 ) => {
   modelData.forEach((modelRow) => {
     modelRow['isSelected'] = selectAllState;
@@ -480,10 +480,10 @@ const updateModelWithSelectAllState = (
 
 const updateModelWithSelectableRowsStates = (
   modelData: HdsAdvancedTableSignature['Args']['model'],
-  selectableRowsStates: HdsAdvancedTableOnSelectionChangeSignature['selectableRowsStates']
+  selectableRowsStates: HdsAdvancedTableOnSelectionChangeSignature['selectableRowsStates'],
 ) => {
   const modelDataMap = new Map(
-    modelData.map((modelRow) => [modelRow['id'], modelRow])
+    modelData.map((modelRow) => [modelRow['id'], modelRow]),
   );
   selectableRowsStates.forEach((row) => {
     // safe to assume that there is always a record for the "selectionKey" since it's coming from the model (the selectable "rows" are a subset of the model dataset)
@@ -505,6 +505,7 @@ export default class MockAppMainGenericAdvancedTable extends Component<MockAppMa
     selectionCheckboxElement,
     selectableRowsStates,
   }: HdsAdvancedTableOnSelectionChangeSignature) {
+    // eslint-disable-next-line prefer-rest-params
     console.log(...arguments);
 
     if (selectionKey === 'all' && this.demoModel) {

showcase/app/components/shw/frame/index.gts

@@ -35,7 +35,7 @@ export default class ShwFrameComponent extends Component<ShwFrameSignature> {
     if (!src.match(/$\//)) {
       assert(
         `@src for "Shw::Frame" must be an absolute path (starting with '/') - Provided: ${src}`,
-        true
+        true,
       );
     }
 
@@ -51,7 +51,7 @@ export default class ShwFrameComponent extends Component<ShwFrameSignature> {
     // we accept only px or percentage
     assert(
       `@width for "Shw::Frame" must be a number or a percentage - Provided: ${width}`,
-      width.match(/^[\d]+%?$/)
+      width.match(/^[\d]+%?$/),
     );
 
     return width.match(/^[\d]+$/) ? `${width}px` : width;
@@ -66,7 +66,7 @@ export default class ShwFrameComponent extends Component<ShwFrameSignature> {
     // we accept only px
     assert(
       `@height for "Shw::Frame" must be a number - Provided: ${height}`,
-      height.match(/^[\d]+?$/)
+      height.match(/^[\d]+?$/),
     );
 
     return `${height}px`;

showcase/app/components/shw/grid/index.gts

@@ -42,7 +42,7 @@ export default class ShwGrid extends Component<ShwGridSignature> {
     assert('@columns for "Shw::Grid" must be defined', columns !== undefined);
     assert(
       '@columns for "Shw::Grid" must be a positive integer greater than zero',
-      columns > 0
+      columns > 0,
     );
 
     return columns;

showcase/app/components/shw/text/index.gts

@@ -59,9 +59,9 @@ export default class ShwText extends Component<ShwTextSignature> {
     if (tag) {
       assert(
         `@tag for "Shw::Text" must be one of the following: ${AVAILABLE_TAGS.join(
-          ', '
+          ', ',
         )}; received: ${tag}`,
-        AVAILABLE_TAGS.includes(tag)
+        AVAILABLE_TAGS.includes(tag),
       );
     }
 
@@ -82,7 +82,7 @@ export default class ShwText extends Component<ShwTextSignature> {
 
     assert(
       `You need to provide a @variant arguments to "Shw::Text"`,
-      variant !== undefined
+      variant !== undefined,
     );
 
     return variant;
@@ -101,9 +101,9 @@ export default class ShwText extends Component<ShwTextSignature> {
     if (align) {
       assert(
         `@align for "Shw::Text" must be one of the following: ${AVAILABLE_ALIGNS.join(
-          ', '
+          ', ',
         )}; received: ${align}`,
-        AVAILABLE_ALIGNS.includes(align)
+        AVAILABLE_ALIGNS.includes(align),
       );
     }
 

showcase/app/controllers/application.js

@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
 export default class ApplicationController extends Controller {

showcase/app/controllers/components.js

@@ -4,15 +4,15 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { scheduleOnce } from '@ember/runloop';
 
 function replaceMockStates() {
   document.querySelectorAll('[mock-state-value]').forEach((element) => {
     let targets;
     if (element.attributes['mock-state-selector']) {
       targets = element.querySelectorAll(
-        element.attributes['mock-state-selector'].value
+        element.attributes['mock-state-selector'].value,
       );
     } else {
       targets = [element];