Get forge make command running (#2379)

* Get forge make command running

* Remove flash-message test setup

* Set out paths

Author: RobbieTheWagner

.github/workflows/release.yml

@@ -60,7 +60,7 @@ jobs:
           encodedString: ${{ secrets.CERTIFICATE_WINDOWS_PFX }}
       - name: Setup LXD
         if: matrix.os == 'ubuntu-22.04' && startsWith(github.ref, 'refs/tags/')
-        uses: canonical/setup-lxd@v0.1.1
+        uses: canonical/setup-lxd@v0.1.3
       - name: Install Snapcraft
         if: matrix.os == 'ubuntu-22.04' && startsWith(github.ref, 'refs/tags/')
         uses: samuelmeuli/action-snapcraft@v2
@@ -87,11 +87,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: |
-            electron-app/out/**/*.deb
-            electron-app/out/**/*.dmg
-            electron-app/out/**/*Setup.exe
-            electron-app/out/**/*.rpm
-            electron-app/out/**/*.zip
+            out/**/*.deb
+            out/**/*.dmg
+            out/**/*Setup.exe
+            out/**/*.rpm
+            out/**/*.zip
       - name: Create a Sentry.io release
         uses: tclindner/sentry-releases-action@v1.3.0
         if: matrix.os == 'ubuntu-22.04'

.gitignore

@@ -31,7 +31,7 @@
 # broccoli-debug
 /DEBUG/
 
-electron-out/
+out/
 .idea/
 
 # Vite

.npmrc

@@ -1,3 +1,2 @@
 node-linker=hoisted
-shamefully-hoist=true
 side-effects-cache=false

.prettierignore

@@ -15,12 +15,7 @@ ember-cli-update.json
 # ember-try
 /.node_modules.ember-try/
 
-# ember-electron
-/electron-app/node_modules/
-/electron-app/out/
-
-# Sentry
-/electron-app/sentry-symbols.js
+/out/
 
 # Types
 /types/

app/services/cognito.js

@@ -1,22 +1,23 @@
+import { getOwner } from '@ember/owner';
 import { service } from '@ember/service';
 import CognitoService from 'ember-cognito/services/cognito';
-import ENV from '../config/environment';
-
-const cognitoEnv = Object.assign(
-  {
-    autoRefreshSession: false,
-  },
-  ENV.cognito
-);
 
 export default class CognitoServiceExtended extends CognitoService {
   @service session;
-  poolId = cognitoEnv.poolId;
-  clientId = cognitoEnv.clientId;
-  identityPoolId = cognitoEnv.identityPoolId;
-  region = cognitoEnv.region;
-  autoRefreshSession = cognitoEnv.autoRefreshSession;
-  authenticationFlowType = cognitoEnv.authenticationFlowType;
+
+  constructor() {
+    super(...arguments);
+
+    const config = getOwner(this).resolveRegistration('config:environment');
+    const cognitoEnv = config.cognito ?? {};
+
+    this.poolId = cognitoEnv.poolId;
+    this.clientId = cognitoEnv.clientId;
+    this.identityPoolId = cognitoEnv.identityPoolId;
+    this.region = cognitoEnv.region;
+    this.autoRefreshSession = cognitoEnv.autoRefreshSession ?? false;
+    this.authenticationFlowType = cognitoEnv.authenticationFlowType;
+  }
 
   /**
    * Configures the Amplify library with the pool & client IDs, and any additional

eslint.config.mjs

@@ -47,20 +47,12 @@ export default ts.config(
   {
     ignores: [
       '.vite/**/*',
+      'coverage/**/*',
       'declarations/**/*',
-
-      // ember-electron
-      'electron-app/node_modules/**/*',
-      'electron-app/out/**/*',
-      'electron-app/dist/**/*',
-      'electron-out/**/*',
-
-      // Sentry
-      'electron-app/sentry-symbols.js',
-
       'dist/**/*',
+      'electron-app/dist/**/*',
       'node_modules/**/*',
-      'coverage/**/*',
+      'out/**/*',
       'types/**/*',
       '!**/.*',
     ],

forge.config.ts

@@ -13,13 +13,6 @@ const config: ForgeConfig = {
     darwinDarkModeSupport: true,
     icon: 'electron-app/resources/icon',
     name: 'Swach',
-    ignore: [
-      '/.gitignore',
-      '/electron-forge-config.js',
-      '/ember-test(/|$)',
-      '/tests(/|$)',
-      '\\.map$',
-    ],
     osxSign: {
       optionsForFile: () => {
         return {

package.json

@@ -41,14 +41,53 @@
     "test:ember": "vite build -c vite.renderer.config.ts --mode development && testem ci"
   },
   "dependencies": {
+    "@ctrl/tinycolor": "^4.2.0",
+    "@ember/render-modifiers": "^3.0.0",
+    "@ember/string": "^4.0.1",
+    "@glimmer/component": "^2.0.0",
+    "@glimmer/tracking": "^1.1.2",
+    "@irojs/iro-core": "^1.2.1",
+    "@jaames/iro": "^5.5.2",
+    "@nullvoxpopuli/ember-composable-helpers": "^5.3.0",
+    "@orbit/coordinator": "^0.17.0",
+    "@orbit/indexeddb": "^0.17.2",
+    "@orbit/indexeddb-bucket": "0.17.0",
+    "@orbit/jsonapi": "^0.17.1",
+    "@orbit/memory": "^0.17.2",
+    "@orbit/records": "^0.17.0",
+    "@orbit/serializers": "^0.17.0",
+    "@orbit/utils": "^0.17.0",
     "@sentry/electron": "^7.2.0",
+    "@sentry/ember": "^10.21.0",
+    "aws4fetch": "^1.0.20",
+    "color-name-list": "^13.1.0",
+    "decorator-transforms": "^2.3.0",
     "electron-dl": "^3.5.2",
     "electron-is-dev": "^3.0.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-store": "^8.2.0",
+    "ember-animated": "^2.2.0",
+    "ember-animated-tools": "^2.0.0",
+    "ember-cli-flash": "^6.0.0",
+    "ember-click-outside": "^6.1.1",
+    "ember-cognito": "^3.0.1",
+    "ember-css-transitions": "^4.5.0",
+    "ember-drag-sort": "^4.1.1",
+    "ember-element-helper": "^0.8.8",
+    "ember-event-helpers": "^0.1.1",
+    "ember-inflector": "^6.0.0",
+    "ember-inputmask": "^2.0.0",
+    "ember-local-storage": "2.0.6",
+    "ember-math-helpers": "^5.0.0",
+    "ember-modifier": "^4.2.2",
+    "ember-orbit": "^0.20.0",
+    "ember-set-body-class": "^1.0.2",
+    "ember-set-helper": "^3.1.0",
+    "ember-simple-auth": "^8.0.1",
     "indexeddb-export-import": "^2.1.5",
     "menubar": "^9.5.2",
-    "throttle-debounce": "^5.0.2"
+    "throttle-debounce": "^5.0.2",
+    "tracked-built-ins": "^3.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.28.4",
@@ -57,7 +96,6 @@
     "@babel/plugin-transform-typescript": "^7.28.5",
     "@babel/preset-env": "^7.28.5",
     "@babel/runtime": "^7.28.4",
-    "@ctrl/tinycolor": "^4.2.0",
     "@electron-forge/cli": "^7.10.2",
     "@electron-forge/core": "^7.10.2",
     "@electron-forge/maker-deb": "^7.10.2",
@@ -72,38 +110,21 @@
     "@electron/fuses": "^1.8.0",
     "@ember/app-tsconfig": "^1.0.3",
     "@ember/optional-features": "^2.2.0",
-    "@ember/render-modifiers": "^3.0.0",
-    "@ember/string": "^4.0.1",
     "@ember/test-helpers": "^5.3.0",
     "@embroider/compat": "^4.1.8",
     "@embroider/config-meta-loader": "^1.0.0",
     "@embroider/core": "^4.2.5",
     "@embroider/macros": "^1.19.2",
     "@embroider/router": "^3.0.4",
-    "@embroider/vite": "^1.3.4",
+    "@embroider/vite": "^1.3.6",
     "@eslint/js": "^9.38.0",
-    "@glimmer/component": "^2.0.0",
-    "@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",
     "@glint/template": "~1.5.0",
     "@ianvs/prettier-plugin-sort-imports": "^4.7.0",
-    "@irojs/iro-core": "^1.2.1",
-    "@jaames/iro": "^5.5.2",
-    "@nullvoxpopuli/ember-composable-helpers": "^5.3.0",
-    "@orbit/coordinator": "^0.17.0",
-    "@orbit/indexeddb": "^0.17.2",
-    "@orbit/indexeddb-bucket": "0.17.0",
-    "@orbit/jsonapi": "^0.17.1",
-    "@orbit/memory": "^0.17.2",
-    "@orbit/records": "^0.17.0",
-    "@orbit/serializers": "^0.17.0",
-    "@orbit/utils": "^0.17.0",
     "@release-it-plugins/lerna-changelog": "^6.1.0",
-    "@release-it-plugins/workspaces": "^4.2.1",
     "@rollup/plugin-babel": "^6.1.0",
-    "@sentry/ember": "^10.21.0",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/vite": "^4.1.14",
     "@tsconfig/ember": "^3.0.11",
@@ -113,48 +134,25 @@
     "@types/node": "^22.18.11",
     "@types/qunit": "^2.19.13",
     "@types/sinon": "^17.0.4",
-    "aws4fetch": "^1.0.20",
     "babel-plugin-ember-template-compilation": "^2.4.1",
     "babel-preset-env": "^1.7.0",
     "broccoli-asset-rev": "^3.0.0",
-    "color-name-list": "^13.1.0",
     "concurrently": "^9.2.1",
-    "decorator-transforms": "^2.3.0",
     "electron": "^38.4.0",
-    "ember-animated": "^2.2.0",
-    "ember-animated-tools": "^2.0.0",
     "ember-auto-import": "^2.11.1",
     "ember-cli": "^6.7.2",
-    "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.4.0",
-    "ember-cli-flash": "^5.1.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-click-outside": "^6.1.1",
-    "ember-cognito": "^3.0.1",
-    "ember-css-transitions": "^4.5.0",
-    "ember-decorators": "^6.1.1",
-    "ember-drag-sort": "^4.1.1",
-    "ember-element-helper": "^0.8.8",
-    "ember-event-helpers": "^0.1.1",
-    "ember-inflector": "^6.0.0",
-    "ember-inputmask": "^2.0.0",
     "ember-load-initializers": "^3.0.1",
-    "ember-local-storage": "2.0.6",
-    "ember-math-helpers": "^5.0.0",
-    "ember-modifier": "^4.2.2",
-    "ember-orbit": "^0.20.0",
     "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.1.1",
     "ember-route-template": "^1.0.3",
-    "ember-set-body-class": "^1.0.2",
-    "ember-set-helper": "^3.1.0",
-    "ember-simple-auth": "^8.0.1",
     "ember-sinon-qunit": "^7.5.0",
     "ember-source": "^5.12.0",
     "ember-svg-jar": "^2.7.0",
@@ -183,7 +181,6 @@
     "stylelint-config-standard": "^38.0.0",
     "tailwindcss": "^4.1.14",
     "throttle-debounce": "^5.0.2",
-    "tracked-built-ins": "^3.4.0",
     "tree-kill": "^1.2.2",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.46.2",
@@ -225,9 +222,6 @@
   },
   "release-it": {
     "plugins": {
-      "@release-it-plugins/workspaces": {
-        "publish": false
-      },
       "@release-it-plugins/lerna-changelog": {
         "infile": "CHANGELOG.md",
         "launchEditor": false