diff --git a/ghost/admin/package.json b/ghost/admin/package.json index a2e05857c3..cadf5bf831 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -58,7 +58,7 @@ "ember-cli-htmlbars": "3.0.1", "ember-cli-htmlbars-inline-precompile": "2.1.0", "ember-cli-inject-live-reload": "2.0.1", - "ember-cli-mirage": "0.4.15", + "ember-cli-mirage": "1.0.0", "ember-cli-moment-shim": "3.7.1", "ember-cli-node-assets": "0.2.2", "ember-cli-postcss": "4.2.0", @@ -87,7 +87,7 @@ "ember-resolver": "5.1.3", "ember-route-action-helper": "2.0.7", "ember-simple-auth": "1.8.2", - "ember-sinon": "3.1.0", + "ember-sinon": "4.0.0", "ember-source": "3.10.0", "ember-sticky-element": "0.2.3", "ember-svg-jar": "1.2.2", diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock index 589daeb13e..bf8edbe7c6 100644 --- a/ghost/admin/yarn.lock +++ b/ghost/admin/yarn.lock @@ -2641,7 +2641,7 @@ broccoli-stew@^1.4.2, broccoli-stew@^1.5.0: symlink-or-copy "^1.2.0" walk-sync "^0.3.0" -broccoli-stew@^2.0.1, broccoli-stew@^2.1.0: +broccoli-stew@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-2.1.0.tgz#ba73add17fda3b9b01d8cfb343a8b613b7136a0a" integrity sha512-tgCkuTWYl4uf7k7ib2D79KFEj2hCgnTUNPMnrCoAha0/4bywcNccmaZVWtL9Ex37yX5h5eAbnM/ak2ULoMwSSw== @@ -3072,7 +3072,7 @@ chai@^4.1.2: pathval "^1.1.0" type-detect "^4.0.5" -chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.0.0, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -4472,28 +4472,22 @@ ember-cli-lodash-subset@^2.0.1: resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2" integrity sha1-IMtop5D+D94kiN39jvu332/nZvI= -ember-cli-mirage@0.4.15: - version "0.4.15" - resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.15.tgz#dcf878e785853232d8ac725bb425aa545da63e79" - integrity sha512-5wCycS40pkohNPaLcyCn5BUjJ/4PGK9lz6j1tftJms5tBQhSjkZ37+pfhVKh3iYSId/+z0RTxVknykQH4P0sQA== +ember-cli-mirage@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-1.0.0.tgz#e64132227e63bdd6e3a35df52a74cb19514a8c08" + integrity sha512-vBohHV4sE7tJQ/Nfl3Nmsdjliwqlx4/WG0yjIS5JYZWKewJ58FYMlsTLZKk7vfWf4Cq+aTGth+qyEfeSE8IuAQ== dependencies: - "@xg-wang/whatwg-fetch" "^3.0.0" broccoli-file-creator "^2.1.1" broccoli-funnel "^2.0.1" broccoli-merge-trees "^3.0.2" - broccoli-stew "^2.0.1" broccoli-string-replace "^0.1.2" - chalk "^1.1.1" + chalk "^2.4.2" ember-auto-import "^1.2.19" - ember-cli-babel "^6.16.0" - ember-cli-node-assets "^0.2.2" + ember-cli-babel "^7.5.0" ember-get-config "^0.2.2" ember-inflector "^2.0.0 || ^3.0.0" - fake-xml-http-request "^2.0.0" - faker "^3.0.0" lodash "^4.17.11" - pretender "2.1.1" - route-recognizer "^0.3.4" + pretender "3.0.1" ember-cli-moment-shim@3.7.1, ember-cli-moment-shim@^3.7.1: version "3.7.1" @@ -4511,7 +4505,7 @@ ember-cli-moment-shim@3.7.1, ember-cli-moment-shim@^3.7.1: moment "^2.19.3" moment-timezone "^0.5.13" -ember-cli-node-assets@0.2.2, ember-cli-node-assets@^0.2.2: +ember-cli-node-assets@0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.2.2.tgz#d2d55626e7cc6619f882d7fe55751f9266022708" integrity sha1-0tVWJufMZhn4gtf+VXUfkmYCJwg= @@ -5131,15 +5125,15 @@ ember-simple-auth@1.8.2: ember-getowner-polyfill "^1.1.0 || ^2.0.0" silent-error "^1.0.0" -ember-sinon@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ember-sinon/-/ember-sinon-3.1.0.tgz#76733aae1cc32c9426202bdc0f5b61552753a7df" - integrity sha512-/UARfA4UBlhhmtvk6Vcvj3CH2foThqCORbXiUiQUBISNxqtZFdwGpnJMt4vY8etyArmop18B33UTmZzNKbfhmg== +ember-sinon@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/ember-sinon/-/ember-sinon-4.0.0.tgz#bb9bc43b68cc4500457261606a47c7b6ef8c30a3" + integrity sha512-SF6+ak/8yTyD2R8ylz9HYzoziiJCCB6bh/QG/ly4aqAf9eXL+ldQE91IljzEDh6B8feMUpUCGGajbrs9svwhQA== dependencies: broccoli-funnel "^2.0.0" broccoli-merge-trees "^3.0.0" - ember-cli-babel "^7.1.3" - sinon "^7.1.1" + ember-cli-babel "^7.7.3" + sinon "^7.3.2" ember-source-channel-url@^1.1.0: version "1.2.0" @@ -5780,11 +5774,6 @@ fake-xml-http-request@^2.0.0: resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.0.0.tgz#41a92f0ca539477700cb1dafd2df251d55dac8ff" integrity sha512-UjNnynb6eLAB0lyh2PlTEkjRJORnNsVF1hbzU+PQv89/cyBV9GDRCy7JAcLQgeCLYT+3kaumWWZKEJvbaK74eQ== -faker@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/faker/-/faker-3.1.0.tgz#0f908faf4e6ec02524e54a57e432c5c013e08c9f" - integrity sha1-D5CPr05uwCUk5UpX5DLFwBPgjJ8= - fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" @@ -9707,7 +9696,16 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -pretender@2.1.1, pretender@^2.1.0: +pretender@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.0.1.tgz#817ac43faa3330aa17646968a115f232de10b2ca" + integrity sha512-NO5qK7vJls4uz1NxVKuAY6/aHLOVvchGAvrPWCRHRKpCLquBWQjk3CVx195Hs5yUdcQ4e3OlpUijmOzFzzOmWQ== + dependencies: + fake-xml-http-request "^2.0.0" + route-recognizer "^0.3.3" + whatwg-fetch "^3.0.0" + +pretender@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/pretender/-/pretender-2.1.1.tgz#5085f0a1272c31d5b57c488386f69e6ca207cb35" integrity sha512-IkidsJzaroAanw3I43tKCFm2xCpurkQr9aPXv5/jpN+LfCwDaeI8rngVWtQZTx4qqbhc5zJspnLHJ4N/25KvDQ== @@ -10377,7 +10375,7 @@ rollup@^0.57.1: signal-exit "^3.0.2" sourcemap-codec "^1.4.1" -route-recognizer@^0.3.3, route-recognizer@^0.3.4: +route-recognizer@^0.3.3: version "0.3.4" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3" integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g== @@ -10627,7 +10625,7 @@ simple-swizzle@^0.2.2: uid "7afb50dcdd63d3a1f6ccad682b70acbd7bc52eb9" resolved "https://github.com/kevinansfield/simplemde-markdown-editor.git#7afb50dcdd63d3a1f6ccad682b70acbd7bc52eb9" -sinon@^7.1.1: +sinon@^7.3.2: version "7.3.2" resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.3.2.tgz#82dba3a6d85f6d2181e1eca2c10d8657c2161f28" integrity sha512-thErC1z64BeyGiPvF8aoSg0LEnptSaWE7YhdWWbWXgelOyThent7uKOnnEh9zBxDbKixtr5dEko+ws1sZMuFMA==