wip 5.4

addon/utils/geojson/circle.js

@@ -1,7 +1,6 @@
 import GeoJson, { EarthRadius, MercatorCRS, DegreesPerRadian, RadiansPerDegree } from './geo-json';
 import Feature from './feature';
 import closedPolygon from './closed-polygon';
-import { assign } from '@ember/polyfills';
 
 function radToDeg(rad) {
     return rad * DegreesPerRadian;
@@ -78,7 +77,7 @@ export default class Circle extends GeoJson {
             throw new Error('GeoJSON: missing parameter for new Circle');
         }
 
-        assign(
+        Object.assign(
             this,
             new Feature({
                 type: 'Feature',

addon/utils/geojson/feature-collection.js

@@ -1,14 +1,13 @@
 import GeoJson from './geo-json';
 import Feature from './feature';
-import { assign } from '@ember/polyfills';
 import { isArray } from '@ember/array';
 
 export default class FeatureCollection extends GeoJson {
     constructor(input) {
         super();
 
         if (input && input.type === 'FeatureCollection' && input.features) {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (isArray(input)) {
             this.features = input;
         } else {

addon/utils/geojson/feature.js

@@ -1,12 +1,11 @@
 import GeoJson from './geo-json';
-import { assign } from '@ember/polyfills';
 
 export default class Feature extends GeoJson {
     constructor(input) {
         super();
 
         if (input && input.type === 'Feature') {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (input && input.type && input.coordinates) {
             this.geometry = input;
         } else {

addon/utils/geojson/geometry-collection.js

@@ -1,13 +1,12 @@
 import GeoJson from './geo-json';
-import { assign } from '@ember/polyfills';
 import { isArray } from '@ember/array';
 
 export default class GeometryCollection extends GeoJson {
     constructor(input) {
         super();
 
         if (input && input.type === 'GeometryCollection' && input.geometries) {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (isArray(input)) {
             this.geometries = input;
         } else if (input.coordinates && input.type) {

addon/utils/geojson/line-string.js

@@ -1,13 +1,12 @@
 import GeoJson from './geo-json';
-import { assign } from '@ember/polyfills';
 import { isArray } from '@ember/array';
 
 export default class LineString extends GeoJson {
     constructor(input) {
         super();
 
         if (input && input.type === 'LineString' && input.coordinates) {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (isArray(input)) {
             this.coordinates = input;
         } else {

addon/utils/geojson/multi-line-string.js

@@ -1,14 +1,13 @@
 import GeoJson from './geo-json';
 import LineString from './line-string';
-import { assign } from '@ember/polyfills';
 import { isArray } from '@ember/array';
 
 export default class MultiLineString extends GeoJson {
     constructor(input) {
         super();
 
         if (input && input.type === 'MultiLineString' && input.coordinates) {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (isArray(input)) {
             this.coordinates = input;
         } else {

addon/utils/geojson/multi-point.js

@@ -1,14 +1,13 @@
 import GeoJson from './geo-json';
 import Point from './point';
-import { assign } from '@ember/polyfills';
 import { isArray } from '@ember/array';
 
 export default class MultiPoint extends GeoJson {
     constructor(input) {
         super();
 
         if (input && input.type === 'MultiPolygon' && input.coordinates) {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (isArray(input)) {
             this.coordinates = input;
         } else {

addon/utils/geojson/multi-polygon.js

@@ -1,15 +1,14 @@
 import GeoJson from './geo-json';
 import Polygon from './polygon';
 import closedPolygon from './closed-polygon';
-import { assign } from '@ember/polyfills';
 import { isArray } from '@ember/array';
 
 export default class MultiPolygon extends GeoJson {
     constructor(input) {
         super();
 
         if (input && input.type === 'MultiPolygon' && input.coordinates) {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (isArray(input)) {
             this.coordinates = input;
         } else {

addon/utils/geojson/point.js

@@ -1,5 +1,4 @@
 import GeoJson from './geo-json';
-import { assign } from '@ember/polyfills';
 import { isArray } from '@ember/array';
 
 export default class Point extends GeoJson {
@@ -8,7 +7,7 @@ export default class Point extends GeoJson {
         var args = Array.prototype.slice.call(arguments);
 
         if (input && input.type === 'Point' && input.coordinates) {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (input && isArray(input)) {
             this.coordinates = input;
         } else if (args.length >= 2) {

addon/utils/geojson/polygon.js

@@ -1,14 +1,13 @@
 import GeoJson from './geo-json';
 import closedPolygon from './closed-polygon';
-import { assign } from '@ember/polyfills';
 import { isArray } from '@ember/array';
 
 export default class Polygon extends GeoJson {
     constructor(input) {
         super();
 
         if (input && input.type === 'Polygon' && input.coordinates) {
-            assign(this, input);
+            Object.assign(this, input);
         } else if (isArray(input)) {
             this.coordinates = input;
         } else {

package.json

@@ -47,7 +47,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^3.2.0",
     "@embroider/test-setup": "^3.0.2",
-    "@fleetbase/ember-core": "^0.1.6",
+    "@fleetbase/ember-core": "link:../ember-core",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
@@ -59,7 +59,7 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "^5.3.0",
+    "ember-data": "^4.12.5",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^8.0.0",
     "ember-qunit": "^8.0.1",
@@ -83,9 +83,6 @@
     "stylelint-prettier": "^4.0.2",
     "webpack": "^5.89.0"
   },
-  "peerDependencies": {
-    "ember-source": ">= 4.0.0"
-  },
   "engines": {
     "node": ">= 18"
   },