Skip to content

Commit 5ce6f99

Browse files
thomasneirynckthomasneirynck
committed
Merge branch 'ability-to-add-manual-exceptions-on-clean-dll-logic' of https://github.com/mistic/kibana into chore/worker
2 parents 7d0dceb + 6f12536 commit 5ce6f99

File tree

202 files changed

+2553
-1336
lines changed

Some content is hidden

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

202 files changed

+2553
-1336
lines changed

‎.eslintrc.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ module.exports = {
6464
'jsx-a11y/no-onchange': 'off',
6565
},
6666
},
67-
{
68-
files: ['src/legacy/core_plugins/console/**/*.{js,ts,tsx}'],
69-
rules: {
70-
'react-hooks/exhaustive-deps': 'off',
71-
},
72-
},
7367
{
7468
files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
7569
rules: {

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
/x-pack/test/functional/services/transform.ts @elastic/ml-ui
4646

4747
# Operations
48-
/renovate.json5 @elastic/kibana-operations
4948
/src/dev/ @elastic/kibana-operations
5049
/src/setup_node_env/ @elastic/kibana-operations
5150
/src/optimize/ @elastic/kibana-operations

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
"globby": "^8.0.1",
172172
"good-squeeze": "2.1.0",
173173
"h2o2": "^8.1.2",
174-
"handlebars": "4.3.5",
174+
"handlebars": "4.5.3",
175175
"hapi": "^17.5.3",
176176
"hapi-auth-cookie": "^9.0.0",
177177
"history": "^4.9.0",

‎packages/kbn-plugin-generator/integration_tests/generate_plugin.test.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,21 @@ describe(`running the plugin-generator via 'node scripts/generate_plugin.js plug
7070

7171
describe(`then running`, () => {
7272
it(`'yarn test:browser' should exit 0`, async () => {
73-
await execa('yarn', ['test:browser'], { cwd: generatedPath });
73+
await execa('yarn', ['test:browser'], {
74+
cwd: generatedPath,
75+
env: {
76+
DISABLE_JUNIT_REPORTER: '1',
77+
},
78+
});
7479
});
7580

7681
it(`'yarn test:server' should exit 0`, async () => {
77-
await execa('yarn', ['test:server'], { cwd: generatedPath });
82+
await execa('yarn', ['test:server'], {
83+
cwd: generatedPath,
84+
env: {
85+
DISABLE_JUNIT_REPORTER: '1',
86+
},
87+
});
7888
});
7989

8090
it(`'yarn build' should exit 0`, async () => {

‎packages/kbn-test/src/functional_test_runner/lib/config/schema.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export const schema = Joi.object()
143143

144144
junit: Joi.object()
145145
.keys({
146-
enabled: Joi.boolean().default(!!process.env.CI),
146+
enabled: Joi.boolean().default(!!process.env.CI && !process.env.DISABLE_JUNIT_REPORTER),
147147
reportName: Joi.string(),
148148
})
149149
.default(),

‎packages/kbn-test/src/mocha/auto_junit_reporter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export function createAutoJUnitReporter(junitReportOptions) {
2929
new MochaSpecReporter(runner, options);
3030

3131
// in CI we also setup the JUnit reporter
32-
if (process.env.CI) {
32+
if (process.env.CI && !process.env.DISABLE_JUNIT_REPORTER) {
3333
setupJUnitReportGeneration(runner, junitReportOptions);
3434
}
3535
}

‎packages/kbn-test/src/mocha/run_mocha_cli.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,16 @@ export function runMochaCli() {
6363
if (!opts._.length) {
6464
globby
6565
.sync(
66-
['src/**/__tests__/**/*.js', 'packages/**/__tests__/**/*.js', 'tasks/**/__tests__/**/*.js'],
66+
[
67+
'src/**/__tests__/**/*.js',
68+
'packages/**/__tests__/**/*.js',
69+
'tasks/**/__tests__/**/*.js',
70+
'x-pack/common/**/__tests__/**/*.js',
71+
'x-pack/server/**/__tests__/**/*.js',
72+
`x-pack/legacy/plugins/*/__tests__/**/*.js`,
73+
`x-pack/legacy/plugins/*/common/**/__tests__/**/*.js`,
74+
`x-pack/legacy/plugins/*/**/server/**/__tests__/**/*.js`,
75+
],
6776
{
6877
cwd: REPO_ROOT,
6978
onlyFiles: true,

‎renovate.json5‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
],
2222
labels: [
2323
'release_note:skip',
24+
'Team:Operations',
2425
'renovate',
2526
'v8.0.0',
2627
'v7.6.0',
2728
],
2829
major: {
2930
labels: [
3031
'release_note:skip',
32+
'Team:Operations',
3133
'renovate',
3234
'v8.0.0',
3335
'v7.6.0',
@@ -228,6 +230,7 @@
228230
],
229231
labels: [
230232
'release_note:skip',
233+
'Team:Operations',
231234
'renovate',
232235
'v8.0.0',
233236
'v7.6.0',

‎src/core/MIGRATION.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,8 +1167,8 @@ import { setup, start } from '../core_plugins/visualizations/public/legacy';
11671167
11681168
| Legacy Platform | New Platform | Notes |
11691169
| ------------------------------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
1170-
| `import 'ui/apply_filters'` | `import { ApplyFiltersPopover } from '../data/public'` | `import '../data/public/legacy` should be called to load legacy directives |
1171-
| `import 'ui/filter_bar'` | `import { FilterBar } from '../data/public'` | `import '../data/public/legacy` should be called to load legacy directives |
1170+
| `import 'ui/apply_filters'` | `import { ApplyFiltersPopover } from '../data/public'` | Directive is deprecated. |
1171+
| `import 'ui/filter_bar'` | `import { FilterBar } from '../data/public'` | Directive is deprecated. |
11721172
| `import 'ui/query_bar'` | `import { QueryBarInput } from '../data/public'` | Directives are deprecated. |
11731173
| `import 'ui/search_bar'` | `import { SearchBar } from '../data/public'` | Directive is deprecated. |
11741174
| `import 'ui/kbn_top_nav'` | `import { TopNavMenu } from '../navigation/public'` | Directive is still available in `ui/kbn_top_nav`. |

‎src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap‎

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

0 commit comments

Comments
 (0)