From 91a14921d17ae4d9453a88be2002380ac8dc462d Mon Sep 17 00:00:00 2001 From: Sam Macbeth Date: Wed, 19 Jun 2019 11:18:51 +0200 Subject: [PATCH] Bump browser-core to 7.37.1 --- package.json | 2 +- yarn.lock | 168 +++++++++++---------------------------------------- 2 files changed, 37 insertions(+), 133 deletions(-) diff --git a/package.json b/package.json index aa34cdae5..407a8fe66 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "dependencies": { "base64-js": "^1.2.1", - "browser-core": "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.36/7.36.3.9f2e27e.tgz", + "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/7.37.1/browser-core-7.37.1.tgz", "classnames": "^2.2.5", "d3": "^5.7.0", "foundation-sites": "^6.4.4-rc1", diff --git a/yarn.lock b/yarn.lock index 523c08206..a41a4fa77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -387,13 +387,14 @@ resolved "https://registry.yarnpkg.com/@cliqz-oss/dexie/-/dexie-2.0.4.tgz#0e710504e2b9198baa9b046abd3a82731b94d56e" integrity sha512-HxMbBQfdy0CehThTFierXbRPI+PHDEucUUriCCzViAKbCWWQIlL6uZcyDaaPRMPWy45v78lezPB4457kfjS72g== -"@cliqz/adblocker@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-0.8.0.tgz#f9360111d5cd2395fff8299529000b13d9800ed4" - integrity sha512-SeCWSPShEu/fzoktqAO0J6S1zEQhNEELmcCU3ZEvGvBZSW3pNIDVPH0vU3lad1lEwi5opkmRytgNpHA0ULU+4g== +"@cliqz/adblocker@^0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-0.10.0.tgz#e46911c49dbe6b255e72a71e828eb46f7416ae11" + integrity sha512-+0Pl4CzzZW21FxJ1AJSi3X6H6ZaQMZHol+Za9yH32kG2LZjoduMCoXNmm8e1r5wrZs/FWsZyj3UPo7JsOrW5oA== dependencies: - punycode "^2.1.1" + tldts "^5.0.3" tslib "^1.9.3" + tsmaz "^1.2.1" "@sinonjs/commons@^1", "@sinonjs/commons@^1.0.2": version "1.3.0" @@ -672,7 +673,7 @@ ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.1.0, ajv@^6.5.0, ajv@^6.5.5: +ajv@^6.1.0, ajv@^6.5.5: version "6.9.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.2.tgz#4927adb83e7f48e5a32b45729744c71ec39c9c7b" integrity sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg== @@ -682,6 +683,16 @@ ajv@^6.1.0, ajv@^6.5.0, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.10.0: + version "6.10.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1" + integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg== + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -1246,27 +1257,22 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= -"browser-core@https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.36/7.36.3.9f2e27e.tgz": - version "7.36.3" - resolved "https://s3.amazonaws.com/cdncliqz/update/edge/ghostery/v7.36/7.36.3.9f2e27e.tgz#57e439cb4e9364bc452d6ad0f811721d2973431f" +"browser-core@https://github.com/cliqz-oss/browser-core/releases/download/7.37.1/browser-core-7.37.1.tgz": + version "7.37.1" + resolved "https://github.com/cliqz-oss/browser-core/releases/download/7.37.1/browser-core-7.37.1.tgz#cafbd2b4bdd077c903fb1585fcd6e0921dbc17ef" dependencies: "@cliqz-oss/dexie" "^2.0.4" - "@cliqz/adblocker" "^0.8.0" - ajv "^6.5.0" + "@cliqz/adblocker" "^0.10.0" + ajv "^6.10.0" anonymous-credentials "https://github.com/cliqz-oss/anonymous-credentials/releases/download/0.1.3/anonymous-credentials-0.1.3.tgz" classnames "^2.2.5" cliqz-history "https://github.com/cliqz-oss/cliqz-history/releases/download/1.1.2/cliqz-history-1.1.2.tgz" - cron "^1.2.1" - cron-parser "^2.4.0" deep-equal "^1.0.1" - fs-extra "^4.0.1" - global "^4.3.2" handlebars "^4.1.1" jquery "^3.0.0" jsep "^0.3.0" math-expression-evaluator "^1.2.17" moment "^2.22.2" - moment-range "^3.0.3" node-fetch "^1.7.1" node-forge "git+https://git@github.com/digitalbazaar/forge.git#af3f590af9d3c809e1cb44b2bb5398a3a6b944c2" node-persist "^2.0.11" @@ -1286,9 +1292,8 @@ brorand@^1.0.1: sanitize-filename "^1.6.1" spanan "^2.0.0" spectre.css "^0.5.7" - tablesorter "^2.29.2" text-encoding "^0.6.4" - tldts "^4.0.0" + tldts "^5.0.3" tooltipster "^4.2.6" ua-parser-js "^0.7.12" whatwg-fetch "^3.0.0" @@ -1913,21 +1918,6 @@ create-react-class@^15.6.2: loose-envify "^1.3.1" object-assign "^4.1.1" -cron-parser@^2.4.0: - version "2.7.3" - resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.7.3.tgz#12603f89f5375af353a9357be2543d3172eac651" - integrity sha512-t9Kc7HWBWPndBzvbdQ1YG9rpPRB37Tb/tTviziUOh1qs3TARGh3b1p+tnkOHNe1K5iI3oheBPgLqwotMM7+lpg== - dependencies: - is-nan "^1.2.1" - moment-timezone "^0.5.23" - -cron@^1.2.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/cron/-/cron-1.6.0.tgz#15f92c1b5a930c5cdfcd53fe940064fa8ca2e72d" - integrity sha512-8OkXbeK3qF42ndzkIkCo3zfCDg2TxGjQiCQqVE+ZFFHa4vAcw0PdBc5i/6aJ9FppLncyKZmDuZdJ9/uuXEYZaw== - dependencies: - moment-timezone "^0.5.x" - cross-env@^5.1.3: version "5.2.0" resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" @@ -2361,13 +2351,6 @@ d3@^5.7.0: d3-voronoi "1" d3-zoom "1" -d@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" - integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8= - dependencies: - es5-ext "^0.10.9" - damerau-levenshtein@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514" @@ -2464,7 +2447,7 @@ default-require-extensions@^1.0.0: dependencies: strip-bom "^2.0.0" -define-properties@^1.1.1, define-properties@^1.1.2, define-properties@^1.1.3: +define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== @@ -2588,11 +2571,6 @@ dom-serializer@0, dom-serializer@~0.1.0: domelementtype "^1.3.0" entities "^1.1.1" -dom-walk@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" - integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg= - domain-browser@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" @@ -2792,32 +2770,6 @@ es-to-primitive@^1.2.0: is-date-object "^1.0.1" is-symbol "^1.0.2" -es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.48" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.48.tgz#9a0b31eeded39e64453bcedf6f9d50bbbfb43850" - integrity sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw== - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.1" - next-tick "1" - -es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c= - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-symbol@^3.1.0, es6-symbol@^3.1.1, es6-symbol@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" - integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc= - dependencies: - d "1" - es5-ext "~0.10.14" - escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5, escape-string-regexp@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -3433,7 +3385,7 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-extra@^4.0.1, fs-extra@^4.0.3: +fs-extra@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== @@ -3611,14 +3563,6 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" -global@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" - integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8= - dependencies: - min-document "^2.19.0" - process "~0.5.1" - globals@^11.0.1, globals@^11.1.0: version "11.11.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e" @@ -4214,13 +4158,6 @@ is-glob@^4.0.0: dependencies: is-extglob "^2.1.1" -is-nan@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.2.1.tgz#9faf65b6fb6db24b7f5c0628475ea71f988401e2" - integrity sha1-n69ltvttskt/XAYoR16nH5iEAeI= - dependencies: - define-properties "^1.1.1" - is-number-object@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" @@ -4784,7 +4721,7 @@ jest@^23.6.0: import-local "^1.0.0" jest-cli "^23.6.0" -jquery@>=1.2.6, jquery@^3.0.0: +jquery@^3.0.0: version "3.3.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg== @@ -5454,13 +5391,6 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -min-document@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU= - dependencies: - dom-walk "^0.1.0" - mini-css-extract-plugin@^0.4.1: version "0.4.5" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz#c99e9e78d54f3fa775633aee5933aeaa4e80719a" @@ -5566,21 +5496,7 @@ mkdirp@^0.3.5: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7" integrity sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc= -moment-range@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/moment-range/-/moment-range-3.1.1.tgz#5c52cf9fab29db9dd9bcd86d37e52b04a7a7271a" - integrity sha1-XFLPn6sp253ZvNhtN+UrBKenJxo= - dependencies: - es6-symbol "^3.1.0" - -moment-timezone@^0.5.23, moment-timezone@^0.5.x: - version "0.5.23" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.23.tgz#7cbb00db2c14c71b19303cb47b0fb0a6d8651463" - integrity sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w== - dependencies: - moment ">= 2.9.0" - -"moment@>= 2.9.0", moment@^2.19.1, moment@^2.22.2: +moment@^2.19.1, moment@^2.22.2: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== @@ -5674,11 +5590,6 @@ neo-async@^2.5.0, neo-async@^2.6.0: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835" integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA== -next-tick@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - integrity sha1-yobR/ogoFpsBICCOPchCS524NCw= - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -6716,11 +6627,6 @@ process@^0.11.1, process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= -process@~0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" - integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8= - progress@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" @@ -8281,13 +8187,6 @@ table@4.0.2: slice-ansi "1.0.0" string-width "^2.1.1" -tablesorter@^2.29.2: - version "2.31.1" - resolved "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.31.1.tgz#19c550c555fad4d3814500bfd4373e8b4f972305" - integrity sha512-xXFYMu2vc73oKNWcf+hdId1Rvtl2W3zS9pJAX0BWjJcn6zmhquXCk+kuBQzKid/Iq/T8ERPlyAJ7q0Wkgym7Sg== - dependencies: - jquery ">=1.2.6" - taffydb@2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268" @@ -8389,10 +8288,10 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -tldts@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/tldts/-/tldts-4.0.2.tgz#654f3f665caeccb8e19ff047dc3fc8c64cadc43b" - integrity sha512-Et17MG0EGhO71VLqoP3fLw1sFHNeyoizCEFTFKeLOrLXmuWIYgcuDehfiQcXcs+z5bcA9PGjtR3ZUE8wdLRSdg== +tldts@^5.0.3: + version "5.1.0" + resolved "https://registry.yarnpkg.com/tldts/-/tldts-5.1.0.tgz#8ff521bbaa19a8b7fc063f1bc4e2415c0d645010" + integrity sha512-YjDPzF5waT7/kg/Z2136ZfejRC8xx4gZyXqzSTRsVmxPZnn/a36jp1E9NcsLC9Fj3WhP8AmrvMOxMqmzISxdHA== tmp@^0.0.33: version "0.0.33" @@ -8508,6 +8407,11 @@ tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== +tsmaz@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/tsmaz/-/tsmaz-1.2.1.tgz#6da2d42ac41c64f7f90ff48d9562d67feb74acf2" + integrity sha512-RobtKrzsPLP3CXb5TfN+wkuLIaeYsPmJg2LfohUUi4iHwf8RkMEUF5GX9zMw+YzirNK5JKjDNxoY2y/HBvG40w== + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"