diff --git a/package.json b/package.json index 9371e9fe6d4..1fba64b1d27 100644 --- a/package.json +++ b/package.json @@ -68,10 +68,9 @@ "broccoli-string-replace": "^0.1.1", "broccoli-test-helper": "^1.2.0", "broccoli-uglify-sourcemap": "^1.0.1", - "broccoli-yuidoc": "^2.1.0", + "broccoli-yuidoc": "^3.0.0", "co": "^4.6.0", "common-tags": "^1.4.0", - "ember-ajax": "^2.4.1", "ember-cli": "^2.11.1", "ember-cli-app-version": "^3.0.0", "ember-cli-blueprint-test-helpers": "^0.18.3", @@ -100,11 +99,11 @@ "express": "^4.14.0", "faker": "^3.1.0", "github": "^1.1.1", - "glob": "5.0.13", + "glob": "^5.0.13", "heimdall-query": "^0.0.8", "json-api-mock-server": "0.1.1", "loader.js": "^4.5.0", - "mocha": "2.4.5", + "mocha": "^2.4.5", "mocha-only-detector": "0.0.2", "morgan": "^1.7.0", "rimraf": "2.5.2", diff --git a/yarn.lock b/yarn.lock index 2be650ed1ad..0e405441acb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1169,19 +1169,6 @@ broccoli-caching-writer@^3.0.3: rsvp "^3.0.17" walk-sync "^0.3.0" -broccoli-caching-writer@~2.0.1: - version "2.0.4" - resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c" - dependencies: - broccoli-kitchen-sink-helpers "^0.2.5" - broccoli-plugin "1.1.0" - debug "^2.1.1" - lodash-node "^3.2.0" - rimraf "^2.2.8" - rsvp "^3.0.17" - symlink-or-copy "^1.0.0" - walk-sync "^0.2.0" - broccoli-clean-css@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa" @@ -1359,14 +1346,6 @@ broccoli-merge-trees@^2.0.0: broccoli-plugin "^1.3.0" merge-trees "^1.0.1" -broccoli-merge-trees@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-0.2.4.tgz#1936f63bb09e24246b1e91d8c53162c0f7b24c3c" - dependencies: - broccoli-plugin "^1.0.0" - debug "^2.2.0" - symlink-or-copy "^1.0.0" - broccoli-middleware@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.0.0.tgz#92f4e1fb9a791ea986245a7077f35cc648dab097" @@ -1508,15 +1487,15 @@ broccoli-writer@~0.1.1: quick-temp "^0.1.0" rsvp "^3.0.6" -broccoli-yuidoc@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/broccoli-yuidoc/-/broccoli-yuidoc-2.1.0.tgz#d208d5c056e421a51f0c7701e938229e7e85c2e6" +broccoli-yuidoc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/broccoli-yuidoc/-/broccoli-yuidoc-3.0.0.tgz#e436588ddfb6ae81ce82d87e894333d0fdd10487" dependencies: - broccoli-caching-writer "~2.0.1" - broccoli-merge-trees "~0.2.3" + broccoli-caching-writer "^3.0.3" + broccoli-merge-trees "^2.0.0" merge "~1.2.0" - rsvp "~3.1.0" - yuidocjs "~0.9.0" + rsvp "^3.5.0" + yuidocjs "^0.10.2" broccoli@^1.1.0: version "1.1.3" @@ -2221,12 +2200,6 @@ electron-to-chromium@^1.3.24: version "1.3.25" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.25.tgz#453b21009836d0997d86035601ff6cae4791c460" -ember-ajax@^2.4.1: - version "2.5.6" - resolved "https://registry.yarnpkg.com/ember-ajax/-/ember-ajax-2.5.6.tgz#a75f743ccf1b95e979a5cf96013b3dba8fa625e4" - dependencies: - ember-cli-babel "^5.1.5" - ember-cli-app-version@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.1.0.tgz#074b0330581a7b8ab094ff07fefb34e0d0254bfd" @@ -3473,23 +3446,12 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.3.tgz#e313eeb249c7affaa5c475286b0e115b59839467" - dependencies: - graceful-fs "~2.0.0" - inherits "2" - minimatch "~0.2.11" - -glob@5.0.13: - version "5.0.13" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.13.tgz#0b6ffc3ac64eb90669f723a00a0ebb7281b33f8f" +glob@3.2.11: + version "3.2.11" + resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d" dependencies: - inflight "^1.0.4" inherits "2" - minimatch "^2.0.1" - once "^1.3.0" - path-is-absolute "^1.0.0" + minimatch "0.3" glob@7.1.1: version "7.1.1" @@ -3511,7 +3473,7 @@ glob@^4.3.2: minimatch "^2.0.1" once "^1.3.0" -glob@^5.0.10, glob@^5.0.15: +glob@^5.0.10, glob@^5.0.13, glob@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" dependencies: @@ -3571,17 +3533,13 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -graceful-fs@~2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-2.0.3.tgz#7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0" - "graceful-readlink@>= 1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" -growl@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.8.1.tgz#4b2dec8d907e93db336624dcec0183502f8c9428" +growl@1.9.2: + version "1.9.2" + resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f" growly@^1.3.0: version "1.3.0" @@ -4247,10 +4205,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -lodash-node@^3.2.0: - version "3.10.2" - resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-3.10.2.tgz#2598d5b1b54e6a68b4cb544e5c730953cbf632f7" - lodash._baseassign@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" @@ -4748,25 +4702,25 @@ mimic-fn@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18" +minimatch@0.3: + version "0.3.0" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd" + dependencies: + lru-cache "2" + sigmund "~1.0.0" + "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: brace-expansion "^1.1.7" -minimatch@^2.0.1, minimatch@^2.0.3, minimatch@^2.0.8: +minimatch@^2.0.1, minimatch@^2.0.3: version "2.0.10" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" dependencies: brace-expansion "^1.0.0" -minimatch@~0.2.11: - version "0.2.14" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a" - dependencies: - lru-cache "2" - sigmund "~1.0.0" - minimist@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" @@ -4801,19 +4755,20 @@ mocha-only-detector@0.0.2: esprimaq "^0.0.1" glob "^4.3.2" -mocha@2.4.5: - version "2.4.5" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.4.5.tgz#151768dd2875eb51bc8295e9800026e9f2bb398f" +mocha@^2.4.5: + version "2.5.3" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58" dependencies: commander "2.3.0" debug "2.2.0" diff "1.4.0" escape-string-regexp "1.0.2" - glob "3.2.3" - growl "1.8.1" + glob "3.2.11" + growl "1.9.2" jade "0.26.3" mkdirp "0.5.1" supports-color "1.2.0" + to-iso-string "0.0.2" moment-timezone@^0.3.0: version "0.3.1" @@ -5608,10 +5563,6 @@ rsvp@~3.0.6: version "3.0.21" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f" -rsvp@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.1.0.tgz#19d96e71315f3ddbc57c4c62a6db898adb64d791" - rsvp@~3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a" @@ -6192,6 +6143,10 @@ to-fast-properties@^1.0.0, to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" +to-iso-string@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1" + tough-cookie@>=0.12.0: version "2.3.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" @@ -6374,7 +6329,7 @@ walk-sync@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.1.3.tgz#8a07261a00bda6cfb1be25e9f100fad57546f583" -walk-sync@^0.2.0, walk-sync@^0.2.5, walk-sync@^0.2.7: +walk-sync@^0.2.5, walk-sync@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969" dependencies: @@ -6633,14 +6588,14 @@ yui@^3.18.1: dependencies: request "~2.40.0" -yuidocjs@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/yuidocjs/-/yuidocjs-0.9.0.tgz#d2ff2b37cadf30e3d45385c58f5003e5a83f2723" +yuidocjs@^0.10.2: + version "0.10.2" + resolved "https://registry.yarnpkg.com/yuidocjs/-/yuidocjs-0.10.2.tgz#33924967ce619024cd70ef694e267d2f988f73f6" dependencies: express "^4.13.1" graceful-fs "^4.1.2" markdown-it "^4.3.0" mdn-links "^0.1.0" - minimatch "^2.0.8" + minimatch "^3.0.2" rimraf "^2.4.1" yui "^3.18.1"