From b79fb983e28f5de8fcb543aec0196a6f15f82962 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sat, 2 Nov 2019 08:54:42 -0400
Subject: [PATCH 1/2] Do not assume global variables are assigned to `self`.

`requirejs` is a global variable (provided by [loader.js
here](https://github.com/ember-cli/loader.js/blob/v4.7.0/lib/loader/loader.js#L1)).
The prior code made the assumption that all global variables are
assigned to `self`/`window`, but this is _only_ true in some
circumstances. For example, when the entire bundle is evaluated within
an IIFE `self.requirejs` is undefined.
---
 addon/index.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addon/index.ts b/addon/index.ts
index 6d8aa31..dcc8188 100644
--- a/addon/index.ts
+++ b/addon/index.ts
@@ -1,3 +1,9 @@
+declare global {
+  var requirejs: {
+    _eak_seen: Object;
+  };
+}
+
 import Engine from '@ember/engine';
 import require from 'require';
 
@@ -39,7 +45,7 @@ export default function loadInitializers(app: typeof Engine, prefix: string): vo
   var instanceInitializers = [];
   // this is 2 pass because generally the first pass is the problem
   // and is reduced, and resolveInitializer has potential to deopt
-  var moduleNames = Object.keys(self.requirejs._eak_seen);
+  var moduleNames = Object.keys(requirejs._eak_seen);
   for (var i = 0; i < moduleNames.length; i++) {
     var moduleName = moduleNames[i];
     if (moduleName.lastIndexOf(initializerPrefix, 0) === 0) {

From 8a0dff8da4b0b47f70145610e33dc073fbf8ff34 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sat, 2 Nov 2019 09:08:06 -0400
Subject: [PATCH 2/2] Pin engine.io subdependency to avoid local test issues on
 Node 6

Reported upstream in https://github.com/socketio/engine.io/issues/589
---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 7499eda..42f2495 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,9 @@
     "release-it-lerna-changelog": "^1.0.3",
     "typescript": "^3.6.3"
   },
+  "resolutions": {
+    "**/engine.io": "~3.3.0"
+  },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"
   },