Chore/bump packages and Ember to 3.24

addon/controller.js

@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import Controller from "@ember/controller";
 
-export default Ember.Controller.extend({
-  url: null
-});
+export default class HellgateController extends Controller {
+  url = null;
+}

addon/setup.js

@@ -1,16 +1,17 @@
-import Ember from 'ember';
-import HellgateController from './controller';
+import Ember from "ember";
+import EmberRouter from "@ember/routing/router";
+import { getOwner } from "@ember/application";
+import { dasherize } from "@ember/string";
+import { run } from "@ember/runloop";
+import HellgateController from "./controller";
 import template from "ember-hellgate/templates/view";
-import getOwner from 'ember-getowner-polyfill';
 
-const {Router, RouterDSL, String, run} = Ember;
+const { RouterDSL } = Ember;
 
-const dasherize = String.dasherize;
-
-let gates = [];
+const gates = [];
 
 function canNest(dsl) {
-  return dsl.parent && dsl.parent !== 'application';
+  return dsl.parent && dsl.parent !== "application";
 }
 
 function getFullName(dsl, name, resetNamespace) {
@@ -21,25 +22,38 @@ function getFullName(dsl, name, resetNamespace) {
   }
 }
 
-function setupHellgate() {
-  RouterDSL.prototype.hellgate = function(name, url, options = {}) {
-    if (!name || !url) { throw new Error("You must provide at least a name and URL to `hellgate`."); }
+const setupHellgate = () => {
+  RouterDSL.prototype.hellgate = function (name, url, options = {}) {
+    if (!name || !url) {
+      throw new Error(
+        "You must provide at least a name and URL to `hellgate`."
+      );
+    }
 
     this.route(name, options);
 
-    let fullName = getFullName(this, name, options.resetNamespace);
+    const fullName = getFullName(this, name, options.resetNamespace);
     gates.push([fullName, url]);
   };
 
-  Router.reopen({
+  EmberRouter.reopen({
     setupRouter() {
       const ret = this._super(...arguments);
       const owner = getOwner(this);
 
       gates.forEach(([fullName, url]) => {
-        let moduleName = dasherize(fullName);
+        const moduleName = dasherize(fullName);
+        const gateAlreadyExists = owner.lookup(`template:${moduleName}`);
+
+        if (gateAlreadyExists) {
+          return;
+        }
+
+        const Controller = class extends HellgateController {
+          url = url;
+        };
         owner.register(`template:${moduleName}`, template);
-        owner.register(`controller:${moduleName}`, HellgateController.extend({url: url}));
+        owner.register(`controller:${moduleName}`, Controller);
       });
 
       window.escapeHell = (...args) => {
@@ -49,8 +63,8 @@ function setupHellgate() {
       };
 
       return ret;
-    }
+    },
   });
-}
+};
 
 export default setupHellgate;

addon/templates/view.hbs

@@ -1,3 +1,3 @@
 <div class="hellgate-container">
-<iframe src={{url}} class="hellgate-iframe"></iframe>
-</div>
+  <iframe src={{this.url}} class="hellgate-iframe"></iframe>
+</div>

app/initializers/hellgate.js

@@ -1,12 +1,10 @@
-import setupHellgate from 'ember-hellgate/setup';
+import setupHellgate from "ember-hellgate/setup";
 
 setupHellgate();
 
-export function initialize(application) {
-
-}
+export function initialize(application) {}
 
 export default {
-  name: 'ember-hellgate',
-  initialize
+  name: "ember-hellgate",
+  initialize,
 };

config/ember-try.js

@@ -2,54 +2,54 @@
 module.exports = {
   scenarios: [
     {
-      name: 'default',
+      name: "default",
       bower: {
-        dependencies: { }
-      }
+        dependencies: {},
+      },
     },
     {
-      name: 'ember-1-13',
+      name: "ember-3-16",
       bower: {
         dependencies: {
-          'ember': '~1.13.0'
+          ember: "~3.16.0",
         },
         resolutions: {
-          'ember': '~1.13.0'
-        }
-      }
+          ember: "~3.16.0",
+        },
+      },
     },
     {
-      name: 'ember-release',
+      name: "ember-release",
       bower: {
         dependencies: {
-          'ember': 'components/ember#release'
+          ember: "components/ember#release",
         },
         resolutions: {
-          'ember': 'release'
-        }
-      }
+          ember: "release",
+        },
+      },
     },
     {
-      name: 'ember-beta',
+      name: "ember-beta",
       bower: {
         dependencies: {
-          'ember': 'components/ember#beta'
+          ember: "components/ember#beta",
         },
         resolutions: {
-          'ember': 'beta'
-        }
-      }
+          ember: "beta",
+        },
+      },
     },
     {
-      name: 'ember-canary',
+      name: "ember-canary",
       bower: {
         dependencies: {
-          'ember': 'components/ember#canary'
+          ember: "components/ember#canary",
         },
         resolutions: {
-          'ember': 'canary'
-        }
-      }
-    }
-  ]
+          ember: "canary",
+        },
+      },
+    },
+  ],
 };

index.js

@@ -1,10 +1,14 @@
 /* jshint node: true */
-'use strict';
+"use strict";
 
 module.exports = {
-  name: 'ember-hellgate',
+  name: "ember-hellgate",
 
-  included: function(app) {
-    app.import('vendor/ember-hellgate.css');
-  }
+  included(app, parentAddon) {
+    let target = parentAddon || app;
+    target.options = target.options || {};
+    target.options.babel = target.options.babel || { includePolyfill: true };
+    target.import("vendor/ember-hellgate.css");
+    return this._super.included.apply(this, arguments);
+  },
 };