Switch from an initializer to manual extendResolver usage

.github/workflows/ci.yml

@@ -68,6 +68,7 @@ jobs:
           - ember-lts-4.12
           - ember-lts-5.4
           - ember-lts-5.8
+          - ember-resolver-12
           - ember-release
           - ember-beta
           - ember-canary

README.md

@@ -30,6 +30,39 @@ Install this addon via ember-cli:
 ember install ember-can
 ```
 
+Starting from `ember-resolver` version 13 and above, you need to update your app.js or app.ts file by adding the following import:
+```js
+import { extendResolver } from 'ember-can';
+```
+
+Next, replace `Resolver = Resolver;` with:
+
+```js
+Resolver = extendResolver(Resolver);
+```
+
+Without this update, the app will encounter an error where it cannot find your abilities.
+
+After changes your app file looks like:
+```js
+import Application from '@ember/application';
+import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
+import config from 'my-app/config/environment';
+import { extendResolver } from 'ember-can';
+
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = extendResolver(Resolver);
+}
+
+loadInitializers(App, config.modulePrefix);
+```
+
+This change you can also make for `ember-resolver` < 13, but is not necessary.
+
+
 ## Compatibility
 
 * Ember.js v3.28 or above

ember-can/package.json

@@ -51,6 +51,7 @@
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.8.8",
+    "@embroider/macros": "^1.16.6",
     "decorator-transforms": "^2.0.0"
   },
   "devDependencies": {
@@ -91,7 +92,7 @@
     "babel-plugin-ember-template-compilation": "^2.2.5",
     "concurrently": "^8.2.2",
     "ember-inflector": "^5.0.1",
-    "ember-resolver": "^12.0.1",
+    "ember-resolver": "^13.0.1",
     "ember-source": "^5.8.0",
     "ember-template-lint": "^6.0.0",
     "eslint": "^8.56.0",

ember-can/src/-private/resolver.ts

@@ -0,0 +1,12 @@
+import type Resolver from 'ember-resolver';
+
+export default function extendResolver(
+  resolver: typeof Resolver,
+): typeof Resolver {
+  return class EmberCanResolver extends resolver {
+    pluralizedTypes: Record<string, string> = {
+      ...this.pluralizedTypes,
+      ability: 'abilities',
+    };
+  };
+}

ember-can/src/index.ts

@@ -1,3 +1,4 @@
 import Ability from './ability.ts';
+import extendResolver from './-private/resolver.ts';
 
-export { Ability };
+export { Ability, extendResolver };

ember-can/src/initializers/setup-ember-can.js

@@ -1,14 +1,22 @@
-import Resolver from 'ember-resolver';
+import {
+  dependencySatisfies,
+  macroCondition,
+  importSync,
+} from '@embroider/macros';
 
-Resolver.reopen({
-  init() {
-    this._super();
-    this.pluralizedTypes = {
-      ...this.pluralizedTypes,
-      ability: 'abilities',
-    };
-  },
-});
+if (macroCondition(dependencySatisfies('ember-resolver', '< 13.0.0'))) {
+  const resolver = importSync('ember-resolver').default;
+
+  resolver.reopen({
+    init() {
+      this._super();
+      this.pluralizedTypes = {
+        ...this.pluralizedTypes,
+        ability: 'abilities',
+      };
+    },
+  });
+}
 
 export function initialize() {}
 export default { initialize };