Skip to content

Commit 026ec32

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into design/update-loading-spinner
2 parents 5132e1b + ba7589d commit 026ec32

409 files changed

Lines changed: 8111 additions & 4377 deletions

File tree

Some content is hidden

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

‎.github/workflows/pr-project-assigner.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ jobs:
1111
uses: elastic/github-actions/project-assigner@v1.0.0
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppAch", "projectName": "kibana-app-arch", "columnId": 6173897}]'
15-
ghToken: ${{ secrets.GITHUB_TOKEN }}
14+
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173897}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362}]'
15+
ghToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/project-assigner.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: elastic/github-actions/project-assigner@v1.0.0
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}]'
14+
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}]'
1515
ghToken: ${{ secrets.GITHUB_TOKEN }}
1616

1717

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
"@elastic/charts": "^14.0.0",
117117
"@elastic/datemath": "5.0.2",
118118
"@elastic/ems-client": "1.0.5",
119-
"@elastic/eui": "17.0.0",
119+
"@elastic/eui": "17.1.2",
120120
"@elastic/filesaver": "1.1.2",
121121
"@elastic/good": "8.1.1-kibana2",
122122
"@elastic/numeral": "2.3.3",

‎packages/kbn-analytics/scripts/build.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ run(
5555
'--extensions',
5656
'.ts,.js,.tsx',
5757
...(flags.watch ? ['--watch'] : ['--quiet']),
58-
...(flags['source-maps'] ? ['--source-maps', 'inline'] : []),
58+
...(!flags['source-maps'] || !!process.env.CODE_COVERAGE
59+
? []
60+
: ['--source-maps', 'inline']),
5961
],
6062
wait: true,
6163
env: {

‎packages/kbn-i18n/scripts/build.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ run(
5555
'--extensions',
5656
'.ts,.js,.tsx',
5757
...(flags.watch ? ['--watch'] : ['--quiet']),
58-
...(flags['source-maps'] ? ['--source-maps', 'inline'] : []),
58+
...(!flags['source-maps'] || !!process.env.CODE_COVERAGE
59+
? []
60+
: ['--source-maps', 'inline']),
5961
],
6062
wait: true,
6163
env: {

‎packages/kbn-utility-types/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919

2020
import { PromiseType } from 'utility-types';
21+
export { $Values, Required, Optional, Class } from 'utility-types';
2122

2223
/**
2324
* Returns wrapped type of a promise.

‎packages/kbn-utility-types/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"clean": "del target"
1414
},
1515
"dependencies": {
16-
"utility-types": "^3.7.0"
16+
"utility-types": "^3.10.0"
1717
},
1818
"devDependencies": {
1919
"del-cli": "^3.0.0",

‎src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script_highlight_rules.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ export function ScriptHighlightRules() {
6161
},
6262
{
6363
token: 'script.keyword.operator',
64-
6564
regex:
6665
'\\?\\.|\\*\\.|=~|==~|!|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|->|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|typeof|void)',
6766
},

0 commit comments

Comments
 (0)