github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

chore(NA): remove yarn extra options from kbn bootstrap (#90098)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Tiago Costa 2021-02-03 16:25:51 +00:00 • committed by GitHub
parent bb802c01e4
commit f3468b95c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
packages/kbn-pm/dist/index.js vendored
View file

@ -173,7 +173,7 @@ function help() {
-i, --include Include only specified projects. If left unspecified, it defaults to including all projects.
--oss Do not include the x-pack when running command.
--skip-kibana-plugins Filter all plugins in ./plugins and ../kibana-extra when running command.
--no-cache Disable the bootstrap cache
--no-cache Disable the kbn packages bootstrap cache
--no-validate Disable the bootstrap yarn.lock validation
--verbose Set log level to verbose
--debug Set log level to debug
@ -207,7 +207,7 @@ async function run(argv) {
cache: true,
validate: true
},
boolean: ['prefer-offline', 'frozen-lockfile', 'cache', 'validate']
boolean: ['cache', 'validate']
});
const args = options._;
@ -8895,8 +8895,7 @@ const BootstrapCommand = {
var _projects$get;
const batchedProjects = Object(_utils_projects__WEBPACK_IMPORTED_MODULE_4__["topologicallyBatchProjects"])(projects, projectGraph);
const kibanaProjectPath = (_projects$get = projects.get('kibana')) === null || _projects$get === void 0 ? void 0 : _projects$get.path;
const extraArgs = [...(options['frozen-lockfile'] === true ? ['--frozen-lockfile'] : []), ...(options['prefer-offline'] === true ? ['--prefer-offline'] : [])]; // Install bazel machinery tools if needed
const kibanaProjectPath = (_projects$get = projects.get('kibana')) === null || _projects$get === void 0 ? void 0 : _projects$get.path; // Install bazel machinery tools if needed
await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_9__["installBazelTools"])(rootPath); // Install monorepo npm dependencies
@ -8909,9 +8908,7 @@ const BootstrapCommand = {
}
if (project.isSinglePackageJsonProject || isExternalPlugin) {
await project.installDependencies({
extraArgs
});
await project.installDependencies();
continue;
}
@ -23013,12 +23010,10 @@ class Project {
return Object.values(this.allDependencies).every(dep => Object(_package_json__WEBPACK_IMPORTED_MODULE_4__["isLinkDependency"])(dep));
}
async installDependencies({
extraArgs
}) {
async installDependencies(options = {}) {
_log__WEBPACK_IMPORTED_MODULE_3__["log"].info(`[${this.name}] running yarn`);
_log__WEBPACK_IMPORTED_MODULE_3__["log"].write('');
await Object(_scripts__WEBPACK_IMPORTED_MODULE_5__["installInDir"])(this.path, extraArgs);
await Object(_scripts__WEBPACK_IMPORTED_MODULE_5__["installInDir"])(this.path, options === null || options === void 0 ? void 0 : options.extraArgs);
_log__WEBPACK_IMPORTED_MODULE_3__["log"].write('');
}

4
packages/kbn-pm/src/cli.ts
View file

@ -35,7 +35,7 @@ function help() {
-i, --include Include only specified projects. If left unspecified, it defaults to including all projects.
--oss Do not include the x-pack when running command.
--skip-kibana-plugins Filter all plugins in ./plugins and ../kibana-extra when running command.
--no-cache Disable the bootstrap cache
--no-cache Disable the kbn packages bootstrap cache
--no-validate Disable the bootstrap yarn.lock validation
--verbose Set log level to verbose
--debug Set log level to debug
@ -75,7 +75,7 @@ export async function run(argv: string[]) {
cache: true,
validate: true,
},
boolean: ['prefer-offline', 'frozen-lockfile', 'cache', 'validate'],
boolean: ['cache', 'validate'],
});
const args = options._;

6
packages/kbn-pm/src/commands/bootstrap.ts
View file

@ -26,10 +26,6 @@ export const BootstrapCommand: ICommand = {
async run(projects, projectGraph, { options, kbn, rootPath }) {
const batchedProjects = topologicallyBatchProjects(projects, projectGraph);
const kibanaProjectPath = projects.get('kibana')?.path;
const extraArgs = [
...(options['frozen-lockfile'] === true ? ['--frozen-lockfile'] : []),
...(options['prefer-offline'] === true ? ['--prefer-offline'] : []),
];
// Install bazel machinery tools if needed
await installBazelTools(rootPath);
@ -44,7 +40,7 @@ export const BootstrapCommand: ICommand = {
}
if (project.isSinglePackageJsonProject || isExternalPlugin) {
await project.installDependencies({ extraArgs });
await project.installDependencies();
continue;
}

4
packages/kbn-pm/src/utils/project.ts
View file

@ -197,11 +197,11 @@ export class Project {
return Object.values(this.allDependencies).every((dep) => isLinkDependency(dep));
}
public async installDependencies({ extraArgs }: { extraArgs: string[] }) {
public async installDependencies(options: { extraArgs?: string[] } = {}) {
log.info(`[${this.name}] running yarn`);
log.write('');
await installInDir(this.path, extraArgs);
await installInDir(this.path, options?.extraArgs);
log.write('');
}
}