🐛 Fix author/tag management in post settings menu (dependency revert)

closes https://github.com/TryGhost/Ghost/issues/12198 - Revert "Switched from uglify to terser" (commit e5b4960170) - Revert "Update dependency ember-cli to v3.21.1 (commit 7e64683836)" - Revert "Update ember core (commit 9866a840c6)"
2024-11-28 14:03:48 +03:00 · 2020-09-10 15:39:24 +01:00 · 2020-09-10 15:39:24 +01:00 · 3e83675175
commit 3e83675175
parent e5b4960170
3 changed files with 128 additions and 134 deletions
--- a/ghost/admin/ember-cli-build.js
+++ b/ghost/admin/ember-cli-build.js
@ -4,7 +4,7 @@
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 const concat = require('broccoli-concat');
 const mergeTrees = require('broccoli-merge-trees');
-const Terser = require('broccoli-terser-sourcemap');
+const Uglify = require('broccoli-uglify-sourcemap');
 const Funnel = require('broccoli-funnel');
 const environment = EmberApp.env();
 const isProduction = environment === 'production';
@ -50,7 +50,7 @@ const codemirrorAssets = function () {
            });

            if (isProduction) {
-                jsTree = new Terser(jsTree);
+                jsTree = new Uglify(jsTree);
            }

            let mergedTree = mergeTrees([tree, jsTree]);
@ -88,7 +88,7 @@ const simplemdeAssets = function () {
            });

            if (isProduction) {
-                jsTree = new Terser(jsTree);
+                jsTree = new Uglify(jsTree);
            }

            let mergedTree = mergeTrees([tree, jsTree]);
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@ -43,7 +43,7 @@
    "broccoli-concat": "4.2.4",
    "broccoli-funnel": "3.0.3",
    "broccoli-merge-trees": "4.2.0",
-    "broccoli-terser-sourcemap": "4.1.0",
+    "broccoli-uglify-sourcemap": "4.0.0",
    "chai": "4.2.0",
    "chai-dom": "1.8.2",
    "codemirror": "5.48.2",
@ -54,7 +54,7 @@
    "ember-assign-helper": "0.3.0",
    "ember-auto-import": "1.6.0",
    "ember-classic-decorator": "1.0.8",
-    "ember-cli": "3.21.1",
+    "ember-cli": "3.20.0",
    "ember-cli-app-version": "3.2.0",
    "ember-cli-babel": "7.22.1",
    "ember-cli-chart": "3.7.2",
@ -69,12 +69,12 @@
    "ember-cli-postcss": "6.0.1",
    "ember-cli-shims": "1.2.0",
    "ember-cli-string-helpers": "5.0.0",
-    "ember-cli-terser": "4.0.0",
    "ember-cli-test-loader": "3.0.0",
+    "ember-cli-uglify": "3.0.0",
    "ember-composable-helpers": "4.3.0",
    "ember-concurrency": "1.3.0",
    "ember-concurrency-decorators": "2.0.1",
-    "ember-data": "3.21.0",
+    "ember-data": "3.20.0",
    "ember-decorators": "6.1.1",
    "ember-drag-drop": "0.4.8",
    "ember-ella-sparse": "0.16.0",
@ -96,7 +96,7 @@
    "ember-route-action-helper": "2.0.8",
    "ember-simple-auth": "3.0.0",
    "ember-sinon": "5.0.0",
-    "ember-source": "3.21.1",
+    "ember-source": "3.20.3",
    "ember-sticky-element": "0.2.3",
    "ember-svg-jar": "2.2.3",
    "ember-test-selectors": "5.0.0",
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@ -18,19 +18,19 @@
    invariant "^2.2.4"
    semver "^5.5.0"

-"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.11.0", "@babel/core@^7.2.2", "@babel/core@^7.3.4":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.5.tgz#6ad96e2f71899ea3f9b651f0a911e85205d1ff6d"
-  integrity sha512-fsEANVOcZHzrsV6dMVWqpSeXClq3lNbYrfFGme6DE25FQWe7pyeYpXyx9guqUnpy466JLzZ8z4uwSr2iv60V5Q==
+"@babel/core@^7.0.0", "@babel/core@^7.1.6", "@babel/core@^7.10.2", "@babel/core@^7.11.0", "@babel/core@^7.2.2", "@babel/core@^7.3.4":
+  version "7.11.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.11.1.tgz#2c55b604e73a40dc21b0e52650b11c65cf276643"
+  integrity sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==
  dependencies:
    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.11.5"
+    "@babel/generator" "^7.11.0"
    "@babel/helper-module-transforms" "^7.11.0"
    "@babel/helpers" "^7.10.4"
-    "@babel/parser" "^7.11.5"
+    "@babel/parser" "^7.11.1"
    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.11.5"
-    "@babel/types" "^7.11.5"
+    "@babel/traverse" "^7.11.0"
+    "@babel/types" "^7.11.0"
    convert-source-map "^1.7.0"
    debug "^4.1.0"
    gensync "^1.0.0-beta.1"
@ -38,7 +38,7 @@
    lodash "^4.17.19"
    resolve "^1.3.2"
    semver "^5.4.1"
-    source-map "^0.6.1"
+    source-map "^0.5.0"

 "@babel/generator@^7.11.5":
  version "7.11.5"
@ -924,45 +924,45 @@
  resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
  integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==

-"@ember-data/adapter@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.21.0.tgz#861b077285cdedf37db8eb31f7333facbb77e176"
-  integrity sha512-nucBsVQvKlyqDr3MyFFz2umE4yokG1ptFEV+wNpiKKdx7e5umgQ1jJIa+iohsAA9rAkh63elYvMTTnOQh9xzgw==
+"@ember-data/adapter@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.20.0.tgz#b21938bc3e958ada60ef298f38f4507951159502"
+  integrity sha512-7/2VNGih+13hDwWUNkq2BSlV2dJ4P/sh/6Jf1bCPhmO5KPY6GFDw82DmiE5KmOxWusqQZEqUZd5EuOUAQsmVGA==
  dependencies:
-    "@ember-data/private-build-infra" "3.21.0"
-    "@ember-data/store" "3.21.0"
+    "@ember-data/private-build-infra" "3.20.0"
+    "@ember-data/store" "3.20.0"
    "@ember/edition-utils" "^1.2.0"
    ember-cli-babel "^7.18.0"
    ember-cli-test-info "^1.0.0"
    ember-cli-typescript "^3.1.3"

-"@ember-data/canary-features@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.21.0.tgz#9067cf96a4d805e3977afbb5f4582f137a14cd58"
-  integrity sha512-vlHIhGCIbAJC+rJqRBymh1mUOTOOBrndoS7ObkMBqItERD56qE4yJGmuxx/Jw1rLDJzTVyoF16tOd2X5fSeDHQ==
+"@ember-data/canary-features@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.20.0.tgz#6e573f11f3f35f8b3fcbbf7ab215b03ff8deea8b"
+  integrity sha512-jOlzBmMdcNNfz5uhgMwiraLNsVFlwRVfz/8uwuzRGElvYzUHM/FlqqbTxs3otoHB9XhtC0WzVCZWpoG+ogJZlw==
  dependencies:
    ember-cli-babel "^7.18.0"
    ember-cli-typescript "^3.1.3"

-"@ember-data/debug@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.21.0.tgz#185263b30ab220aa04181764c35a894e078508f4"
-  integrity sha512-lHqdzKNUx0Ev95qIq0siNaiGDEFQq+KTCCXVXY5SVpYvam5Fb1rH+CSOXgNyNcIXNbvMBkzbLJu9yFgMdN6AWg==
+"@ember-data/debug@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.20.0.tgz#84cf51e162d253d28926f0770b50c9c943ca0f63"
+  integrity sha512-HSDDheFdxdLLb4vD6SrbYiwG1PI2MR3FtNQOSIi62HePxrMlM+Apa489TsTB4SAkimxWJ27yk7s018aGJ+1Gwg==
  dependencies:
-    "@ember-data/private-build-infra" "3.21.0"
+    "@ember-data/private-build-infra" "3.20.0"
    "@ember/edition-utils" "^1.2.0"
    ember-cli-babel "^7.18.0"
    ember-cli-test-info "^1.0.0"
    ember-cli-typescript "^3.1.3"

-"@ember-data/model@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.21.0.tgz#bbb2d891158bb4d376097d7891f8ffa8de1ef015"
-  integrity sha512-NAygxJNk3WWKLbUGZ/6H3k4cFEzT/JQ/dR5Uryt2N7YOVJ9aKssgYpZ7NONWxzIhlNMAM8bIhq1zdaFvXdPp+w==
+"@ember-data/model@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.20.0.tgz#ef9da406be661b98bde97940af391f58d9dcc1de"
+  integrity sha512-HdlZyMGZJboBkft7vMrAZOqhQOEswlLS1rfJO6A+gjJdD68z5VQTWi3uMnemNHzvz2Z1+RqZ/sYeCs39lhFIqQ==
  dependencies:
-    "@ember-data/canary-features" "3.21.0"
-    "@ember-data/private-build-infra" "3.21.0"
-    "@ember-data/store" "3.21.0"
+    "@ember-data/canary-features" "3.20.0"
+    "@ember-data/private-build-infra" "3.20.0"
+    "@ember-data/store" "3.20.0"
    "@ember/edition-utils" "^1.2.0"
    ember-cli-babel "^7.18.0"
    ember-cli-string-utils "^1.1.0"
@ -971,13 +971,13 @@
    ember-compatibility-helpers "^1.2.0"
    inflection "1.12.0"

-"@ember-data/private-build-infra@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.21.0.tgz#740826ac7b496bcf028dc54a45413c5029cda057"
-  integrity sha512-ybGBlu9aqEvPgtaWZC7GQtO3Pc74haSidrWP2leiyGDYaN/yRxQLZnDNM2ffltVKTmi0D5bPdtO21FNZZe7m+A==
+"@ember-data/private-build-infra@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.20.0.tgz#847d3d97f089859b88388e2a4f94da7b6a535579"
+  integrity sha512-SygkzxRHSVn/4AwutnjQiuP0fl+tU4Xy3tD34QnKWm6habvoWW//AhHWbc0eP8D04TyQuUG6t81CpHLF/r0bow==
  dependencies:
    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@ember-data/canary-features" "3.21.0"
+    "@ember-data/canary-features" "3.20.0"
    "@ember/edition-utils" "^1.2.0"
    babel-plugin-debug-macros "^0.3.3"
    babel-plugin-filter-imports "^4.0.0"
@ -1003,14 +1003,14 @@
    semver "^7.1.3"
    silent-error "^1.1.1"

-"@ember-data/record-data@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.21.0.tgz#5c5ff213637bda7725e1cdd5bb74abe3ad0a9540"
-  integrity sha512-cQZsnBmHvIcufkWe4xcDbLTA9wt1o2DL05q9TRE5hCbQINW5fPoY5Vem0EkdCNrziaH0sX8dgYcz8Kd2GhMPQg==
+"@ember-data/record-data@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.20.0.tgz#9faa06da6676eb2d19d217c006a571def618ee76"
+  integrity sha512-+qaNQslY92Cf7UyQm4y+B5YwhO1os2v5f37lrz4MjZlmRliUsxtyc7qGrHGbzGm8kFNPUFW1QBSlmLQj7Wd/JA==
  dependencies:
-    "@ember-data/canary-features" "3.21.0"
-    "@ember-data/private-build-infra" "3.21.0"
-    "@ember-data/store" "3.21.0"
+    "@ember-data/canary-features" "3.20.0"
+    "@ember-data/private-build-infra" "3.20.0"
+    "@ember-data/store" "3.20.0"
    "@ember/edition-utils" "^1.2.0"
    "@ember/ordered-set" "^2.0.3"
    ember-cli-babel "^7.18.0"
@ -1022,24 +1022,24 @@
  resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
  integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==

-"@ember-data/serializer@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.21.0.tgz#feb6d05b3a04bb04e10c6bef604c8534b2b16035"
-  integrity sha512-X1YaDZBsPVph7ZIPycijYUMdLy9uYwdu667M+xbfbG58L5+FxoDV9SftrRf96oL1jz+KyeiFqU5gNCcTHKQ9jg==
+"@ember-data/serializer@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.20.0.tgz#20d40fefcb9e506eeadc8d6e94fad90b1d276695"
+  integrity sha512-1cj6ph0++6iMrhIvQnlqfsgZezBK+BpFH8A3zPa4cP66Mv9VfyRJRGB8oMwWdh6X+qGFiwvr+ju6R6A2XgzsqA==
  dependencies:
-    "@ember-data/private-build-infra" "3.21.0"
-    "@ember-data/store" "3.21.0"
+    "@ember-data/private-build-infra" "3.20.0"
+    "@ember-data/store" "3.20.0"
    ember-cli-babel "^7.18.0"
    ember-cli-test-info "^1.0.0"
    ember-cli-typescript "^3.1.3"

-"@ember-data/store@3.21.0":
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.21.0.tgz#3a93a87cdbae37757bc9e009fc654b74b17ccf70"
-  integrity sha512-oDoHEw+6fZV7NKq+Kg75KoP6g3RHWF/MHecqqLA8vOanKC2oKMxghFhZJ9YzWuhs9PmmYyqjfFBr10NF6g9CXg==
+"@ember-data/store@3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.20.0.tgz#1b6d6e08e4f94b7352a826e7a3aa6212e9e5cb3e"
+  integrity sha512-uJBmQFmDyxFrW9d61RXrQ9j2xBNHMSXCWkRgcFYvNCGCgImHUv2Zu5hJpRwCHRN5IKhmQjqKJEi5qGlFGXQC5g==
  dependencies:
-    "@ember-data/canary-features" "3.21.0"
-    "@ember-data/private-build-infra" "3.21.0"
+    "@ember-data/canary-features" "3.20.0"
+    "@ember-data/private-build-infra" "3.20.0"
    ember-cli-babel "^7.18.0"
    ember-cli-path-utils "^1.0.0"
    ember-cli-typescript "^3.1.3"
@ -3043,7 +3043,7 @@ broccoli-babel-transpiler@^6.5.0:
    rsvp "^4.8.2"
    workerpool "^2.3.0"

-broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.7.0:
+broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.6.0, broccoli-babel-transpiler@^7.7.0:
  version "7.7.0"
  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.7.0.tgz#271d401e713bfd338d5ef0435d3c4c68f6eddd2a"
  integrity sha512-U8Cmnv0/AcQKehiIVi6UDzqq3jqhAEbY9CvOW5vdeNRmYhFpK6bXPmVczS/nUz5g4KsPc/FdnC3zbU6yVf4e7w==
@ -3636,10 +3636,10 @@ broccoli-templater@^2.0.1:
    rimraf "^2.6.2"
    walk-sync "^0.3.3"

-broccoli-terser-sourcemap@4.1.0, broccoli-terser-sourcemap@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.0.tgz#5f37441b64a3b6bfb0c67e9af232259c9576f115"
-  integrity sha512-zkNnjsAbP+M5rG2aMM1EE4BmXPUSxFKmtLUkUs2D1DLTOJQoF1xlOjGWjjKYCFy5tw8t4+tgGJ+HVa2ucJZ8sw==
+broccoli-uglify-sourcemap@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-4.0.0.tgz#c5c5fbd9563cf0fe4c68c337bb61e98fe0697a3b"
+  integrity sha512-46yB4gw1Q3ALtBROY5QfKXNXxYK5uPSvER1OGjjh2t3piaipqBfuRXTzQZvmZ+Odr6/McY+J8XmxON4+lE1ukg==
  dependencies:
    async-promise-queue "^1.0.5"
    broccoli-plugin "^4.0.3"
@ -3652,6 +3652,23 @@ broccoli-terser-sourcemap@4.1.0, broccoli-terser-sourcemap@^4.1.0:
    walk-sync "^2.2.0"
    workerpool "^6.0.0"

+broccoli-uglify-sourcemap@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c"
+  integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g==
+  dependencies:
+    async-promise-queue "^1.0.5"
+    broccoli-plugin "^1.2.1"
+    debug "^4.1.0"
+    lodash.defaultsdeep "^4.6.1"
+    matcher-collection "^2.0.0"
+    mkdirp "^0.5.0"
+    source-map-url "^0.4.0"
+    symlink-or-copy "^1.0.1"
+    terser "^4.3.9"
+    walk-sync "^1.1.3"
+    workerpool "^5.0.1"
+
 broccoli@^3.4.2:
  version "3.4.2"
  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.4.2.tgz#a0c2605bea285c50cac304f482b86670630f4701"
@ -5649,13 +5666,6 @@ ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0:
  resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
  integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=

-ember-cli-terser@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.0.tgz#01d2f1a3090833d1c895fea34ec0b4106a293f3a"
-  integrity sha512-N9PBVreF7041l7ggxdhrivK1suh1EgURuz3PmLIi1jdDhf/WVVkCAWfriFP3HeFUwAjX4qxHrgFR2Pb5va9Vxw==
-  dependencies:
-    broccoli-terser-sourcemap "^4.1.0"
-
 ember-cli-test-info@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4"
@ -5732,6 +5742,14 @@ ember-cli-typescript@^3.1.2, ember-cli-typescript@^3.1.3, ember-cli-typescript@^
    stagehand "^1.0.0"
    walk-sync "^2.0.0"

+ember-cli-uglify@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6"
+  integrity sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g==
+  dependencies:
+    broccoli-uglify-sourcemap "^3.1.0"
+    lodash.defaultsdeep "^4.6.0"
+
 ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
@ -5766,20 +5784,20 @@ ember-cli-version-checker@^5.0.2, ember-cli-version-checker@^5.1.1:
    semver "^7.3.2"
    silent-error "^1.1.1"

-ember-cli@3.21.1:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.21.1.tgz#af82fe8102caee2bc684d844ece39a9ada837be0"
-  integrity sha512-Vuuzc8A+buctJ51mK2WOkR/NzdZBhaYgeWK3wZn1bZBYZ+iXLqxxgeH135Rb5TfzWsZJ63iiwnwQCzPsBrujxA==
+ember-cli@3.20.0:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.20.0.tgz#729c62ce0cb2804237155886619acc54c77255dc"
+  integrity sha512-I5mybMo1vmsKRnC7uWuuxldla+45CsJ0TIHIm+qovaKyGBx+TSW8zMoBvnogMSyu8+hDMEqsxLblH9ZSF4hKpg==
  dependencies:
-    "@babel/core" "^7.11.0"
-    "@babel/plugin-transform-modules-amd" "^7.10.5"
+    "@babel/core" "^7.10.2"
+    "@babel/plugin-transform-modules-amd" "^7.10.4"
    amd-name-resolver "^1.3.1"
    babel-plugin-module-resolver "^4.0.0"
    bower-config "^1.4.3"
    bower-endpoint-parser "0.2.2"
    broccoli "^3.4.2"
    broccoli-amd-funnel "^2.0.1"
-    broccoli-babel-transpiler "^7.7.0"
+    broccoli-babel-transpiler "^7.6.0"
    broccoli-builder "^0.18.14"
    broccoli-concat "^4.2.4"
    broccoli-config-loader "^1.0.1"
@ -5810,12 +5828,12 @@ ember-cli@3.21.1:
    ember-cli-string-utils "^1.1.0"
    ember-source-channel-url "^2.0.1"
    ensure-posix-path "^1.1.1"
-    execa "^4.0.3"
+    execa "^1.0.0"
    exit "^0.1.2"
    express "^4.17.1"
    filesize "^6.1.0"
    find-up "^4.1.0"
-    find-yarn-workspace-root "^2.0.0"
+    find-yarn-workspace-root "^1.2.1"
    fixturify-project "^2.1.0"
    fs-extra "^9.0.0"
    fs-tree-diff "^2.0.1"
@ -5829,7 +5847,6 @@ ember-cli@3.21.1:
    http-proxy "^1.18.1"
    inflection "^1.12.0"
    is-git-url "^1.0.0"
-    is-language-code "^1.0.9"
    isbinaryfile "^4.0.6"
    js-yaml "^3.13.1"
    json-stable-stringify "^1.0.1"
@ -5854,13 +5871,12 @@ ember-cli@3.21.1:
    sort-package-json "^1.44.0"
    symlink-or-copy "^1.3.1"
    temp "0.9.1"
-    testem "^3.2.0"
+    testem "^3.1.0"
    tiny-lr "^1.1.1"
    tree-sync "^2.1.0"
-    uuid "^8.3.0"
+    uuid "^8.1.0"
    walk-sync "^2.2.0"
    watch-detector "^1.0.0"
-    workerpool "^6.0.0"
    yam "^1.0.0"

 ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1:
@ -5918,18 +5934,18 @@ ember-cookies@^0.5.0:
    ember-cli-babel "^7.1.0"
    ember-getowner-polyfill "^1.1.0 || ^2.0.0"

-ember-data@3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.21.0.tgz#2074f2076fc9a1121af6935798ae2e37453bc0ef"
-  integrity sha512-p7hI/oDREkysgt5M2Y9q+lO3qvHri7TF42JI76+fRl3LeacDnJsZzqPnolBNOs8xOEJEf4cH1IDuipwI7+soJw==
+ember-data@3.20.0:
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.20.0.tgz#613cfca5276b16b4f4bbfb35432e58f3e5a2d9f3"
+  integrity sha512-eGZV5q4Ax7xavAfFS/dayO1KeSMrA0s6jSSf7TSX9KLfOz0jRMUrTwtMGxQtF0/MXB+k8/Hj1LlI5Y0lXFT9aA==
  dependencies:
-    "@ember-data/adapter" "3.21.0"
-    "@ember-data/debug" "3.21.0"
-    "@ember-data/model" "3.21.0"
-    "@ember-data/private-build-infra" "3.21.0"
-    "@ember-data/record-data" "3.21.0"
-    "@ember-data/serializer" "3.21.0"
-    "@ember-data/store" "3.21.0"
+    "@ember-data/adapter" "3.20.0"
+    "@ember-data/debug" "3.20.0"
+    "@ember-data/model" "3.20.0"
+    "@ember-data/private-build-infra" "3.20.0"
+    "@ember-data/record-data" "3.20.0"
+    "@ember-data/serializer" "3.20.0"
+    "@ember-data/store" "3.20.0"
    "@ember/edition-utils" "^1.2.0"
    "@ember/ordered-set" "^2.0.3"
    "@glimmer/env" "^0.1.7"
@ -6313,10 +6329,10 @@ ember-source-channel-url@^2.0.1:
  dependencies:
    got "^8.0.1"

-ember-source@3.21.1:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.21.1.tgz#e1bfb20a3db91c21415256e5949a32085a2c23ab"
-  integrity sha512-zG3FCd++91/OQgYeMeGJequ1u0uLFK3xeilHYL4CNrwgQAit0vju/s8x7H4fVnVxOxYhsFUXAsTMSsvgqbaqpQ==
+ember-source@3.20.3:
+  version "3.20.3"
+  resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.20.3.tgz#fdc0e8d9a402985783a2c53729f75abbb7b2ac95"
+  integrity sha512-Fpz0eVFcL4s74d2mw5D3RFGlhRcljB6N4RyjsuumwYTlg7UMrkDdlHy7A1ZI2tDw2Cz7uE7W2dKzSnCQcZGcVQ==
  dependencies:
    "@babel/helper-module-imports" "^7.8.3"
    "@babel/plugin-transform-block-scoping" "^7.8.3"
@ -7019,21 +7035,6 @@ execa@^3.0.0, execa@^3.4.0:
    signal-exit "^3.0.2"
    strip-final-newline "^2.0.0"

-execa@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
-  integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==
-  dependencies:
-    cross-spawn "^7.0.0"
-    get-stream "^5.0.0"
-    human-signals "^1.1.1"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.0"
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-    strip-final-newline "^2.0.0"
-
 exists-sync@0.0.4:
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.4.tgz#9744c2c428cc03b01060db454d4b12f0ef3c8879"
@ -7369,7 +7370,7 @@ find-up@^4.1.0:
    locate-path "^5.0.0"
    path-exists "^4.0.0"

-find-yarn-workspace-root@^1.1.0:
+find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
  integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
@ -7377,13 +7378,6 @@ find-yarn-workspace-root@^1.1.0:
    fs-extra "^4.0.3"
    micromatch "^3.1.4"

-find-yarn-workspace-root@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
-  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
-  dependencies:
-    micromatch "^4.0.2"
-
 findup-sync@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@ -8752,11 +8746,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
  dependencies:
    is-extglob "^2.1.1"

-is-language-code@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-1.0.10.tgz#19bacf9f0f97368853a3544cdba53c9075d55522"
-  integrity sha512-kp9PYib4sMAZCo56ViCWtjtYWz4ePZQ/QFzMvdxYEm2uSJaGjaEgOt3AkIR8SBxXffcV7ZYYkEGZpWa+No2Xiw==
-
 is-number@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@ -13099,7 +13088,7 @@ terser-webpack-plugin@^1.1.0:
    webpack-sources "^1.4.0"
    worker-farm "^1.7.0"

-terser@^4.1.2:
+terser@^4.1.2, terser@^4.3.9:
  version "4.8.0"
  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@ -13117,7 +13106,7 @@ terser@^5.3.0:
    source-map "~0.6.1"
    source-map-support "~0.5.12"

-testem@3.2.0, testem@^3.2.0:
+testem@3.2.0, testem@^3.1.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/testem/-/testem-3.2.0.tgz#9924481f6a3b23e350fa77bb251c64d801c4c9a7"
  integrity sha512-FkFzNRCIzCxjbNSTxIQSC2tWn1Q2MTR/GTxusSw6uZA4byEQ7wc86TKutNnoCyZ5XIaD9wo4q+dmlK0GUEqFVA==
@ -13690,7 +13679,7 @@ uuid@^3.3.2:
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==

-uuid@^8.3.0:
+uuid@^8.1.0:
  version "8.3.0"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
  integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
@ -14001,6 +13990,11 @@ workerpool@^3.1.1:
    object-assign "4.1.1"
    rsvp "^4.8.4"

+workerpool@^5.0.1:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
+  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+
 workerpool@^6.0.0:
  version "6.0.0"
  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58"