refactor: add some PR #153 suggestions

.npmignore

@@ -28,6 +28,9 @@
 /tests/
 /yarn-error.log
 /yarn.lock
+/.releaserc
+/jsconfig.json
+/greenkeeper.json
 .gitkeep
 
 # ember-try

addon/components/modal-wrapper/index.hbs

@@ -1,3 +1,5 @@
 <div role="dialog" data-id={{this.dataId}} data-modal-show={{this.dataModalShow}} {{did-insert this.onDidInsert}}>
-  <@model.componentName @model={{@model}} @changeVisibility={{this.changeVisibility}} @element={{this.element}} />
+  {{#let (ensure-safe-component (component this.componentName)) as |Modal|}}
+    <Modal @model={{@model}} @changeVisibility={{this.changeVisibility}} @element={{this.element}} />
+  {{/let}}
 </div>

addon/components/modal-wrapper/index.js

@@ -15,6 +15,10 @@ export default class ModalWrapperComponent extends Component {
     return String(this.visible);
   }
 
+  get componentName() {
+    return this.args.model.fullname;
+  }
+
   @action
   onDidInsert(element) {
     this.element = element;

addon/components/modal/index.js

@@ -38,14 +38,19 @@ export default class ModalComponent extends Component {
   constructor() {
     super(...arguments);
 
-    // [Service closes modal] Prevent creating an uncaught promise.
-    this.model.promise.catch(() => {
+    this._attachToServiceClose();
+
+    next(this, '_open');
+  }
+
+  async _attachToServiceClose() {
+    try {
+      await this.model.promise;
+    } catch {
       if (!this._fullfillmentFn) {
         this._close();
       }
-    });
-
-    next(this, '_open');
+    }
   }
 
   @isNotDestroyed

addon/models/modal.js

@@ -4,8 +4,6 @@ import { defer } from 'rsvp';
 import { isBlank } from '@ember/utils';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { tracked } from '@glimmer/tracking';
-import { ensureSafeComponent } from '@embroider/util';
-import { getOwner } from '@ember/application';
 
 export default class ModalModel extends EmberObject.extend(PromiseProxyMixin) {
   @tracked name;
@@ -17,7 +15,7 @@ export default class ModalModel extends EmberObject.extend(PromiseProxyMixin) {
   @tracked isFulfilled = false;
   @tracked isRejected = false;
 
-  @tracked _deferred = defer();
+  _deferred = defer();
 
   get promise() {
     return this._deferred.promise;
@@ -33,14 +31,6 @@ export default class ModalModel extends EmberObject.extend(PromiseProxyMixin) {
     return `modal-${dasherize(name)}`;
   }
 
-  get componentName() {
-    const componentFactory = getOwner(this).factoryFor(
-      `component:${this.fullname}`
-    );
-
-    return ensureSafeComponent(componentFactory.class, this);
-  }
-
   resolve() {
     this.isPending = false;
     this.isSettled = true;

addon/services/modal.js

@@ -21,15 +21,21 @@ export default class ModalService extends Service.extend(Evented) {
 
     this.trigger('open', model);
 
-    model.promise
-      .catch(() => {})
-      .finally(() => {
-        this.trigger('close', model);
-      });
+    this._attachToModalClose(model);
 
     return model.promise;
   }
 
+  async _attachToModalClose(model) {
+    try {
+      await model.promise;
+    } catch {
+      // Nope...
+    } finally {
+      this.trigger('close', model);
+    }
+  }
+
   _closeByModel(model) {
     // Remove from DOM
     this.content.removeObject(model);