@@ -7872,6 +7872,14 @@ broccoli-merge-trees@^2.0.0:
78727872 broccoli-plugin "^1.3.0"
78737873 merge-trees "^1.0.1"
78747874
7875+ broccoli-merge-trees@^4.0.0, broccoli-merge-trees@^4.2.0:
7876+ version "4.2.0"
7877+ resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
7878+ integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
7879+ dependencies:
7880+ broccoli-plugin "^4.0.2"
7881+ merge-trees "^2.0.0"
7882+
78757883broccoli-merge-trees@^4.1.0:
78767884 version "4.1.0"
78777885 resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.1.0.tgz#a30e2e4c5bb0f5eb8981e8af33a8077714c11f1a"
@@ -7880,14 +7888,6 @@ broccoli-merge-trees@^4.1.0:
78807888 broccoli-plugin "^3.1.0"
78817889 merge-trees "^2.0.0"
78827890
7883- broccoli-merge-trees@^4.2.0:
7884- version "4.2.0"
7885- resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
7886- integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
7887- dependencies:
7888- broccoli-plugin "^4.0.2"
7889- merge-trees "^2.0.0"
7890-
78917891broccoli-middleware@^2.1.1:
78927892 version "2.1.1"
78937893 resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
@@ -11963,13 +11963,15 @@ ember-router-generator@^2.0.0:
1196311963 "@babel/traverse" "^7.4.5"
1196411964 recast "^0.18.1"
1196511965
11966- ember-simple-auth@4.0.2 :
11967- version "4.0.2 "
11968- resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-4.0.2. tgz#d0597fdbb47bf97efd90bdaa24f3d61c765cc34b "
11969- integrity sha512-6DoNfesB54ToDMv89r7KFtIR1EFYWurAAlD5KRnnerhBbRH0ws3EK2g7O/8wVJoBuPOuvHZlEnJVCtzp+oauyg ==
11966+ ember-simple-auth@4.1.0 :
11967+ version "4.1.0 "
11968+ resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-4.1.0. tgz#296e5e3828f694837ff7ff391d5acce1eb4aa385 "
11969+ integrity sha512-T+b2XEHmIzWA1DVBR2dJv5EIzPgJp+QtgF8YVvAIvKn1PCYLe1GJazo3nJwaMu2uwQUWAzA858XN6u8ywIilFQ ==
1197011970 dependencies:
1197111971 base-64 "^0.1.0"
11972+ broccoli-file-creator "^2.1.1"
1197211973 broccoli-funnel "^1.2.0 || ^2.0.0"
11974+ broccoli-merge-trees "^4.0.0"
1197311975 ember-cli-babel "^7.20.5"
1197411976 ember-cli-is-package-missing "^1.0.0"
1197511977 ember-cookies "^0.5.0"
0 commit comments