Skip to content

Commit 57c9aef

Browse files
committed
Merge branch 'master' into issue-50658-default-route-redirection
2 parents 3b8ad0c + 728d073 commit 57c9aef

File tree

251 files changed

+4489
-2779
lines changed

Some content is hidden

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

251 files changed

+4489
-2779
lines changed
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: 8.0 Breaking change
3+
about: Breaking changes from 7.x -> 8.0
4+
title: "[Breaking change]"
5+
labels: Team:Elasticsearch UI, Feature:Upgrade Assistant
6+
assignees: ''
7+
8+
---
9+
10+
## Change description
11+
12+
**Which release will ship the breaking change?**
13+
14+
<!-- e.g., v7.6.2 -->
15+
16+
**Describe the change. How will it manifest to users?**
17+
18+
**What percentage of users will be affected?**
19+
20+
<!-- e.g., Roughly 75% will need to make changes to x. -->
21+
22+
**What can users to do to address the change manually?**
23+
24+
<!-- If applicable, describe the manual workaround -->
25+
26+
**How could we make migration easier with the Upgrade Assistant?**
27+
28+
**Are there any edge cases?**
29+
30+
## Test Data
31+
32+
Provide test data. We can’t build a solution without data to test it against.
33+
34+
## Cross links
35+
36+
Cross-link to relevant [Elasticsearch breaking changes](https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-8.0.html).

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
/.es
55
.DS_Store
66
.node_binaries
7+
.native_modules
78
node_modules
89
!/src/dev/npm/integration_tests/__fixtures__/fixture1/node_modules
910
!/src/dev/notice/__fixtures__/node_modules

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
kibanaPipeline(timeoutMinutes: 135) {
6+
kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
77
githubPr.withDefaultPrComments {
88
catchError {
99
retryable.enable()

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
"pug": "^2.0.4",
228228
"query-string": "6.10.1",
229229
"raw-loader": "3.1.0",
230+
"re2": "1.10.5",
230231
"react": "^16.12.0",
231232
"react-color": "^2.13.8",
232233
"react-dom": "^16.12.0",

src/dev/build/build_distributables.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import {
4545
InstallDependenciesTask,
4646
BuildKibanaPlatformPluginsTask,
4747
OptimizeBuildTask,
48+
PatchNativeModulesTask,
4849
RemovePackageJsonDepsTask,
4950
RemoveWorkspacesTask,
5051
TranspileBabelTask,
@@ -132,6 +133,7 @@ export async function buildDistributables(options) {
132133
* directories and perform platform-specific steps
133134
*/
134135
await run(CreateArchivesSourcesTask);
136+
await run(PatchNativeModulesTask);
135137
await run(CleanExtraBinScriptsTask);
136138
await run(CleanExtraBrowsersTask);
137139
await run(CleanNodeBuildsTask);

src/dev/build/tasks/nodejs/download.js renamed to src/dev/build/lib/download.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import chalk from 'chalk';
2424
import { createHash } from 'crypto';
2525
import Axios from 'axios';
2626

27-
import { mkdirp } from '../../lib';
27+
import { mkdirp } from './fs';
2828

2929
function tryUnlink(path) {
3030
try {

src/dev/build/lib/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ export {
3333
compress,
3434
isFileAccessible,
3535
} from './fs';
36+
export { download } from './download';
3637
export { scanDelete } from './scan_delete';
3738
export { scanCopy } from './scan_copy';

src/dev/build/tasks/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export * from './nodejs_modules';
3232
export * from './notice_file_task';
3333
export * from './optimize_task';
3434
export * from './os_packages';
35+
export * from './patch_native_modules_task';
3536
export * from './transpile_babel_task';
3637
export * from './transpile_scss_task';
3738
export * from './verify_env_task';

src/dev/build/tasks/nodejs/__tests__/download_node_builds_task.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import expect from '@kbn/expect';
2222

2323
import * as NodeShasumsNS from '../node_shasums';
2424
import * as NodeDownloadInfoNS from '../node_download_info';
25-
import * as DownloadNS from '../download';
25+
import * as DownloadNS from '../../../lib/download'; // sinon can't stub '../../../lib' properly
2626
import { DownloadNodeBuildsTask } from '../download_node_builds_task';
2727

2828
describe('src/dev/build/tasks/nodejs/download_node_builds_task', () => {

0 commit comments

Comments
 (0)