[cli-dev-mode/optimizer] omit pageLoadAssetSizeLimit from cache and s…

…upport --verbose logging
elastic · Mar 30, 2021 · 497f561 · 497f561
1 parent 34b021c
commit 497f561
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 11 deletions.
diff --git a/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts b/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts
@@ -37,6 +37,7 @@ export type SomeCliArgs = Pick<
   CliArgs,
   | 'quiet'
   | 'silent'
+  | 'verbose'
   | 'disableOptimizer'
   | 'watch'
   | 'oss'
@@ -148,6 +149,7 @@ export class CliDevMode {
       dist: cliArgs.dist,
       quiet: !!cliArgs.quiet,
       silent: !!cliArgs.silent,
+      verbose: !!cliArgs.verbose,
       watch: cliArgs.watch,
     });
   }

diff --git a/packages/kbn-cli-dev-mode/src/optimizer.test.ts b/packages/kbn-cli-dev-mode/src/optimizer.test.ts
@@ -46,6 +46,7 @@ const defaultOptions: Options = {
   pluginScanDirs: ['/some-scan-path'],
   quiet: true,
   silent: true,
+  verbose: false,
   repoRoot: '/app',
   runExamples: true,
   watch: true,

diff --git a/packages/kbn-cli-dev-mode/src/optimizer.ts b/packages/kbn-cli-dev-mode/src/optimizer.ts
@@ -25,6 +25,7 @@ export interface Options {
   repoRoot: string;
   quiet: boolean;
   silent: boolean;
+  verbose: boolean;
   watch: boolean;
   cache: boolean;
   dist: boolean;
@@ -80,6 +81,7 @@ export class Optimizer {
 
     const { flags: levelFlags } = parseLogLevel(
       pickLevelFromFlags({
+        verbose: options.verbose,
         quiet: options.quiet,
         silent: options.silent,
       })

diff --git a/packages/kbn-config/src/env.ts b/packages/kbn-config/src/env.ts
@@ -24,6 +24,7 @@ export interface CliArgs {
   /** @deprecated */
   quiet?: boolean;
   silent?: boolean;
+  verbose?: boolean;
   watch: boolean;
   basePath: boolean;
   oss: boolean;

diff --git a/packages/kbn-optimizer/src/common/bundle.ts b/packages/kbn-optimizer/src/common/bundle.ts
@@ -11,6 +11,7 @@ import Fs from 'fs';
 
 import { BundleCache } from './bundle_cache';
 import { UnknownVals } from './ts_helpers';
+import { omit } from './obj_helpers';
 import { includes, ascending, entriesToObject } from './array_helpers';
 
 const VALID_BUNDLE_TYPES = ['plugin' as const, 'entry' as const];
@@ -90,7 +91,7 @@ export class Bundle {
    */
   createCacheKey(files: string[], mtimes: Map<string, number | undefined>): unknown {
     return {
-      spec: this.toSpec(),
+      spec: omit(this.toSpec(), ['pageLoadAssetSizeLimit']),
       mtimes: entriesToObject(
         files.map((p) => [p, mtimes.get(p)] as const).sort(ascending((e) => e[0]))
       ),

diff --git a/packages/kbn-optimizer/src/common/index.ts b/packages/kbn-optimizer/src/common/index.ts
@@ -18,3 +18,4 @@ export * from './array_helpers';
 export * from './event_stream_helpers';
 export * from './parse_path';
 export * from './theme_tags';
+export * from './obj_helpers';
diff --git a/packages/kbn-optimizer/src/common/obj_helpers.ts b/packages/kbn-optimizer/src/common/obj_helpers.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export function omit<T, K extends keyof T>(obj: T, keys: K[]): Omit<T, K> {
+  const result: any = {};
+  for (const [key, value] of Object.entries(obj) as any) {
+    if (!keys.includes(key)) {
+      result[key] = value;
+    }
+  }
+  return result as Omit<T, K>;
+}
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_config.ts b/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
@@ -17,6 +17,7 @@ import {
   ThemeTag,
   ThemeTags,
   parseThemeTags,
+  omit,
 } from '../common';
 
 import { findKibanaPlatformPlugins, KibanaPlatformPlugin } from './kibana_platform_plugins';
@@ -40,16 +41,6 @@ function pickMaxWorkerCount(dist: boolean) {
   return Math.max(maxWorkers, 2);
 }
 
-function omit<T, K extends keyof T>(obj: T, keys: K[]): Omit<T, K> {
-  const result: any = {};
-  for (const [key, value] of Object.entries(obj) as any) {
-    if (!keys.includes(key)) {
-      result[key] = value;
-    }
-  }
-  return result as Omit<T, K>;
-}
-
 interface Options {
   /** absolute path to root of the repo/build */
   repoRoot: string;

diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
@@ -228,6 +228,7 @@ export default function (program) {
       // no longer supported
       quiet: !!opts.quiet,
       silent: !!opts.silent,
+      verbose: !!opts.verbose,
       watch: !!opts.watch,
       runExamples: !!opts.runExamples,
       // We want to run without base path when the `--run-examples` flag is given so that we can use local