Merge branch 'master' into mf-throw_on_error_perform_helper

Author: maxfierke

config/ember-try.js

@@ -63,6 +63,8 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('beta'),
+            'ember-auto-import': '^2.0.0',
+            webpack: '^5.0.0',
           },
         },
       },
@@ -71,6 +73,8 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': await getChannelURL('canary'),
+            'ember-auto-import': '^2.0.0',
+            webpack: '^5.0.0',
           },
         },
       },

package.json

@@ -78,6 +78,7 @@
     "qunit-dom": "^1.6.0",
     "sass": "^1.22.12",
     "sinon": "^11.0.0",
+    "testem": "^3.4.2",
     "typescript": "~3.9.5"
   },
   "keywords": [
@@ -102,6 +103,9 @@
     "ember-compatibility-helpers": "^1.2.0",
     "ember-destroyable-polyfill": "^2.0.2"
   },
+  "resolutions": {
+    "socket.io": "4.2.0"
+  },
   "ember": {
     "edition": "octane"
   },