Use ef4 fork of ember-orbit

RobbieTheWagner · RobbieTheWagner · commit 0015467ccba4 · 2025-08-16T08:58:47.000-04:00
diff --git a/app/components/color-picker.gts b/app/components/color-picker.gts
@@ -7,7 +7,7 @@ import type Router from '@ember/routing/router-service';
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 // @ts-expect-error TODO: fix this
 import EmberPopover from 'ember-tooltips/components/ember-popover';
 import { TinyColor } from '@ctrl/tinycolor';
diff --git a/app/components/colors-list.gts b/app/components/colors-list.gts
@@ -7,7 +7,7 @@ import AnimatedEach from 'ember-animated/components/animated-each';
 import { easeOut } from 'ember-animated/easings/cosine';
 import move from 'ember-animated/motions/move';
 import { fadeOut } from 'ember-animated/motions/opacity';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import type { RecordOperationTerm } from '@orbit/records';
 import ColorRow from './color-row.gts';
 import type { SelectedColorModel } from './rgb-input.gts';
diff --git a/app/components/kuler-palette-row.gts b/app/components/kuler-palette-row.gts
@@ -10,7 +10,7 @@ import type MotionService from 'ember-animated/services/-ea-motion';
 import fade from 'ember-animated/transitions/fade';
 import stopPropagation from 'ember-event-helpers/helpers/stop-propagation';
 import sub from 'ember-math-helpers/helpers/sub';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import set from 'ember-set-helper/helpers/set';
 import svgJar from 'ember-svg-jar/helpers/svg-jar';
 import eq from 'ember-truth-helpers/helpers/eq';
diff --git a/app/components/kuler.gts b/app/components/kuler.gts
@@ -5,7 +5,7 @@ import { service } from '@ember/service';
 import { capitalize } from '@ember/string';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import eq from 'ember-truth-helpers/helpers/eq';
 import isEmpty from 'ember-truth-helpers/helpers/is-empty';
 import not from 'ember-truth-helpers/helpers/not';
diff --git a/app/components/palette-row.gts b/app/components/palette-row.gts
@@ -12,7 +12,7 @@ import DragSortList from 'ember-drag-sort/components/drag-sort-list';
 import type DragSortService from 'ember-drag-sort/services/drag-sort';
 import stopPropagation from 'ember-event-helpers/helpers/stop-propagation';
 import sub from 'ember-math-helpers/helpers/sub';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import svgJar from 'ember-svg-jar/helpers/svg-jar';
 import eq from 'ember-truth-helpers/helpers/eq';
 import not from 'ember-truth-helpers/helpers/not';
diff --git a/app/components/palettes-list.gts b/app/components/palettes-list.gts
@@ -1,7 +1,7 @@
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
-import type { LiveQuery, Store } from 'ember-orbit';
+import type { LiveQuery, Store } from '@ef4/ember-orbit';
 import svgJar from 'ember-svg-jar/helpers/svg-jar';
 import type { RecordOperationTerm } from '@orbit/records';
 import AnimatedDragSortList from './animated-drag-sort-list.gts';
diff --git a/app/components/settings-data.gts b/app/components/settings-data.gts
@@ -5,7 +5,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import { storageFor } from 'ember-local-storage';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import set from 'ember-set-helper/helpers/set';
 import svgJar from 'ember-svg-jar/helpers/svg-jar';
 import type { Coordinator } from '@orbit/coordinator';
diff --git a/app/controllers/application.ts b/app/controllers/application.ts
@@ -5,7 +5,7 @@ import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import { storageFor } from 'ember-local-storage';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import type { RecordSchema } from '@orbit/records';
 import type { IpcRenderer } from 'electron';
 import type { SelectedColorModel } from 'swach/components/rgb-input';
diff --git a/app/controllers/palettes.ts b/app/controllers/palettes.ts
@@ -3,7 +3,7 @@ import { action } from '@ember/object';
 import type Router from '@ember/routing/router-service';
 import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import type { LiveQuery, Store } from 'ember-orbit';
+import type { LiveQuery, Store } from '@ef4/ember-orbit';
 import type { RecordOperationTerm } from '@orbit/records';
 import type ApplicationController from 'swach/controllers/application';
 import type ColorModel from 'swach/data-models/color';
diff --git a/app/data-models/color.ts b/app/data-models/color.ts
@@ -1,5 +1,5 @@
 import { isEmpty } from '@ember/utils';
-import { attr, hasOne, Model } from 'ember-orbit';
+import { attr, hasOne, Model } from '@ef4/ember-orbit';
 import { TinyColor } from '@ctrl/tinycolor';
 import type PaletteModel from 'swach/data-models/palette';
 
diff --git a/app/data-models/palette.ts b/app/data-models/palette.ts
@@ -1,4 +1,4 @@
-import { attr, hasMany, Model } from 'ember-orbit';
+import { attr, hasMany, Model } from '@ef4/ember-orbit';
 import type ColorModel from 'swach/data-models/color';
 
 export default class PaletteModel extends Model {
diff --git a/app/data-sources/backup.ts b/app/data-sources/backup.ts
@@ -1,4 +1,4 @@
-import { applyStandardSourceInjections } from 'ember-orbit';
+import { applyStandardSourceInjections } from '@ef4/ember-orbit';
 import { IndexedDBSource } from '@orbit/indexeddb';
 import type {
   InitializedRecord,
diff --git a/app/data-sources/remote.js b/app/data-sources/remote.js
@@ -1,6 +1,6 @@
 import { getOwner } from '@ember/application';
 import { pluralize, singularize } from 'ember-inflector';
-import { applyStandardSourceInjections } from 'ember-orbit';
+import { applyStandardSourceInjections } from '@ef4/ember-orbit';
 import {
   JSONAPIRequestProcessor,
   JSONAPISerializers,
diff --git a/app/routes/colors.ts b/app/routes/colors.ts
@@ -2,7 +2,7 @@ import Route from '@ember/routing/route';
 import type Transition from '@ember/routing/transition';
 import { service } from '@ember/service';
 import { storageFor } from 'ember-local-storage';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import type PaletteModel from 'swach/data-models/palette';
 import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
diff --git a/app/routes/kuler.ts b/app/routes/kuler.ts
@@ -2,7 +2,7 @@ import Route from '@ember/routing/route';
 import type Transition from '@ember/routing/transition';
 import { service } from '@ember/service';
 import { storageFor } from 'ember-local-storage';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import type ColorModel from 'swach/data-models/color';
 import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
diff --git a/app/routes/palettes.ts b/app/routes/palettes.ts
@@ -2,7 +2,7 @@ import Route from '@ember/routing/route';
 import type Transition from '@ember/routing/transition';
 import { service } from '@ember/service';
 import { storageFor } from 'ember-local-storage';
-import type { LiveQuery, Store } from 'ember-orbit';
+import type { LiveQuery, Store } from '@ef4/ember-orbit';
 import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
 import viewTransitions from 'swach/utils/view-transitions';
diff --git a/app/services/color-utils.ts b/app/services/color-utils.ts
@@ -1,7 +1,7 @@
 import { action } from '@ember/object';
 import Service, { service } from '@ember/service';
 import { storageFor } from 'ember-local-storage';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import { TinyColor } from '@ctrl/tinycolor';
 import type { ColorInput } from '@ctrl/tinycolor';
 import type { IpcRenderer } from 'electron';
diff --git a/app/services/data.ts b/app/services/data.ts
@@ -1,6 +1,6 @@
 import Service, { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import type { Coordinator } from '@orbit/coordinator';
 import type IndexedDBSource from '@orbit/indexeddb';
 import type JSONAPISource from '@orbit/jsonapi';
diff --git a/app/services/undo-manager.ts b/app/services/undo-manager.ts
@@ -1,5 +1,5 @@
 import Service, { service } from '@ember/service';
-import type { Store } from 'ember-orbit';
+import type { Store } from '@ef4/ember-orbit';
 import type { IpcRenderer } from 'electron';
 import removeFromTo from 'swach/utils/remove-from-to';
 
diff --git a/app/templates/palettes.gts b/app/templates/palettes.gts
@@ -2,7 +2,7 @@ import { concat, fn, hash } from '@ember/helper';
 import { on } from '@ember/modifier';
 import DragSortList from 'ember-drag-sort/components/drag-sort-list';
 import stopPropagation from 'ember-event-helpers/helpers/stop-propagation';
-import type { LiveQuery } from 'ember-orbit';
+import type { LiveQuery } from '@ef4/ember-orbit';
 import RouteTemplate from 'ember-route-template';
 import set from 'ember-set-helper/helpers/set';
 import svgJar from 'ember-svg-jar/helpers/svg-jar';
diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "@babel/preset-env": "^7.28.0",
     "@babel/runtime": "^7.27.1",
     "@ctrl/tinycolor": "^4.1.0",
+    "@ef4/ember-orbit": "0.17.3-ef4.6",
     "@ember/app-tsconfig": "^1.0.3",
     "@ember/optional-features": "^2.2.0",
     "@ember/render-modifiers": "^2.1.0",
@@ -122,7 +123,6 @@
     "ember-local-storage": "2.0.6",
     "ember-math-helpers": "^5.0.0",
     "ember-modifier": "^4.2.2",
-    "ember-orbit": "^0.17.3",
     "ember-qunit": "^9.0.3",
     "ember-resolver": "^13.1.1",
     "ember-route-template": "^1.0.3",
@@ -170,7 +170,6 @@
     },
     "patchedDependencies": {
       "ember-local-storage": "patches/ember-local-storage.patch",
-      "ember-orbit": "patches/ember-orbit.patch",
       "menubar": "patches/menubar.patch",
       "object-inspect": "patches/object-inspect.patch"
     }
diff --git a/patches/ember-orbit.patch b/patches/ember-orbit.patch
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/helpers.ts b/tests/helpers.ts
diff --git a/tests/unit/services/data-test.ts b/tests/unit/services/data-test.ts
