From cb15b358eaa85f2937d4b00f04968f838d95eacd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Thu, 6 Jun 2019 17:33:39 -0700 Subject: [PATCH] Update dependency history to v4.9.0 (#37799) * Update dependency history to v4.9.0 * importing submodules is deprecated, import root package * chore: bump history-extra to 5.0.1 compatible with history@^4.9.0 --- x-pack/package.json | 4 +-- x-pack/plugins/apm/public/utils/history.ts | 4 +-- x-pack/plugins/code/public/utils/url.ts | 4 +-- yarn.lock | 31 +++++++++++++++++----- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/x-pack/package.json b/x-pack/package.json index fa280d3d664e..04b06a053ca2 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -235,8 +235,8 @@ "h2o2": "^8.1.2", "handlebars": "^4.0.14", "hapi-auth-cookie": "^9.0.0", - "history": "4.7.2", - "history-extra": "^4.0.2", + "history": "4.9.0", + "history-extra": "^5.0.1", "humps": "2.0.1", "icalendar": "0.7.1", "idx": "^2.5.2", diff --git a/x-pack/plugins/apm/public/utils/history.ts b/x-pack/plugins/apm/public/utils/history.ts index 0786bf98d28c..1fd62341393c 100644 --- a/x-pack/plugins/apm/public/utils/history.ts +++ b/x-pack/plugins/apm/public/utils/history.ts @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import createHistory from 'history/createHashHistory'; +import { createHashHistory } from 'history'; // Make history singleton available across APM project // TODO: Explore using React context or hook instead? -const history = createHistory(); +const history = createHashHistory(); export { history }; diff --git a/x-pack/plugins/code/public/utils/url.ts b/x-pack/plugins/code/public/utils/url.ts index 0208434eeb5d..ac404db1f6ba 100644 --- a/x-pack/plugins/code/public/utils/url.ts +++ b/x-pack/plugins/code/public/utils/url.ts @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import createHistory from 'history/createHashHistory'; +import { createHashHistory } from 'history'; -export const history = createHistory(); +export const history = createHashHistory(); export const isImportRepositoryURLInvalid = (url: string) => url.trim() === ''; diff --git a/yarn.lock b/yarn.lock index 6a7c0d1d1644..a5c9895aa329 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14112,16 +14112,17 @@ history-extra@^4.0.2: resolved "https://registry.yarnpkg.com/history-extra/-/history-extra-4.0.2.tgz#67b512c196e0a521be1d8ac83513f00ca761d9f3" integrity sha512-Nia8vzQHyQcxKQUt5/vxZegurkG2K23TplaWLk1V6EWTuNdZMJUJ78anwGkBcHuLBia8TFUct/R/QDlgRUA42A== -history@4.7.2, history@^4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b" - integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA== +history@4.9.0: + version "4.9.0" + resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca" + integrity sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA== dependencies: - invariant "^2.2.1" + "@babel/runtime" "^7.1.2" loose-envify "^1.2.0" resolve-pathname "^2.2.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" value-equal "^0.4.0" - warning "^3.0.0" history@^3.0.0: version "3.3.0" @@ -14133,6 +14134,17 @@ history@^3.0.0: query-string "^4.2.2" warning "^3.0.0" +history@^4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b" + integrity sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA== + dependencies: + invariant "^2.2.1" + loose-envify "^1.2.0" + resolve-pathname "^2.2.0" + value-equal "^0.4.0" + warning "^3.0.0" + hjson@3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/hjson/-/hjson-3.1.2.tgz#1ae8a3a897a1fab8d45180f98e9abf9b56f95b55" @@ -25744,7 +25756,7 @@ tiny-invariant@^0.0.3: resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-0.0.3.tgz#4c7283c950e290889e9e94f64d3586ec9156cf44" integrity sha512-SA2YwvDrCITM9fTvHTHRpq9W6L2fBsClbqm3maT5PZux4Z73SPPDYwJMtnoWh6WMgmCkJij/LaOlWiqJqFMK8g== -tiny-invariant@^1.0.3, tiny-invariant@^1.0.4: +tiny-invariant@^1.0.2, tiny-invariant@^1.0.3, tiny-invariant@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.4.tgz#346b5415fd93cb696b0c4e8a96697ff590f92463" integrity sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g== @@ -25761,6 +25773,11 @@ tiny-lr@^1.1.1: object-assign "^4.1.0" qs "^6.4.0" +tiny-warning@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.2.tgz#1dfae771ee1a04396bdfde27a3adcebc6b648b28" + integrity sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q== + tinycolor2@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.3.0.tgz#3f38e6424de4566122d550eb1acc80cad37a7184"