Skip to content

Commit

Permalink
Merge branch 'development' into dependabot/npm_and_yarn/types/ember__…
Browse files Browse the repository at this point in the history
…test-helpers-1.7.0
  • Loading branch information
iamareebjamal authored Jun 10, 2020
2 parents 2f30108 + 57f4a47 commit c650393
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 20 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"@sentry/browser": "^5.17.0",
"@sentry/integrations": "^5.17.0",
"@sentry/node": "^5.17.0",
"@types/ember": "^3.1.2",
"@types/ember": "^3.16.0",
"@types/ember-data": "^3.1.11",
"@types/ember-qunit": "^3.4.8",
"@types/ember-qunit": "^3.4.9",
"@types/ember__test-helpers": "^1.7.0",
"@types/qunit": "^2.9.1",
"@types/rsvp": "^4.0.3",
Expand Down Expand Up @@ -74,7 +74,7 @@
"ember-cli-head": "^1.0.0",
"ember-cli-html-minifier": "^1.1.0",
"ember-cli-htmlbars": "^5.1.2",
"ember-cli-ifa": "^0.7.0",
"ember-cli-ifa": "^0.10.0",
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-mirage": "^1.1.7",
"ember-cli-moment-shim": "^3.7.1",
Expand All @@ -89,7 +89,7 @@
"ember-cli-typescript": "^3.1.4",
"ember-cli-typescript-blueprints": "^3.0.0",
"ember-cli-uglify": "^3.0.0",
"ember-composable-helpers": "^4.1.3",
"ember-composable-helpers": "^4.2.0",
"ember-config-service": "^1.0.0",
"ember-cookies": "^0.5.2",
"ember-data": "3.14.1",
Expand Down
33 changes: 17 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1540,10 +1540,10 @@
"@types/ember__object" "*"
"@types/rsvp" "*"

"@types/ember-qunit@^3.4.8":
version "3.4.8"
resolved "https://registry.yarnpkg.com/@types/ember-qunit/-/ember-qunit-3.4.8.tgz#81dbfa76f0729ec5c455039457ba747fb7b44ec1"
integrity sha512-eAFYXit9vIXLiJiLzmI3Y37+AprHX0aVkgkC9cZzOLPAFeTSJ9T6Mso0o9EvrlAeFe/opg9uGp/QUgbX7X7IAw==
"@types/ember-qunit@^3.4.9":
version "3.4.9"
resolved "https://registry.yarnpkg.com/@types/ember-qunit/-/ember-qunit-3.4.9.tgz#df08d29609f906a081dc8f1c0e00b390fec3b4d7"
integrity sha512-XFe9EK9CVo431TJjS2a/bEcdRBCWFZeDYvYwZEDAlAVvVj9oApAX3bU4OEu9R9xHe6UhyvsgSa7dEr1tComRFQ==
dependencies:
"@types/ember" "*"
"@types/ember-test-helpers" "*"
Expand All @@ -1558,10 +1558,10 @@
"@types/jquery" "*"
"@types/rsvp" "*"

"@types/ember@*", "@types/ember@^3.1.0", "@types/ember@^3.1.2":
version "3.1.2"
resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.1.2.tgz#b795e41f4a5569447c006e293195e62dc139cced"
integrity sha512-Z4jxklUlnoWEkenLaMDDmzguL3UUcAIaCiu28nNYlIovWTGmvKuJgUKSqd+03j4jjzaz+yz0fepM408XULew/A==
"@types/ember@*", "@types/ember@^3.1.0", "@types/ember@^3.16.0":
version "3.16.0"
resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.16.0.tgz#1627b42087556ee366258e37b31ae81571e6e0ca"
integrity sha512-9TBWidO/9ydThgh0Fy7y2DNX7Pb8REoV7tYK+HBFZ2iyc1TwXTNt15gVz0cCyorvsve2OS+vt5wzYvlqgSGlwg==
dependencies:
"@types/ember__application" "*"
"@types/ember__array" "*"
Expand Down Expand Up @@ -6221,11 +6221,12 @@ ember-cli-htmlbars@^5.1.2:
strip-bom "^4.0.0"
walk-sync "^2.1.0"

ember-cli-ifa@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/ember-cli-ifa/-/ember-cli-ifa-0.7.0.tgz#dbcfef17744d9ee10648dca5025ac55383d528f8"
ember-cli-ifa@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/ember-cli-ifa/-/ember-cli-ifa-0.10.0.tgz#2526bf5921561625de1c1cc3b1e73f8e18fb43a7"
integrity sha512-qtX7WqX15sldqwDWfa2+o68yNtV1UhTyQtCddDh2WLioENer696ZkZlKh8QNSYUvY/DADWbmCphl9n8S9beQDw==
dependencies:
ember-cli-babel "^6.11.0"
ember-cli-babel "^7.19.0"

ember-cli-import-polyfill@^0.2.0:
version "0.2.0"
Expand Down Expand Up @@ -6679,10 +6680,10 @@ ember-composable-helpers@^3.0.2:
ember-cli-babel "^7.1.0"
resolve "^1.10.0"

ember-composable-helpers@^4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-4.1.3.tgz#0951d850e202edf53d10e1cd6729e249cd07e136"
integrity sha512-dcst8g9+VOqO7/ZNAs2WIHF9sO9v5xFd9cArTcymrospzw4XdekmPv/yuuD5tcydfj+1HI6wTrmWXAeElpB29Q==
ember-composable-helpers@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-4.2.0.tgz#7cccae6af12ded782eeec376fed2427a5dbdf7a6"
integrity sha512-+8TU4F+Gcv0muxPO14alES9f1A1Ljg3+Nlkkvxp0mLb4bAjgiUHLn8qf/IPYCd9e02R19ssiTODTR/+oQmsiVg==
dependencies:
"@babel/core" "^7.0.0"
broccoli-funnel "2.0.1"
Expand Down

0 comments on commit c650393

Please sign in to comment.