Skip to content

Commit 067d25a

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into ilm/add-frozen-phase
2 parents 5149dd2 + 8e2cb56 commit 067d25a

File tree

205 files changed

+769
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+769
-364
lines changed

‎examples/embeddable_examples/public/book/book_embeddable.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ function getHasMatch(search?: string, savedAttributes?: BookSavedObjectAttribute
6060
);
6161
}
6262

63-
export class BookEmbeddable extends Embeddable<BookEmbeddableInput, BookEmbeddableOutput>
63+
export class BookEmbeddable
64+
extends Embeddable<BookEmbeddableInput, BookEmbeddableOutput>
6465
implements ReferenceOrValueEmbeddable<BookByValueInput, BookByReferenceInput> {
6566
public readonly type = BOOK_EMBEDDABLE;
6667
private subscription: Subscription;

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"**/@types/chai": "^4.2.11",
8787
"**/cypress/@types/lodash": "^4.14.159",
8888
"**/cypress/lodash": "^4.17.20",
89-
"**/typescript": "3.9.5",
89+
"**/typescript": "4.0.2",
9090
"**/graphql-toolkit/lodash": "^4.17.15",
9191
"**/hoist-non-react-statics": "^3.3.2",
9292
"**/isomorphic-git/**/base64-js": "^1.2.1",
@@ -338,8 +338,8 @@
338338
"@types/vinyl": "^2.0.4",
339339
"@types/vinyl-fs": "^2.4.11",
340340
"@types/zen-observable": "^0.8.0",
341-
"@typescript-eslint/eslint-plugin": "^3.7.1",
342-
"@typescript-eslint/parser": "^3.7.1",
341+
"@typescript-eslint/eslint-plugin": "^3.10.0",
342+
"@typescript-eslint/parser": "^3.10.0",
343343
"angular-aria": "^1.8.0",
344344
"angular-mocks": "^1.7.9",
345345
"angular-recursion": "^1.0.5",
@@ -381,7 +381,7 @@
381381
"eslint-plugin-no-unsanitized": "^3.0.2",
382382
"eslint-plugin-node": "^11.0.0",
383383
"eslint-plugin-prefer-object-spread": "^1.2.1",
384-
"eslint-plugin-prettier": "^3.1.3",
384+
"eslint-plugin-prettier": "^3.1.4",
385385
"eslint-plugin-react": "^7.20.3",
386386
"eslint-plugin-react-hooks": "^4.0.4",
387387
"eslint-plugin-react-perf": "^3.2.3",
@@ -443,7 +443,7 @@
443443
"pkg-up": "^2.0.0",
444444
"pngjs": "^3.4.0",
445445
"postcss": "^7.0.32",
446-
"prettier": "^2.0.5",
446+
"prettier": "^2.1.1",
447447
"prop-types": "15.6.0",
448448
"proxyquire": "1.8.0",
449449
"react-grid-layout": "^0.16.2",
@@ -469,7 +469,7 @@
469469
"tape": "^4.13.0",
470470
"topojson-client": "3.0.0",
471471
"tree-kill": "^1.2.2",
472-
"typescript": "3.9.5",
472+
"typescript": "4.0.2",
473473
"typings-tester": "^0.3.2",
474474
"ui-select": "0.19.8",
475475
"vega": "^5.13.0",

‎packages/eslint-config-kibana/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"homepage": "https://github.com/elastic/kibana/tree/master/packages/eslint-config-kibana",
1717
"peerDependencies": {
18-
"@typescript-eslint/eslint-plugin": "^3.7.1",
19-
"@typescript-eslint/parser": "^3.7.1",
18+
"@typescript-eslint/eslint-plugin": "^3.10.0",
19+
"@typescript-eslint/parser": "^3.10.0",
2020
"babel-eslint": "^10.0.3",
2121
"eslint": "^6.8.0",
2222
"eslint-plugin-babel": "^5.3.0",

‎packages/kbn-analytics/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"@babel/cli": "^7.10.5",
1818
"@kbn/dev-utils": "1.0.0",
1919
"@kbn/babel-preset": "1.0.0",
20-
"typescript": "3.9.5"
20+
"typescript": "4.0.2"
2121
}
2222
}

‎packages/kbn-config-schema/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"kbn:bootstrap": "yarn build"
1111
},
1212
"devDependencies": {
13-
"typescript": "3.9.5",
13+
"typescript": "4.0.2",
1414
"tsd": "^0.7.4"
1515
},
1616
"peerDependencies": {

‎packages/kbn-dev-utils/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"tslib": "^2.0.0"
2626
},
2727
"devDependencies": {
28-
"typescript": "3.9.5",
28+
"typescript": "4.0.2",
2929
"@kbn/expect": "1.0.0",
3030
"chance": "1.0.18"
3131
}

‎packages/kbn-i18n/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"del": "^5.1.0",
2222
"getopts": "^2.2.4",
2323
"supports-color": "^7.0.0",
24-
"typescript": "3.9.5"
24+
"typescript": "4.0.2"
2525
},
2626
"dependencies": {
2727
"intl-format-cache": "^2.1.0",

‎packages/kbn-monaco/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"del": "^5.1.0",
2121
"raw-loader": "3.1.0",
2222
"supports-color": "^7.0.0",
23-
"typescript": "3.9.5",
23+
"typescript": "4.0.2",
2424
"webpack": "^4.41.5",
2525
"webpack-cli": "^3.3.10"
2626
}

‎packages/kbn-plugin-generator/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"execa": "^4.0.2",
1515
"inquirer": "^7.3.3",
1616
"normalize-path": "^3.0.0",
17-
"prettier": "^2.0.5",
17+
"prettier": "^2.1.1",
1818
"vinyl": "^2.2.0",
1919
"vinyl-fs": "^3.0.3"
2020
},

‎packages/kbn-plugin-helpers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@types/through2": "^2.0.35",
3636
"@types/through2-map": "^3.0.0",
3737
"@types/vinyl": "^2.0.4",
38-
"typescript": "3.9.5"
38+
"typescript": "4.0.2"
3939
},
4040
"peerDependencies": {
4141
"@kbn/babel-preset": "1.0.0"

0 commit comments

Comments
 (0)