Do not assume global variables are assigned to self. (#205)

Do not assume global variables are assigned to `self`.
ember-cli · Nov 2, 2019 · 3c0e3ff · 3c0e3ff
2 parents 6563435 + 8a0dff8
commit 3c0e3ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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) {

diff --git 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.*"
   },