Upgraded to Ember 6.5.0, etc

rykov · rykov · commit 1ae0c0d866ea · 2025-06-20T19:18:27.000+08:00
diff --git a/ui/.ember-cli b/ui/.ember-cli
@@ -11,5 +11,17 @@
     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.
   */
-  "isTypeScriptProject": false
+  "isTypeScriptProject": false,
+
+  /**
+    Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
+    or GTS files for the component and the component rendering test. "loose" is the default.
+  */
+  "componentAuthoringFormat": "loose",
+
+  /**
+    Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
+    or GTS templates for routes. "loose" is the default
+  */
+  "routeAuthoringFormat": "loose"
 }
diff --git a/ui/.eslintignore b/ui/.eslintignore
diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js
diff --git a/ui/.gitignore b/ui/.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/
diff --git a/ui/.prettierignore b/ui/.prettierignore
@@ -8,6 +8,7 @@
 /coverage/
 !.*
 .*/
-
-# ember-try
-/.node_modules.ember-try/
+/pnpm-lock.yaml
+ember-cli-update.json
+*.html
+*.hbs
diff --git a/ui/.prettierrc.js b/ui/.prettierrc.js
@@ -1,13 +1,21 @@
 'use strict';
 
 module.exports = {
+  plugins: ['prettier-plugin-ember-template-tag'],
   overrides: [
     {
-      files: '*.{js,ts}',
+      files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
       options: {
         singleQuote: true,
         printWidth: 100,
       },
     },
+    {
+      files: '*.{gjs,gts}',
+      options: {
+        singleQuote: true,
+        templateSingleQuote: false,
+      },
+    },
   ],
 };
diff --git a/ui/.stylelintignore b/ui/.stylelintignore
@@ -3,6 +3,3 @@
 
 # compiled output
 /dist/
-
-# addons
-/.node_modules.ember-try/
diff --git a/ui/.stylelintrc.js b/ui/.stylelintrc.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-  extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+  extends: ['stylelint-config-standard'],
   customSyntax: 'postcss-scss',
   plugins: ['stylelint-scss'],
   rules: {
diff --git a/ui/app/app.js b/ui/app/app.js
@@ -2,6 +2,11 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'preview/config/environment';
+import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
+
+if (macroCondition(isDevelopingApp())) {
+  importSync('./deprecation-workflow');
+}
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
diff --git a/ui/app/components/html-preview/index.js b/ui/app/components/html-preview/index.js
@@ -1,6 +1,6 @@
-import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import Component from '@glimmer/component';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class HtmlPreviewComponent extends Component {
diff --git a/ui/app/controllers/preview/index.js b/ui/app/controllers/preview/index.js
@@ -1,7 +1,7 @@
-import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import Controller from '@ember/controller';
 import { isPresent } from '@ember/utils';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class PreviewIndexController extends Controller {
diff --git a/ui/app/controllers/preview/render.js b/ui/app/controllers/preview/render.js
@@ -1,7 +1,7 @@
-import { inject as service } from '@ember/service';
 import { computed, set } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import Controller from '@ember/controller';
+import { service } from '@ember/service';
 
 var FORMATS = Object.freeze([
   { id: 'html', order: 0 },
diff --git a/ui/app/deprecation-workflow.js b/ui/app/deprecation-workflow.js
@@ -0,0 +1,24 @@
+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' }, */
+  ],
+});
diff --git a/ui/app/gql/queries/preview.graphql b/ui/app/gql/queries/preview.graphql
@@ -1,6 +1,6 @@
 query renderOne($content: String!, $recipient: String!) {
   renderOne(content: $content, recipient: $recipient) {
-  	rawMessage
+    rawMessage
     html
     text
   }
diff --git a/ui/config/ember-cli-update.json b/ui/config/ember-cli-update.json
@@ -0,0 +1,21 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "6.1.0",
+      "blueprints": [
+        {
+          "name": "app",
+          "outputRepo": "https://github.com/ember-cli/ember-new-output",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--yarn",
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/ui/config/postcss.js b/ui/config/postcss.js
@@ -6,6 +6,7 @@
 // - ember-cli-postcss
 // - postcss-scss
 
+const Browsers = require('./targets.js').browsers;
 const tailwindConfig = './config/tailwind.js';
 
 module.exports = function (/* isProduction */) {
@@ -21,6 +22,9 @@ module.exports = function (/* isProduction */) {
           },
         },
         require('tailwindcss')(tailwindConfig),
+        require('autoprefixer')({
+          overrideBrowserslist: Browsers,
+        }),
       ],
     },
   };
diff --git a/ui/config/tailwind.js b/ui/config/tailwind.js
@@ -1,11 +1,11 @@
 const isProduction = process.env.EMBER_ENV === 'production';
 
 module.exports = {
-  purge: ['./app/**/*.{html,hbs,js,ts}', './public/**/*.html'],
+  content: ['./app/**/*.{html,hbs,js,ts}', './public/**/*.html'],
   plugins: [require('@tailwindcss/forms'), require('@tailwindcss/typography')],
 
   // Disable JIT in devo. Faster to import all classes.
-  safelist: isProduction ? undefined : [{ pattern: /.*/ }],
+  ...(!isProduction && { safelist: [{ pattern: /.*/ }] }),
 
   // Do we need these?
   theme: { extend: {} },
diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js
@@ -4,11 +4,16 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 const ConfigurePostCSS = require('./config/postcss.js');
 
 module.exports = function (defaults) {
+  const isProduction = EmberApp.env() === 'production';
   const app = new EmberApp(defaults, {
     // ember-cli-postcss
     postcssOptions: ConfigurePostCSS(),
   });
 
+  // HACK: Ember 6.1+ removed "ember" import, so we do it here
+  const emberJs = `ember.${isProduction ? 'prod' : 'debug'}.js`;
+  app.import(`node_modules/ember-source/dist/${emberJs}`);
+
   // Use `app.import` to add additional libraries to the generated
   // output files.
   //
diff --git a/ui/eslint.config.mjs b/ui/eslint.config.mjs
diff --git a/ui/package.json b/ui/package.json
diff --git a/ui/tests/helpers/index.js b/ui/tests/helpers/index.js
diff --git a/ui/tests/test-helper.js b/ui/tests/test-helper.js
diff --git a/ui/yarn.lock b/ui/yarn.lock
