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

[bootstrap] normalize paths written to base tsconfig file (#130569)

Browse source
This commit is contained in:
Spencer 2022-04-19 11:12:56 -05:00 • committed by GitHub
parent 250e3f982e
commit 153cd550ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88945,7 +88945,9 @@ function addProjectToTree(tree, pathParts, project) {
/* harmony import */ var fs_promises__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs_promises__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("path");
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
/* harmony import */ var _convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./src/utils/convert_plugin_id_to_package_id.ts");
/* harmony import */ var normalize_path__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("../../node_modules/normalize-path/index.js");
/* harmony import */ var normalize_path__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(normalize_path__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var _convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./src/utils/convert_plugin_id_to_package_id.ts");
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
@ -88956,12 +88958,13 @@ function addProjectToTree(tree, pathParts, project) {
async function regenerateBaseTsconfig(plugins, repoRoot) {
const tsconfigPath = path__WEBPACK_IMPORTED_MODULE_1___default.a.resolve(repoRoot, 'tsconfig.base.json');
const lines = (await fs_promises__WEBPACK_IMPORTED_MODULE_0___default.a.readFile(tsconfigPath, 'utf-8')).split('\n');
const packageMap = plugins.slice().sort((a, b) => a.manifestPath.localeCompare(b.manifestPath)).flatMap(p => {
const id = Object(_convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_2__[/* convertPluginIdToPackageId */ "a"])(p.manifest.id);
const path = path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(repoRoot, p.directory);
const id = Object(_convert_plugin_id_to_package_id__WEBPACK_IMPORTED_MODULE_3__[/* convertPluginIdToPackageId */ "a"])(p.manifest.id);
const path = normalize_path__WEBPACK_IMPORTED_MODULE_2___default()(path__WEBPACK_IMPORTED_MODULE_1___default.a.relative(repoRoot, p.directory));
return [` "${id}": ["${path}"],`, ` "${id}/*": ["${path}/*"],`];
});
const start = lines.findIndex(l => l.trim() === '// START AUTOMATED PACKAGE LISTING');

3
packages/kbn-pm/src/utils/regenerate_base_tsconfig.ts
View file

@ -9,6 +9,7 @@
import Fs from 'fs/promises';
import Path from 'path';
import normalizePath from 'normalize-path';
import { KibanaPlatformPlugin } from '@kbn/plugin-discovery';
import { convertPluginIdToPackageId } from './convert_plugin_id_to_package_id';
@ -21,7 +22,7 @@ export async function regenerateBaseTsconfig(plugins: KibanaPlatformPlugin[], re
.sort((a, b) => a.manifestPath.localeCompare(b.manifestPath))
.flatMap((p) => {
const id = convertPluginIdToPackageId(p.manifest.id);
const path = Path.relative(repoRoot, p.directory);
const path = normalizePath(Path.relative(repoRoot, p.directory));
return [` "${id}": ["${path}"],`, ` "${id}/*": ["${path}/*"],`];
});