Skip to content

Commit 22bd4d2

Browse files
authored
Merge branch 'development' into enhance-session-card
2 parents c4c2661 + 7995611 commit 22bd4d2

File tree

2 files changed

+90
-67
lines changed

2 files changed

+90
-67
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@types/ember__test-helpers": "^1.7.3",
4848
"@types/lodash-es": "^4.17.3",
4949
"@types/moment": "^2.13.0",
50-
"@types/qunit": "^2.9.6",
50+
"@types/qunit": "^2.11.0",
5151
"@types/rsvp": "^4.0.3",
5252
"@types/url-parse": "^1.4.3",
5353
"@typescript-eslint/eslint-plugin": "^4.9.0",
@@ -60,7 +60,7 @@
6060
"css-loader": "^5.0.1",
6161
"dompurify": "^2.2.2",
6262
"ember-ajax": "5.0.0",
63-
"ember-auto-import": "^1.7.0",
63+
"ember-auto-import": "^1.8.0",
6464
"ember-classic-decorator": "^2.0.0",
6565
"ember-cli": "~3.22.0",
6666
"ember-cli-accounting": "^2.0.2",

yarn.lock

Lines changed: 88 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@
873873
dependencies:
874874
"@babel/helper-plugin-utils" "^7.10.4"
875875

876-
"@babel/plugin-transform-runtime@^7.12.0", "@babel/plugin-transform-runtime@^7.2.0":
876+
"@babel/plugin-transform-runtime@^7.12.0", "@babel/plugin-transform-runtime@^7.12.1", "@babel/plugin-transform-runtime@^7.2.0":
877877
version "7.12.1"
878878
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5"
879879
integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==
@@ -1068,6 +1068,13 @@
10681068
dependencies:
10691069
regenerator-runtime "^0.13.4"
10701070

1071+
"@babel/runtime@^7.12.5":
1072+
version "7.12.5"
1073+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
1074+
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
1075+
dependencies:
1076+
regenerator-runtime "^0.13.4"
1077+
10711078
"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.8.3":
10721079
version "7.12.7"
10731080
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
@@ -1317,17 +1324,17 @@
13171324
ember-cli-htmlbars-inline-precompile "^2.1.0"
13181325
ember-test-waiters "^1.1.1"
13191326

1320-
"@embroider/core@0.23.0", "@embroider/core@^0.23.0":
1321-
version "0.23.0"
1322-
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.23.0.tgz#5992f6dbeaeac688d2436d7b8b7034738a7722a2"
1323-
integrity sha512-e3HniYcT7Xa2IAIjOfTnp6vLst1V8rPJ6Md9/WmDWvGFEyT4tRPPjk6EKjVN47CbsNGtW8iYUigLWEUbUWFWlA==
1327+
"@embroider/core@0.24.1":
1328+
version "0.24.1"
1329+
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.24.1.tgz#bd214bed35fec5926844b3ba05528fe542942749"
1330+
integrity sha512-gIl2AMABIRmyuv34mqnjGQpaECeXgQJGR3D2TdmhUkeeMoxJtOGeoWMoEJQqU1m8REK+AoFM91gyemFBsa3HSw==
13241331
dependencies:
13251332
"@babel/core" "^7.8.7"
13261333
"@babel/parser" "^7.8.7"
13271334
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
13281335
"@babel/traverse" "^7.8.6"
13291336
"@babel/types" "^7.8.7"
1330-
"@embroider/macros" "0.23.0"
1337+
"@embroider/macros" "0.24.1"
13311338
assert-never "^1.1.0"
13321339
babel-plugin-syntax-dynamic-import "^6.18.0"
13331340
broccoli-persistent-filter "^2.2.2"
@@ -1352,17 +1359,17 @@
13521359
walk-sync "^1.1.3"
13531360
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
13541361

1355-
"@embroider/core@0.24.1":
1356-
version "0.24.1"
1357-
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.24.1.tgz#bd214bed35fec5926844b3ba05528fe542942749"
1358-
integrity sha512-gIl2AMABIRmyuv34mqnjGQpaECeXgQJGR3D2TdmhUkeeMoxJtOGeoWMoEJQqU1m8REK+AoFM91gyemFBsa3HSw==
1362+
"@embroider/core@0.29.0":
1363+
version "0.29.0"
1364+
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.29.0.tgz#51421fbb2bcee607dc6e162400e3502a121230d2"
1365+
integrity sha512-2i0QtV1y1jJpj1aiIA3FVZHfuLBN2yCUcJs0PkOsqZYi7J796KT4t7WwAk8gmBq00yGzHDWLw/iH4ULTomPS8A==
13591366
dependencies:
1360-
"@babel/core" "^7.8.7"
1361-
"@babel/parser" "^7.8.7"
1367+
"@babel/core" "^7.12.3"
1368+
"@babel/parser" "^7.12.3"
13621369
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
1363-
"@babel/traverse" "^7.8.6"
1364-
"@babel/types" "^7.8.7"
1365-
"@embroider/macros" "0.24.1"
1370+
"@babel/traverse" "^7.12.1"
1371+
"@babel/types" "^7.12.1"
1372+
"@embroider/macros" "0.29.0"
13661373
assert-never "^1.1.0"
13671374
babel-plugin-syntax-dynamic-import "^6.18.0"
13681375
broccoli-persistent-filter "^2.2.2"
@@ -1375,35 +1382,39 @@
13751382
fs-tree-diff "^2.0.0"
13761383
handlebars "^4.4.2"
13771384
js-string-escape "^1.0.1"
1378-
jsdom "^12.0.0"
1385+
jsdom "^16.4.0"
13791386
json-stable-stringify "^1.0.1"
13801387
lodash "^4.17.10"
13811388
pkg-up "^2.0.0"
13821389
resolve "^1.8.1"
13831390
resolve-package-path "^1.2.2"
1384-
semver "^5.5.0"
1391+
semver "^7.3.2"
13851392
strip-bom "^3.0.0"
13861393
typescript-memoize "^1.0.0-alpha.3"
13871394
walk-sync "^1.1.3"
13881395
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
13891396

1390-
"@embroider/core@0.29.0":
1391-
version "0.29.0"
1392-
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.29.0.tgz#51421fbb2bcee607dc6e162400e3502a121230d2"
1393-
integrity sha512-2i0QtV1y1jJpj1aiIA3FVZHfuLBN2yCUcJs0PkOsqZYi7J796KT4t7WwAk8gmBq00yGzHDWLw/iH4ULTomPS8A==
1397+
"@embroider/core@0.33.0", "@embroider/core@^0.33.0":
1398+
version "0.33.0"
1399+
resolved "https://registry.yarnpkg.com/@embroider/core/-/core-0.33.0.tgz#0fb1752d6e34ea45368e65c42e13220a57ffae76"
1400+
integrity sha512-Kd3W4vBJCSwskVislwldhuoe1RtdA04lRr2r2ccnPI4msCXxLn292WBaS7/x0LdEu2EMO5ffRDeQva2/xoS4Yg==
13941401
dependencies:
13951402
"@babel/core" "^7.12.3"
13961403
"@babel/parser" "^7.12.3"
13971404
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
1405+
"@babel/plugin-transform-runtime" "^7.12.1"
1406+
"@babel/runtime" "^7.12.5"
13981407
"@babel/traverse" "^7.12.1"
13991408
"@babel/types" "^7.12.1"
1400-
"@embroider/macros" "0.29.0"
1409+
"@embroider/macros" "0.33.0"
14011410
assert-never "^1.1.0"
14021411
babel-plugin-syntax-dynamic-import "^6.18.0"
1403-
broccoli-persistent-filter "^2.2.2"
1404-
broccoli-plugin "^3.0.0"
1405-
broccoli-source "^1.1.0"
1412+
broccoli-node-api "^1.7.0"
1413+
broccoli-persistent-filter "^3.1.2"
1414+
broccoli-plugin "^4.0.1"
1415+
broccoli-source "^3.0.0"
14061416
debug "^3.1.0"
1417+
escape-string-regexp "^4.0.0"
14071418
fast-sourcemap-concat "^1.4.0"
14081419
filesize "^4.1.2"
14091420
fs-extra "^7.0.1"
@@ -1422,21 +1433,6 @@
14221433
walk-sync "^1.1.3"
14231434
wrap-legacy-hbs-plugin-if-needed "^1.0.1"
14241435

1425-
"@embroider/macros@0.23.0":
1426-
version "0.23.0"
1427-
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.23.0.tgz#b76a5b34b33228b4ad37136a29e7888722653dd8"
1428-
integrity sha512-Id4BA6VYvRmRTrMwTGFXUJkNIJDNnxNpcdAA5a3xWSTDlY0mroYBlPgnM2M+21pu+4p+Hpb4VkeK1+U/DBP6lg==
1429-
dependencies:
1430-
"@babel/core" "^7.8.7"
1431-
"@babel/traverse" "^7.8.6"
1432-
"@babel/types" "^7.8.7"
1433-
"@embroider/core" "0.23.0"
1434-
assert-never "^1.1.0"
1435-
ember-cli-babel "^7.20.5"
1436-
lodash "^4.17.10"
1437-
resolve "^1.8.1"
1438-
semver "^5.6.0"
1439-
14401436
"@embroider/macros@0.24.1", "@embroider/macros@^0.24.1":
14411437
version "0.24.1"
14421438
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.24.1.tgz#0ab11b88d148f35c91f438f0b44f96fbf1607a9b"
@@ -1467,6 +1463,21 @@
14671463
resolve "^1.8.1"
14681464
semver "^7.3.2"
14691465

1466+
"@embroider/macros@0.33.0":
1467+
version "0.33.0"
1468+
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.33.0.tgz#d5826ea7565bb69b57ba81ed528315fe77acbf9d"
1469+
integrity sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==
1470+
dependencies:
1471+
"@babel/core" "^7.12.3"
1472+
"@babel/traverse" "^7.12.1"
1473+
"@babel/types" "^7.12.1"
1474+
"@embroider/core" "0.33.0"
1475+
assert-never "^1.1.0"
1476+
ember-cli-babel "^7.23.0"
1477+
lodash "^4.17.10"
1478+
resolve "^1.8.1"
1479+
semver "^7.3.2"
1480+
14701481
"@eslint/eslintrc@^0.2.1":
14711482
version "0.2.1"
14721483
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
@@ -2165,10 +2176,10 @@
21652176
version "9.6.39"
21662177
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.39.tgz#111cb4f5591cb6945aad34733b4e40bfd59b58fc"
21672178

2168-
"@types/qunit@*", "@types/qunit@^2.9.6":
2169-
version "2.9.6"
2170-
resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.9.6.tgz#5d6ba092920edf9dc7377f5091e36eb448743a02"
2171-
integrity sha512-FfKb3sBW9sdjj8mPzAXtsKn53sOHpzi4PZj0H7P5G24VruwaOmvi0L2kJpuYARQjOKRl/YVlZQ6JWPnspWOkZA==
2179+
"@types/qunit@*", "@types/qunit@^2.11.0":
2180+
version "2.11.0"
2181+
resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.0.tgz#e0fb93240fa0ad3fb2842848496061eaac5738f3"
2182+
integrity sha512-ljSVL9D+/EHcduZe3KTNm+Fmoy/DcB+BtBFe0FGt2KrWWIyTQZIV8NTLdYdMjheY9L/+mWKM6Rph2m8pSdhHBA==
21722183

21732184
"@types/range-parser@*":
21742185
version "1.2.3"
@@ -4465,7 +4476,7 @@ broccoli-plugin@^3.0.0, broccoli-plugin@^3.1.0:
44654476
rimraf "^2.3.4"
44664477
symlink-or-copy "^1.1.8"
44674478

4468-
broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
4479+
broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
44694480
version "4.0.3"
44704481
resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.3.tgz#9dcfbfb6a1b27a37cc22e65c071719ce9f92bc1e"
44714482
integrity sha512-CtAIEYq5K+4yQv8c/BHymOteuyjDAJfvy/asu4LudIWcMSS7dTn3yGI5gNBkwHG+qlRangYkHJNVAcDZMQbSVQ==
@@ -6252,35 +6263,37 @@ ember-assign-polyfill@~2.4.0:
62526263
ember-cli-babel "^6.6.0"
62536264
ember-cli-version-checker "^2.0.0"
62546265

6255-
ember-auto-import@^1.5.2, ember-auto-import@^1.5.3, ember-auto-import@^1.7.0:
6256-
version "1.7.0"
6257-
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.7.0.tgz#dd809fbe3d40647f2af443072405094d0e77ecf5"
6258-
integrity sha512-onp7XZKwiit3BgkOPV/obi3fvLJmDNKTTjRsVtYz63yWeyT3ahiM8BIvJYzHGL4cxlGLvwpTJy2HYBDs6ZtvoQ==
6266+
ember-auto-import@^1.5.2, ember-auto-import@^1.5.3, ember-auto-import@^1.8.0:
6267+
version "1.8.0"
6268+
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.8.0.tgz#de7624b36ceb53a5a5878ebfe86ae70f0fea7921"
6269+
integrity sha512-pX8rqT6oWiotz4n4rHDlYrVnQl0KVGanv/a+E2xUnkjsyL2K5JfrwJdyRaDsMQPNHkrz12HFnR/WKhjRoVDoIA==
62596270
dependencies:
62606271
"@babel/core" "^7.1.6"
62616272
"@babel/preset-env" "^7.10.2"
62626273
"@babel/traverse" "^7.1.6"
62636274
"@babel/types" "^7.1.6"
6264-
"@embroider/core" "^0.23.0"
6275+
"@embroider/core" "^0.33.0"
62656276
babel-core "^6.26.3"
62666277
babel-loader "^8.0.6"
62676278
babel-plugin-syntax-dynamic-import "^6.18.0"
62686279
babel-template "^6.26.0"
62696280
babylon "^6.18.0"
62706281
broccoli-debug "^0.6.4"
6271-
broccoli-plugin "^1.3.0"
6282+
broccoli-node-api "^1.7.0"
6283+
broccoli-plugin "^4.0.0"
62726284
debug "^3.1.0"
62736285
ember-cli-babel "^7.0.0"
62746286
enhanced-resolve "^4.0.0"
62756287
fs-extra "^6.0.1"
6276-
fs-tree-diff "^1.0.0"
6288+
fs-tree-diff "^2.0.0"
62776289
handlebars "^4.3.1"
62786290
js-string-escape "^1.0.1"
62796291
lodash "^4.17.19"
62806292
mkdirp "^0.5.1"
62816293
pkg-up "^2.0.0"
62826294
resolve "^1.7.1"
62836295
rimraf "^2.6.2"
6296+
semver "^7.3.4"
62846297
symlink-or-copy "^1.2.0"
62856298
typescript-memoize "^1.0.0-alpha.3"
62866299
walk-sync "^0.3.3"
@@ -8174,6 +8187,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
81748187
version "1.0.5"
81758188
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
81768189

8190+
escape-string-regexp@^4.0.0:
8191+
version "4.0.0"
8192+
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
8193+
integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
8194+
81778195
escodegen@^1.11.0:
81788196
version "1.13.0"
81798197
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.13.0.tgz#c7adf9bd3f3cc675bb752f202f79a720189cab29"
@@ -9390,15 +9408,6 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5
93909408
path-posix "^1.0.0"
93919409
symlink-or-copy "^1.1.8"
93929410

9393-
fs-tree-diff@^1.0.0:
9394-
version "1.0.2"
9395-
resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-1.0.2.tgz#0e2931733a85b55feb3472c0b89a20b0c03ac0de"
9396-
dependencies:
9397-
heimdalljs-logger "^0.1.7"
9398-
object-assign "^4.1.0"
9399-
path-posix "^1.0.0"
9400-
symlink-or-copy "^1.1.8"
9401-
94029411
fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
94039412
version "2.0.1"
94049413
resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
@@ -11756,6 +11765,13 @@ lru-cache@^5.1.1:
1175611765
dependencies:
1175711766
yallist "^3.0.2"
1175811767

11768+
lru-cache@^6.0.0:
11769+
version "6.0.0"
11770+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
11771+
integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
11772+
dependencies:
11773+
yallist "^4.0.0"
11774+
1175911775
magic-string@^0.24.0:
1176011776
version "0.24.1"
1176111777
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.24.1.tgz#7e38e5f126cae9f15e71f0cf8e450818ca7d5a8f"
@@ -14729,10 +14745,12 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.3.0:
1472914745
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
1473014746
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
1473114747

14732-
semver@^7.0.0, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2:
14733-
version "7.3.2"
14734-
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
14735-
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
14748+
semver@^7.0.0, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
14749+
version "7.3.4"
14750+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
14751+
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
14752+
dependencies:
14753+
lru-cache "^6.0.0"
1473614754

1473714755
semver@~5.3.0:
1473814756
version "5.3.0"
@@ -16783,6 +16801,11 @@ yallist@^3.0.0, yallist@^3.0.2:
1678316801
version "3.0.3"
1678416802
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
1678516803

16804+
yallist@^4.0.0:
16805+
version "4.0.0"
16806+
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
16807+
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
16808+
1678616809
yam@^1.0.0:
1678716810
version "1.0.0"
1678816811
resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"

0 commit comments

Comments
 (0)