Skip to content

Commit 7c31691

Browse files
committed
package.json: Add ember-test-waiters resolution
... to resolve the conflict caused by the `ember-app-scheduler` dependency
1 parent 846d240 commit 7c31691

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,8 @@
119119
"engines": {
120120
"node": "^14.9.0",
121121
"npm": "^6.10.2"
122+
},
123+
"resolutions": {
124+
"ember-test-waiters": "^2.0.0"
122125
}
123126
}

yarn.lock

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6957,15 +6957,7 @@ ember-test-selectors@5.0.0:
69576957
ember-cli-babel "^7.22.1"
69586958
ember-cli-version-checker "^5.1.1"
69596959

6960-
ember-test-waiters@^1.1.1:
6961-
version "1.2.0"
6962-
resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-1.2.0.tgz#c12ead4313934c24cff41857020cacdbf8e6effe"
6963-
integrity sha512-aEw7YuutLuJT4NUuPTNiGFwgTYl23ThqmBxSkfFimQAn+keWjAftykk3dlFELuhsJhYW/S8YoVjN0bSAQRLNtw==
6964-
dependencies:
6965-
ember-cli-babel "^7.11.0"
6966-
semver "^6.3.0"
6967-
6968-
ember-test-waiters@^2.0.0:
6960+
ember-test-waiters@^1.1.1, ember-test-waiters@^2.0.0:
69696961
version "2.1.3"
69706962
resolved "https://registry.yarnpkg.com/ember-test-waiters/-/ember-test-waiters-2.1.3.tgz#40fe7b674d5ef1005f665e0e040753f88c5a2175"
69716963
integrity sha512-xDjvq8/1C3b9z3NGpez7aslbq5gsLrxsdjD3apyziHkImh/PTeXZr2bxo/YAUgOwGOtpZ1So0fIsppiSN0u1Ng==

0 commit comments

Comments
 (0)