Skip to content

Commit

Permalink
Merge branch 'master' into move-kbn-babel-code-parser-into-bazel
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Apr 20, 2021
2 parents 8c2612a + 0e5f12f commit b2ff413
Show file tree
Hide file tree
Showing 197 changed files with 16,094 additions and 1,703 deletions.
7 changes: 5 additions & 2 deletions docs/developer/getting-started/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ In order to support Windows development we currently require you to use one of t
- https://git-scm.com/download/win[Git bash] (other bash emulators like https://cmder.net/[Cmder] could work but we did not test them)
- https://docs.microsoft.com/en-us/windows/wsl/about[WSL]

Before running the steps listed below, please make sure you have installed Git bash or WSL and that
you are running the mentioned commands through one of them.
As well as installing https://www.microsoft.com/en-us/download/details.aspx?id=48145[Visual C++ Redistributable for Visual Studio 2015].

Before running the steps listed below, please make sure you have installed everything
that we require and listed above and that you are running the mentioned commands
through Git bash or WSL.

[discrete]
[[get-kibana-code]]
Expand Down
6 changes: 2 additions & 4 deletions docs/settings/fleet-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.

[cols="2*<"]
|===
| `xpack.fleet.agents.kibana.host`
| The hostname used by {agent} for accessing {kib}.
| `xpack.fleet.agents.fleet_server.hosts`
| Hostnames used by {agent} for accessing {fleet-server}.
| `xpack.fleet.agents.elasticsearch.host`
| The hostname used by {agent} for accessing {es}.
| `xpack.fleet.agents.tlsCheckDisabled`
| Set to `true` to allow {fleet} to run on a {kib} instance without TLS enabled.
|===

[NOTE]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
"@babel/runtime": "^7.12.5",
"@babel/traverse": "^7.12.12",
"@babel/types": "^7.12.12",
"@bazel/ibazel": "^0.14.0",
"@bazel/ibazel": "^0.15.10",
"@bazel/typescript": "^3.2.3",
"@cypress/snapshot": "^2.1.7",
"@cypress/webpack-preprocessor": "^5.6.0",
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-cli-dev-mode/src/dev_server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ export class DevServer {
const runServer = () =>
usingServerProcess(this.script, this.argv, (proc) => {
this.phase$.next('starting');
this.ready$.next(false);

// observable which emits devServer states containing lines
// logged to stdout/stderr, completes when stdio streams complete
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-optimizer/limits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pageLoadAssetSize:
charts: 195358
cloud: 21076
console: 46091
core: 397521
core: 413500
crossClusterReplication: 65408
dashboard: 374194
dashboardEnhanced: 65646
Expand Down
10 changes: 8 additions & 2 deletions packages/kbn-pm/dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48512,7 +48512,13 @@ async function runBazel(bazelArgs, offline = false, runOpts = {}) {
await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts);
}
async function runIBazel(bazelArgs, offline = false, runOpts = {}) {
await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts);
const extendedEnv = _objectSpread({
IBAZEL_USE_LEGACY_WATCHER: '0'
}, runOpts === null || runOpts === void 0 ? void 0 : runOpts.env);

await runBazelCommandWithRunner('ibazel', bazelArgs, offline, _objectSpread(_objectSpread({}, runOpts), {}, {
env: extendedEnv
}));
}

/***/ }),
Expand Down Expand Up @@ -59743,7 +59749,7 @@ const WatchBazelCommand = {
// Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
// Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment

await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build'], runOffline);
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build', '--show_result=1'], runOffline);
}

};
Expand Down
5 changes: 4 additions & 1 deletion packages/kbn-pm/src/commands/watch_bazel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ export const WatchBazelCommand: ICommand = {
//
// Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it
// Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment
await runIBazel(['--run_output=false', 'build', '//packages:build'], runOffline);
await runIBazel(
['--run_output=false', 'build', '//packages:build', '--show_result=1'],
runOffline
);
},
};
3 changes: 2 additions & 1 deletion packages/kbn-pm/src/utils/bazel/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,6 @@ export async function runIBazel(
offline: boolean = false,
runOpts: execa.Options = {}
) {
await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts);
const extendedEnv = { IBAZEL_USE_LEGACY_WATCHER: '0', ...runOpts?.env };
await runBazelCommandWithRunner('ibazel', bazelArgs, offline, { ...runOpts, env: extendedEnv });
}
150 changes: 131 additions & 19 deletions src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap

Large diffs are not rendered by default.

Loading

0 comments on commit b2ff413

Please sign in to comment.