From fc123ca0f1fbc0bc7ff37a4b24e0057be56b8e7a Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Tue, 23 Feb 2021 19:42:56 +0000 Subject: [PATCH 1/2] chore(NA): add missing bazel files to exclude when building prod bazel packages --- packages/kbn-pm/dist/index.js | 2 +- .../src/production/build_bazel_production_projects.ts | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index 1b8bd4784e583..d5124f259c928 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -59868,7 +59868,7 @@ async function copyToBuild(project, kibanaRoot, buildRoot) { // We want the package to have the same relative location within the build const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path); const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath); - const bazelFilesToExclude = ['!*.params', '!*_mappings.json', '!*_options.optionsvalid.d.ts']; + const bazelFilesToExclude = ['!jest.sh', '!jest_loader.js', '!jest_require_patch.js', '!*.sh.runfiles*', '!*.params', '!*_mappings.json', '!*_options.optionsvalid.d.ts']; await cpy__WEBPACK_IMPORTED_MODULE_0___default()(['**/*', '!node_modules/**', ...bazelFilesToExclude], buildProjectPath, { cwd: Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(kibanaRoot, 'bazel', 'bin', 'packages', Object(path__WEBPACK_IMPORTED_MODULE_2__["basename"])(buildProjectPath)), dot: true, diff --git a/packages/kbn-pm/src/production/build_bazel_production_projects.ts b/packages/kbn-pm/src/production/build_bazel_production_projects.ts index a54d6c753d8d7..968ea98640fd3 100644 --- a/packages/kbn-pm/src/production/build_bazel_production_projects.ts +++ b/packages/kbn-pm/src/production/build_bazel_production_projects.ts @@ -60,8 +60,16 @@ async function copyToBuild(project: Project, kibanaRoot: string, buildRoot: stri // We want the package to have the same relative location within the build const relativeProjectPath = relative(kibanaRoot, project.path); const buildProjectPath = resolve(buildRoot, relativeProjectPath); + const bazelFilesToExclude = [ + '!jest.sh', + '!jest_loader.js', + '!jest_require_patch.js', + '!*.sh.runfiles*', + '!*.params', + '!*_mappings.json', + '!*_options.optionsvalid.d.ts', + ]; - const bazelFilesToExclude = ['!*.params', '!*_mappings.json', '!*_options.optionsvalid.d.ts']; await copy(['**/*', '!node_modules/**', ...bazelFilesToExclude], buildProjectPath, { cwd: join(kibanaRoot, 'bazel', 'bin', 'packages', basename(buildProjectPath)), dot: true, From 0cfb5967600c7118476ca2840179f0cc87b3e8d6 Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Tue, 23 Feb 2021 19:47:25 +0000 Subject: [PATCH 2/2] chore(NA): use globs to support all future run targets --- packages/kbn-pm/dist/index.js | 2 +- .../src/production/build_bazel_production_projects.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index d5124f259c928..51e8a617e2446 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -59868,7 +59868,7 @@ async function copyToBuild(project, kibanaRoot, buildRoot) { // We want the package to have the same relative location within the build const relativeProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["relative"])(kibanaRoot, project.path); const buildProjectPath = Object(path__WEBPACK_IMPORTED_MODULE_2__["resolve"])(buildRoot, relativeProjectPath); - const bazelFilesToExclude = ['!jest.sh', '!jest_loader.js', '!jest_require_patch.js', '!*.sh.runfiles*', '!*.params', '!*_mappings.json', '!*_options.optionsvalid.d.ts']; + const bazelFilesToExclude = ['!*.sh.runfiles*', '!*.params', '!*_mappings.json', '!*_options.optionsvalid.d.ts', '!*_loader.js', '!*_require_patch.js', '!*.sh']; await cpy__WEBPACK_IMPORTED_MODULE_0___default()(['**/*', '!node_modules/**', ...bazelFilesToExclude], buildProjectPath, { cwd: Object(path__WEBPACK_IMPORTED_MODULE_2__["join"])(kibanaRoot, 'bazel', 'bin', 'packages', Object(path__WEBPACK_IMPORTED_MODULE_2__["basename"])(buildProjectPath)), dot: true, diff --git a/packages/kbn-pm/src/production/build_bazel_production_projects.ts b/packages/kbn-pm/src/production/build_bazel_production_projects.ts index 968ea98640fd3..1034253c5e0dc 100644 --- a/packages/kbn-pm/src/production/build_bazel_production_projects.ts +++ b/packages/kbn-pm/src/production/build_bazel_production_projects.ts @@ -61,13 +61,13 @@ async function copyToBuild(project: Project, kibanaRoot: string, buildRoot: stri const relativeProjectPath = relative(kibanaRoot, project.path); const buildProjectPath = resolve(buildRoot, relativeProjectPath); const bazelFilesToExclude = [ - '!jest.sh', - '!jest_loader.js', - '!jest_require_patch.js', '!*.sh.runfiles*', '!*.params', '!*_mappings.json', '!*_options.optionsvalid.d.ts', + '!*_loader.js', + '!*_require_patch.js', + '!*.sh', ]; await copy(['**/*', '!node_modules/**', ...bazelFilesToExclude], buildProjectPath, {