Run ember-cli-update to 6.4, pin ember-source to 5.12

.gitignore

@@ -19,13 +19,6 @@
 /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/
 

.prettierignore

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

.prettierrc.js

@@ -47,22 +47,9 @@ module.exports = {
   importOrderSortSpecifiers,
   overrides: [
     {
-      files: ['**/*.hbs'],
-      options: {
-        singleQuote: false,
-      },
-    },
-    {
-      files: '*.{js,ts,gjs,gts}',
-      options: {
-        singleQuote: true,
-      },
-    },
-    {
-      files: '*.{yaml,yml}',
-      options: {
-        singleQuote: true,
-      },
+      files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
+      options: { singleQuote: true, templateSingleQuote: false },
     },
+    { files: '*.{yaml,yml}', options: { singleQuote: true } },
   ],
 };

.stylelintignore

@@ -3,6 +3,3 @@
 
 # compiled output
 /dist/
-
-# addons
-/.node_modules.ember-try/

.stylelintrc.js

@@ -1,13 +1,9 @@
 'use strict';
 
 module.exports = {
-  extends: ['stylelint-config-standard-scss', 'stylelint-prettier/recommended'],
+  extends: ['stylelint-config-standard-scss'],
   rules: {
-    'scss/at-rule-no-unknown': [
-      true,
-      {
-        ignoreAtRules: ['tailwind'],
-      },
-    ],
+    'at-rule-no-deprecated': [true, { ignoreAtRules: ['/^view/', 'apply'] }],
+    'scss/at-rule-no-unknown': [true, { ignoreAtRules: ['tailwind'] }],
   },
 };

.template-lintrc.js

@@ -3,6 +3,8 @@
 module.exports = {
   extends: ['recommended'],
   rules: {
+    'no-at-ember-render-modifiers': false,
+    'no-builtin-form-components': false,
     'no-curly-component-invocation': {
       allow: ['svg-jar', '-with-dynamic-vars'],
     },

CHANGELOG.md

@@ -1,4 +1,3 @@
-
 ## v1.2.15 (2024-01-10)
 
 ## v1.2.14 (2024-01-10)
@@ -32,26 +31,29 @@
 ## v1.2.0 (2024-01-07)
 
 #### :bug: Bug Fix
-* [#1948](https://github.com/shipshapecode/swach/pull/1948) Update ember-animated, fix menu not working on contrast checker screen ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+
+- [#1948](https://github.com/shipshapecode/swach/pull/1948) Update ember-animated, fix menu not working on contrast checker screen ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
 
 #### :house: Internal
-* [#1949](https://github.com/shipshapecode/swach/pull/1949) Update release-it ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1946](https://github.com/shipshapecode/swach/pull/1946) Add gts support ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1918](https://github.com/shipshapecode/swach/pull/1918) ember-cli 5.2.0 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1945](https://github.com/shipshapecode/swach/pull/1945) Update linting deps, fix lint ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1944](https://github.com/shipshapecode/swach/pull/1944) Node 18 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1732](https://github.com/shipshapecode/swach/pull/1732) Ember 5 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1646](https://github.com/shipshapecode/swach/pull/1646) ember-cli 5 beta, switch from yarn to pnpm ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1644](https://github.com/shipshapecode/swach/pull/1644) Ember 4.12 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1634](https://github.com/shipshapecode/swach/pull/1634) Run on ubuntu-latest ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1540](https://github.com/shipshapecode/swach/pull/1540) More glint updates ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1536](https://github.com/shipshapecode/swach/pull/1536) ember-cli 4.10 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1504](https://github.com/shipshapecode/swach/pull/1504) Update electron deps ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1405](https://github.com/shipshapecode/swach/pull/1405) Embroider 2.x ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1360](https://github.com/shipshapecode/swach/pull/1360) Pin embroider to 1.8.3 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
-* [#1329](https://github.com/shipshapecode/swach/pull/1329) Electron 21 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+
+- [#1949](https://github.com/shipshapecode/swach/pull/1949) Update release-it ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1946](https://github.com/shipshapecode/swach/pull/1946) Add gts support ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1918](https://github.com/shipshapecode/swach/pull/1918) ember-cli 5.2.0 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1945](https://github.com/shipshapecode/swach/pull/1945) Update linting deps, fix lint ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1944](https://github.com/shipshapecode/swach/pull/1944) Node 18 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1732](https://github.com/shipshapecode/swach/pull/1732) Ember 5 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1646](https://github.com/shipshapecode/swach/pull/1646) ember-cli 5 beta, switch from yarn to pnpm ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1644](https://github.com/shipshapecode/swach/pull/1644) Ember 4.12 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1634](https://github.com/shipshapecode/swach/pull/1634) Run on ubuntu-latest ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1540](https://github.com/shipshapecode/swach/pull/1540) More glint updates ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1536](https://github.com/shipshapecode/swach/pull/1536) ember-cli 4.10 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1504](https://github.com/shipshapecode/swach/pull/1504) Update electron deps ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1405](https://github.com/shipshapecode/swach/pull/1405) Embroider 2.x ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1360](https://github.com/shipshapecode/swach/pull/1360) Pin embroider to 1.8.3 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
+- [#1329](https://github.com/shipshapecode/swach/pull/1329) Electron 21 ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
 
 #### Committers: 1
+
 - Robbie Wagner ([@RobbieTheWagner](https://github.com/RobbieTheWagner))
 
 ## v1.1.13 (2022-08-02)

app/app.js → app/app.ts

@@ -4,8 +4,14 @@ import { InitSentryForEmber } from '@sentry/ember';
 import loadInitializers from 'ember-load-initializers';
 import Resolver from 'ember-resolver';
 
+import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
+
 import config from 'swach/config/environment';
 
+if (macroCondition(isDevelopingApp())) {
+  importSync('./deprecation-workflow');
+}
+
 InitSentryForEmber();
 
 export default class App extends Application {

app/components/about.ts

@@ -1,4 +1,5 @@
 import { action } from '@ember/object';
+import type Owner from '@ember/owner';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
@@ -14,15 +15,15 @@ export default class AboutComponent extends Component<AboutSignature> {
   copyrightYear = new Date().getFullYear();
   @tracked version = 'Version not available';
 
-  constructor(owner: unknown, args: Record<string, unknown>) {
+  constructor(owner: Owner, args: Record<string, unknown>) {
     super(owner, args);
 
     if (typeof requireNode !== 'undefined') {
       const { ipcRenderer } = requireNode('electron');
 
       this.ipcRenderer = ipcRenderer;
 
-      this.ipcRenderer.invoke('getAppVersion').then((version: string) => {
+      void this.ipcRenderer.invoke('getAppVersion').then((version: string) => {
         this.version = version;
       });
     }
@@ -33,7 +34,7 @@ export default class AboutComponent extends Component<AboutSignature> {
     event.preventDefault();
 
     if (typeof requireNode !== 'undefined') {
-      requireNode('electron').shell.openExternal('https://swach.io/');
+      void this.ipcRenderer.invoke('open-external', 'https://swach.io/');
     }
   }
 }

app/components/animated-drag-sort-list.ts

@@ -17,6 +17,7 @@ export default class AnimatedDragSortList extends DragSortList {
   @action
   rules(): unknown {
     if (!this.didDrag) {
+      // eslint-disable-next-line @typescript-eslint/unbound-method
       return this.transition;
     }
 
@@ -25,6 +26,7 @@ export default class AnimatedDragSortList extends DragSortList {
     return null;
   }
 
+  // eslint-disable-next-line require-yield
   *transition({
     keptSprites,
     insertedSprites,

app/components/color-picker.ts

@@ -93,7 +93,7 @@ export default class ColorPickerComponent extends Component<ColorPickerSignature
 
       this.undoManager.setupUndoRedo();
     } else {
-      this.args.saveColor(this._selectedColor?.hex);
+      await this.args.saveColor(this._selectedColor?.hex);
     }
 
     this.args.toggleIsShown();
@@ -133,7 +133,7 @@ export default class ColorPickerComponent extends Component<ColorPickerSignature
 
     set(this._selectedColor, 'name', namedColor.name);
 
-    this.colorPicker?.setColors([this._selectedColor].mapBy('hex'));
+    this.colorPicker?.setColors([this._selectedColor].map((c) => c.hex));
   }
 
   /**

app/components/color-row.ts

@@ -23,7 +23,7 @@ export default class ColorRowComponent extends Component<ColorRowSignature> {
   @service declare colorUtils: ColorUtils;
   @service declare router: Router;
 
-  get showActions(): boolean {
+  get showActions() {
     if (isEmpty(this.args.showActions)) {
       return true;
     }