github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.4] Update angular+jquery related packages (#46393) (#46633)

Browse source 
* Update angular related packages

* upgrade jQuery too

* don't delete screenshots in pipeline jobs

* use ng-change so that listener is triggered after ng-model is updated

* match @types/angular versions

* update yarn.lock

* fix test

$routeChangeSuccess is no longer broadcast when resolving a redirect route, so this test has been adjusted to validate that

# Conflicts:
#	package.json
#	x-pack/package.json
#	yarn.lock
This commit is contained in:
Spencer 2019-09-25 15:11:58 -07:00 • committed by GitHub
parent cfc49d1145
commit 5cc48622af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 61 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

19
package.json
View file

@ -78,6 +78,7 @@
"resolutions": {
"**/@types/node": "10.12.27",
"**/@types/hapi": "^17.0.18",
"**/@types/angular": "^1.6.56",
"**/typescript": "3.5.3",
"**/cypress/lodash": "4.17.13",
"**/isomorphic-git/**/base64-js": "^1.2.1"
@ -125,13 +126,13 @@
"@types/recompose": "^0.30.5",
"JSONStream": "1.3.5",
"abortcontroller-polyfill": "^1.3.0",
"angular": "npm:@elastic/angular@1.6.9-kibana.2",
"angular-aria": "1.6.6",
"angular-elastic": "2.5.1",
"angular": "^1.7.8",
"angular-aria": "^1.7.8",
"angular-elastic": "^2.5.1",
"angular-recursion": "^1.0.5",
"angular-route": "1.4.7",
"angular-sanitize": "1.6.5",
"angular-sortable-view": "0.0.17",
"angular-route": "^1.7.8",
"angular-sanitize": "^1.7.8",
"angular-sortable-view": "^0.0.17",
"autoprefixer": "9.6.1",
"babel-loader": "^8.0.6",
"bluebird": "3.5.5",
@ -278,7 +279,7 @@
"@microsoft/api-extractor": "7.1.8",
"@octokit/rest": "^15.10.0",
"@percy/agent": "^0.7.2",
"@types/angular": "1.6.50",
"@types/angular": "^1.6.56",
"@types/angular-mocks": "^1.7.0",
"@types/babel__core": "^7.1.2",
"@types/bluebird": "^3.1.1",
@ -306,7 +307,7 @@
"@types/humps": "^1.1.2",
"@types/jest": "^24.0.9",
"@types/joi": "^13.4.2",
"@types/jquery": "^3.3.6",
"@types/jquery": "^3.3.31",
"@types/js-yaml": "^3.11.1",
"@types/json5": "^0.0.30",
"@types/license-checker": "15.0.0",
@ -343,7 +344,7 @@
"@types/zen-observable": "^0.8.0",
"@typescript-eslint/eslint-plugin": "1.13.0",
"@typescript-eslint/parser": "1.13.0",
"angular-mocks": "1.4.7",
"angular-mocks": "^1.7.8",
"archiver": "^3.0.0",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",

2
src/legacy/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html
View file

@ -121,7 +121,7 @@
aria-label="Enable custom ranges"
ng-model="editorState.params.setColorRange"
type="checkbox"
ng-click="toggleColorRangeSection(true)"
ng-change="toggleColorRangeSection(true)"
kbn-accessible-click
>
</div>

8
src/legacy/ui/public/chrome/api/__tests__/sub_url_route_filter.js
View file

@ -96,13 +96,11 @@ describe('kbn-chrome subUrlRouteFilter()', () => {
});
describe('redirectTo route', () => {
it('returns false', () => {
it('is called on target route', () => {
test({
path: '/foo',
assert($route, subUrlRouteFilter) {
expect($route.current).to.be.ok();
expect($route.current.redirectTo).to.be.ok();
expect(subUrlRouteFilter()).to.eql(false);
assert($route) {
expect($route.current.$$route.originalPath).to.be('/bar');
}
});
});

4
test/functional/services/screenshots.ts
View file

@ -40,7 +40,9 @@ export async function ScreenshotsProvider({ getService }: FtrProviderContext) {
const SESSION_DIRECTORY = resolve(config.get('screenshots.directory'), 'session');
const FAILURE_DIRECTORY = resolve(config.get('screenshots.directory'), 'failure');
const BASELINE_DIRECTORY = resolve(config.get('screenshots.directory'), 'baseline');
await del([SESSION_DIRECTORY, FAILURE_DIRECTORY]);
if (!process.env.IS_PIPELINE_JOB) {
await del([SESSION_DIRECTORY, FAILURE_DIRECTORY]);
}
class Screenshots {
/**

6
x-pack/package.json
View file

@ -43,7 +43,7 @@
"@storybook/addon-storyshots": "^5.0.5",
"@storybook/react": "^5.0.5",
"@storybook/theming": "^5.0.5",
"@types/angular": "1.6.50",
"@types/angular": "^1.6.56",
"@types/base64-js": "^1.2.5",
"@types/boom": "^7.2.0",
"@types/cheerio": "^0.22.10",
@ -204,8 +204,8 @@
"@slack/client": "^4.8.0",
"@slack/webhook": "^5.0.0",
"@turf/boolean-contains": "6.0.1",
"angular-resource": "1.4.9",
"angular-sanitize": "1.6.5",
"angular-resource": "1.7.8",
"angular-sanitize": "1.7.8",
"angular-ui-ace": "0.2.3",
"apollo-cache-inmemory": "1.6.2",
"apollo-client": "^2.3.8",

75
yarn.lock
View file

@ -3016,10 +3016,10 @@
dependencies:
"@types/angular" "*"
"@types/angular@*", "@types/angular@1.6.50":
version "1.6.50"
resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.50.tgz#8b6599088d80f68ef0cad7d3a2062248ebe72b3d"
integrity sha512-D3KB0PdaxdwtA44yOpK+NtptTscKWgUzXmf8fiLaaVxnX+b7QQ+dUMsyeVDweCQ6VX4PMwkd6x2hJ0X+ISIsoQ==
"@types/angular@*", "@types/angular@^1.6.56":
version "1.6.56"
resolved "https://registry.yarnpkg.com/@types/angular/-/angular-1.6.56.tgz#20124077bd44061e018c7283c0bb83f4b00322dd"
integrity sha512-HxtqilvklZ7i6XOaiP7uIJIrFXEVEhfbSY45nfv2DeBRngncI58Y4ZOUMiUkcT8sqgLL1ablmbfylChUg7A3GA==
"@types/argparse@1.0.33":
version "1.0.33"
@ -3523,10 +3523,12 @@
resolved "https://registry.yarnpkg.com/@types/joi/-/joi-13.6.1.tgz#325486a397504f8e22c8c551dc8b0e1d41d5d5ae"
integrity sha512-JxZ0NP8NuB0BJOXi1KvAA6rySLTPmhOy4n2gzSFq/IFM3LNFm0h+2Vn/bPPgEYlWqzS2NPeLgKqfm75baX+Hog==
"@types/jquery@^3.3.6":
version "3.3.6"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.6.tgz#5932ead926307ca21e5b36808257f7c926b06565"
integrity sha512-403D4wN95Mtzt2EoQHARf5oe/jEPhzBOBNrunk+ydQGW8WmkQ/E8rViRAEB1qEt/vssfGfNVD6ujP4FVeegrLg==
"@types/jquery@^3.3.31":
version "3.3.31"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.31.tgz#27c706e4bf488474e1cb54a71d8303f37c93451b"
integrity sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg==
dependencies:
"@types/sizzle" "*"
"@types/js-yaml@^3.11.1":
version "3.11.2"
@ -4041,6 +4043,11 @@
resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.3.tgz#f8647e883d873962130f906a6114a4e187755696"
integrity sha512-cjmJQLx2B5Hp9SzO7rdSivipo3kBqRqeYkTW17nLST1tn5YLWBjTdnzdmeTJXA1+KrrBLsEuvKQ0fUPGrfazQg==
"@types/sizzle@*":
version "2.3.2"
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
"@types/stack-utils@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@ -4768,44 +4775,44 @@ ammo@3.x.x:
dependencies:
hoek "5.x.x"
angular-aria@1.6.6:
version "1.6.6"
resolved "https://registry.yarnpkg.com/angular-aria/-/angular-aria-1.6.6.tgz#58dd748e09564bc8409f739bde57b35fbee5b6a5"
integrity sha1-WN10jglWS8hAn3Ob3lezX77ltqU=
angular-aria@^1.7.8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/angular-aria/-/angular-aria-1.7.8.tgz#3954250ef516b57cdd3cdf41ff4ee6fcfdc84ceb"
integrity sha512-facq/111sZKL2wUUqRA1GnGt+lZ8KAcX9Aw04cNA+OyEkoaoRC77NY4VSOTQxghlSd0OPAdLeFnmETnuiWrpLg==
angular-elastic@2.5.1:
angular-elastic@^2.5.1:
version "2.5.1"
resolved "https://registry.yarnpkg.com/angular-elastic/-/angular-elastic-2.5.1.tgz#e938ab1bd8c76415b8ca6514b15fe3593a5df535"
integrity sha1-6TirG9jHZBW4ymUUsV/jWTpd9TU=
dependencies:
angular ">=1.0.6"
angular-mocks@1.4.7:
version "1.4.7"
resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.4.7.tgz#d7343ee0a033f9216770bda573950f6814d95227"
integrity sha1-1zQ+4KAz+SFncL2lc5UPaBTZUic=
angular-mocks@^1.7.8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.7.8.tgz#95e7887ca91d1a3e176cc22f2d1941d284ce9767"
integrity sha512-LB13ESBT0eJrhQhfPXyLR9qm4LI9g44hyBFwUqZKEHEA4DpfxVTu0ONipiNoN0zWtmEAezA8u2gjcoaO2TStig==
angular-recursion@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/angular-recursion/-/angular-recursion-1.0.5.tgz#cd405428a0bf55faf52eaa7988c1fe69cd930543"
integrity sha1-zUBUKKC/Vfr1Lqp5iMH+ac2TBUM=
angular-resource@1.4.9:
version "1.4.9"
resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.4.9.tgz#67f09382b623fd7e61540b0d127dba99fda99d45"
integrity sha1-Z/CTgrYj/X5hVAsNEn26mf2pnUU=
angular-resource@1.7.8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.7.8.tgz#9577dbcc02cdbb76398febc5fc7ee103c86c5c50"
integrity sha512-zuPQ0ZX9Q8WnZ0KMtJlKYUSIXWRQSbFzMkRV9zG8cYYSsMAZlXar5Hqmd5gzxC3O28AGM7BCEJ+iYs3UNL4qdA==
angular-route@1.4.7:
version "1.4.7"
resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.4.7.tgz#9796ac2527547158cd42d757d69d90a891a6d95f"
integrity sha1-l5asJSdUcVjNQtdX1p2QqJGm2V8=
angular-route@^1.7.8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.7.8.tgz#d502aa605dcbb253a93e844c0adf51c9bc36b9fa"
integrity sha512-VVk89PH0fsY5kfbx+N7IVX1IwnaPWYhMGY0uA+rjej2v1sjvrTx1SLkxUK4E0UpW1hXeLJhN7ncBcwoBiPtAtA==
angular-sanitize@1.6.5:
version "1.6.5"
resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.6.5.tgz#b5625a817afad2ba58c333e98eef169a1c6f517a"
integrity sha1-tWJagXr60rpYwzPpju8WmhxvUXo=
angular-sanitize@1.7.8, angular-sanitize@^1.7.8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/angular-sanitize/-/angular-sanitize-1.7.8.tgz#87d59f754bb18d286dfd9d6ce867299c094c6719"
integrity sha512-sVq51is1cVNiPytH4JIEd7iRW0OBIRQGNETWkz1c/jnLv2sBf9oDxEd8enwDz/W2ULBIpqJPK/3AsIxmZyh9pA==
angular-sortable-view@0.0.17:
angular-sortable-view@^0.0.17:
version "0.0.17"
resolved "https://registry.yarnpkg.com/angular-sortable-view/-/angular-sortable-view-0.0.17.tgz#99e2679951a86b6ee6ff27b099022943c683fb4f"
integrity sha512-2WkhM0Lt/wyMyrX/+7ve9ejSegBd7A4eRBNHEIJz8XMBIOjt+3oM1WpcAm+qNThkmNmmQaDeaYv0TQZw/WDMBw==
@ -4820,10 +4827,10 @@ angular@>=1.0.6:
resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.9.tgz#bc812932e18909038412d594a5990f4bb66c0619"
integrity sha512-6igWH2GIsxV+J38wNWCh8oyjaZsrIPIDO35twloIUyjlF2Yit6UyLAWujHP05ma/LFxTsx4NtYibRoMNBXPR1A==
"angular@npm:@elastic/angular@1.6.9-kibana.2":
version "1.6.9-kibana.2"
resolved "https://registry.yarnpkg.com/@elastic/angular/-/angular-1.6.9-kibana.2.tgz#ed27c3a26dc66b21d3454965a21e2265ab947fc7"
integrity sha512-wXWLOP+89ZzJNmRyo+H4Je0XG5VrRhDejfuxRKT8RLj4Xrfw9CvrgBGyW74kdFrsVU+99DKtZX+HuVFUkwf9TA==
angular@^1.7.8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.8.tgz#b77ede272ce1b261e3be30c1451a0b346905a3c9"
integrity sha512-wtef/y4COxM7ZVhddd7JtAAhyYObq9YXKar9tsW7558BImeVYteJiTxCKeJOL45lJ/+7B4wrAC49j8gTFYEthg==
ansi-align@^2.0.0:
version "2.0.0"