Merge pull request #312 from tildeio/update-deps

upgrade deps
tildeio · Nov 6, 2020 · cf669b3 · cf669b3
2 parents 05c7d90 + c296705
commit cf669b3
Show file tree

Hide file tree

Showing 5 changed files with 652 additions and 381 deletions.
diff --git a/lib/rsvp/index.d.ts b/lib/rsvp/index.d.ts
@@ -20,7 +20,7 @@ declare module 'rsvp' {
     | ((value: T) => TResult1 | PromiseLike<TResult1>)
     | undefined
     | null;
-  export type OnRejected<T, TResult2> =
+  export type OnRejected<TResult2> =
     | ((reason: any) => TResult2 | PromiseLike<TResult2>)
     | undefined
     | null;

diff --git a/package.json b/package.json
@@ -35,30 +35,30 @@
     "@glimmer/env": "^0.1.7"
   },
   "devDependencies": {
-    "@babel/plugin-transform-modules-amd": "^7.10.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-    "@types/node": "^12.7.5",
-    "@types/qunit": "^2.9.1",
-    "@typescript-eslint/eslint-plugin": "^3.7.0",
-    "@typescript-eslint/parser": "^3.7.0",
+    "@babel/plugin-transform-modules-amd": "^7.12.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+    "@types/node": "^14.14.6",
+    "@types/qunit": "^2.9.6",
+    "@typescript-eslint/eslint-plugin": "^4.6.1",
+    "@typescript-eslint/parser": "^4.6.1",
     "babel-plugin-debug-macros": "^0.3.3",
     "backburner.js": "^2.6.0",
-    "broccoli-babel-transpiler": "^7.6.0",
+    "broccoli-babel-transpiler": "^7.8.0",
     "broccoli-concat": "^4.2.4",
     "broccoli-funnel": "^3.0.3",
     "broccoli-merge-trees": "^4.2.0",
-    "broccoli-typescript-compiler": "^6.0.0",
-    "ember-cli": "~3.19.0",
+    "broccoli-typescript-compiler": "^7.0.0",
+    "ember-cli": "~3.22.0",
     "ensure-posix-path": "^1.1.1",
-    "eslint": "^7.5.0",
-    "eslint-config-prettier": "^6.11.0",
+    "eslint": "^7.12.1",
+    "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-prettier": "^3.1.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "2.0.5",
-    "qunit": "^2.10.1",
-    "release-it": "^14.0.2",
-    "release-it-lerna-changelog": "^2.4.0",
+    "prettier": "^2.1.2",
+    "qunit": "^2.11.3",
+    "release-it": "^14.2.1",
+    "release-it-lerna-changelog": "^3.1.0",
     "route-recognizer": "^0.3.4",
     "rsvp": "^4.8.5"
   },

diff --git a/tests/route_info_test.ts b/tests/route_info_test.ts
@@ -153,12 +153,19 @@ test('UnresolvedRouteInfoByObject does NOT get its model hook called', function
   assert.expect(1);
 
   class TestRouteInfo extends UnresolvedRouteInfoByObject<Route> {
-    route = createHandler('uresolved', {
-      model: function () {
-        assert.ok(false, "I shouldn't be called because I already have a context/model");
-      },
-    });
+    __routeHandler?: Route;
+    get route(): Route {
+      if (this.__routeHandler) {
+        return this.__routeHandler;
+      }
+      return (this.__routeHandler = createHandler('uresolved', {
+        model: function () {
+          assert.ok(false, "I shouldn't be called because I already have a context/model");
+        },
+      }));
+    }
   }
+
   let routeInfo = new TestRouteInfo(
     new TestRouter(),
     'unresolved',

diff --git a/tests/router_test.ts b/tests/router_test.ts
@@ -2949,9 +2949,6 @@ scenarios.forEach(function (scenario) {
 
     // Go to post 3. This triggers our test.
     transitionTo(router, '/posts/3');
-
-    // Clean up.
-    delete router.willTransition;
   });
 
   test('tests whether arguments to transitionTo are considered active', function (assert) {