Skip to content

Commit

Permalink
[6.x] [npm] downgrade mocha to not need mochajs/mocha#3346 (#19233) (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Spencer authored May 18, 2018
1 parent 11c17c6 commit b3364e6
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 22 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
"load-grunt-config": "0.19.2",
"makelogs": "^4.0.4",
"marked-text-renderer": "0.1.0",
"mocha": "github:elastic/mocha#37dc027261b2974aa0411955a06c93fb8ed2c06e",
"mocha": "5.0.4",
"mock-fs": "^4.4.2",
"murmurhash3js": "3.0.1",
"ncp": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"jest": "^22.4.3",
"jest-cli": "^22.4.3",
"jest-styled-components": "^5.0.1",
"mocha": "^5.0.5",
"mocha": "5.0.4",
"mustache": "^2.3.0",
"node-fetch": "^2.1.2",
"pdf-image": "1.1.0",
Expand Down
30 changes: 15 additions & 15 deletions x-pack/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4712,6 +4712,21 @@ mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
dependencies:
minimist "0.0.8"

mocha@5.0.4:
version "5.0.4"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.4.tgz#6b7aa328472da1088e69d47e75925fd3a3bb63c6"
dependencies:
browser-stdout "1.3.1"
commander "2.11.0"
debug "3.1.0"
diff "3.5.0"
escape-string-regexp "1.0.5"
glob "7.1.2"
growl "1.10.3"
he "1.1.1"
mkdirp "0.5.1"
supports-color "4.4.0"

mocha@^2.0.1:
version "2.5.3"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
Expand All @@ -4727,21 +4742,6 @@ mocha@^2.0.1:
supports-color "1.2.0"
to-iso-string "0.0.2"

mocha@^5.0.5:
version "5.0.5"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.5.tgz#e228e3386b9387a4710007a641f127b00be44b52"
dependencies:
browser-stdout "1.3.1"
commander "2.11.0"
debug "3.1.0"
diff "3.5.0"
escape-string-regexp "1.0.5"
glob "7.1.2"
growl "1.10.3"
he "1.1.1"
mkdirp "0.5.1"
supports-color "4.4.0"

module-not-found-error@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
Expand Down
9 changes: 4 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8311,7 +8311,7 @@ minimatch@0.3:
lru-cache "2"
sigmund "~1.0.0"

"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.0, minimatch@~3.0.2:
"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.0, minimatch@~3.0.2:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
dependencies:
Expand Down Expand Up @@ -8368,9 +8368,9 @@ mkdirp@^0.3.5, mkdirp@~0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"

"mocha@github:elastic/mocha#37dc027261b2974aa0411955a06c93fb8ed2c06e":
version "5.1.1"
resolved "https://codeload.github.com/elastic/mocha/tar.gz/37dc027261b2974aa0411955a06c93fb8ed2c06e"
mocha@5.0.4:
version "5.0.4"
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.4.tgz#6b7aa328472da1088e69d47e75925fd3a3bb63c6"
dependencies:
browser-stdout "1.3.1"
commander "2.11.0"
Expand All @@ -8380,7 +8380,6 @@ mkdirp@^0.3.5, mkdirp@~0.3.5:
glob "7.1.2"
growl "1.10.3"
he "1.1.1"
minimatch "3.0.4"
mkdirp "0.5.1"
supports-color "4.4.0"

Expand Down

0 comments on commit b3364e6

Please sign in to comment.