Fixes for use in Ember 5.x but needs a little help (Issue #110)

config/ember-try.js

@@ -23,6 +23,22 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-4.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.12.0',
+          },
+        },
+      },
+      {
+        name: 'ember-lts-5.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~5.4.0',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-classic-decorator",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Decorator to aide migration from classic class system to native classes",
   "keywords": [
     "ember-addon"
@@ -26,15 +26,15 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@embroider/macros": "^1.0.0",
+    "@embroider/macros": "^1.13.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^1.0.0",
+    "@embroider/test-setup": "^3.0.3",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
@@ -43,18 +43,17 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deprecation-workflow": "^2.1.0",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-mirage": "^2.4.0",
+    "ember-cli-mirage": "^3.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.1.0",
+    "ember-data": "~4.11.3",
     "ember-decorators-polyfill": "^1.1.5",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.1.0",
+    "ember-source": "~5.4.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.0.0",
     "ember-try": "^2.0.0",
@@ -65,6 +64,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-qunit": "^7.2.0",
     "loader.js": "^4.7.0",
+    "miragejs": "^0.1.48",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.5.1",
     "qunit": "^2.17.2",

tests/dummy/app/services/store.js

@@ -1,3 +1,13 @@
 import Store from '@ember-data/store';
-
-export default class CustomStore extends Store {}
+// import Store, { CacheHandler } from '@ember-data/store';
+// import RequestManager from '@ember-data/request';
+// import Fetch from '@ember-data/request/fetch';
+// import { LegacyNetworkHandler } from '@ember-data/legacy-compat';
+export default class CustomStore extends Store {
+  constructor() {
+    super(...arguments);
+    // this.requestManager = new RequestManager();
+    // this.requestManager.use([LegacyNetworkhandler, Fetch]);
+    // this.requestManager.useCache(CacheHandler);
+  }
+}

tests/dummy/mirage/config.js

@@ -1,6 +1,31 @@
-export default function () {
-  this.namespace = 'api';
+import {
+  discoverEmberDataModels,
+  applyEmberDataSerializers,
+} from 'ember-cli-mirage';
+import { createServer } from 'miragejs';
+
+export default function (config) {
+  let finalConfig = {
+    ...config,
+    models: {
+      ...discoverEmberDataModels(config.store),
+      ...config.models,
+    },
+    serializers: applyEmberDataSerializers(config.serializers),
+    routes,
+  };
+  return createServer(finalConfig);
+}
 
+function routes() {
+  this.namespace = 'api';
+  this.get('/posts/1', () => ({
+    posts: {
+      id: 1,
+      title: "I'm Running to Reform the W3C's Tag",
+      author: 'Yehuda Katz',
+    },
+  }));
   // These comments are here to help you get started. Feel free to delete them.
 
   /*
@@ -24,12 +49,4 @@ export default function () {
 
     https://www.ember-cli-mirage.com/docs/route-handlers/shorthands
   */
-
-  this.get('/posts/1', () => ({
-    posts: {
-      id: 1,
-      title: "I'm Running to Reform the W3C's Tag",
-      author: 'Yehuda Katz',
-    },
-  }));
 }

tests/dummy/mirage/serializers/application.js

@@ -1,3 +1,3 @@
-import { JSONAPISerializer } from 'ember-cli-mirage';
+import { JSONAPISerializer } from 'miragejs';
 
 export default JSONAPISerializer.extend({});

vendor/classic-decorator/index.js

@@ -22,8 +22,12 @@
   IS_PERMA_CLASSIC.set(_Ember.Route, false);
   IS_PERMA_CLASSIC.set(_Ember.Service, false);
   IS_PERMA_CLASSIC.set(_Ember.Helper, false);
-  IS_PERMA_CLASSIC.set(_Ember.Location, false);
-  IS_PERMA_CLASSIC.set(_Ember.AutoLocation, false);
+  if (_Ember.Location) { // Not present from Ember 5.3 onward
+    IS_PERMA_CLASSIC.set(_Ember.Location, false);
+  }
+  if (_Ember.AutoLocation) { // Not present from Ember 5.3 onward
+    IS_PERMA_CLASSIC.set(_Ember.AutoLocation, false);
+  }
   IS_PERMA_CLASSIC.set(_Ember.HashLocation, false);
   IS_PERMA_CLASSIC.set(_Ember.HistoryLocation, false);
   IS_PERMA_CLASSIC.set(_Ember.NoneLocation, false);
@@ -37,7 +41,9 @@
   BASE_CLASSES.set(_Ember.Route, true);
   BASE_CLASSES.set(_Ember.Service, true);
   BASE_CLASSES.set(_Ember.Helper, true);
-  BASE_CLASSES.set(_Ember.Location, true);
+  if (_Ember.Location) { // Not present from Ember 5.3 onward
+    BASE_CLASSES.set(_Ember.Location, true);
+  }
 
   function getClassName(klass) {
     var klassToString = klass.toString();