[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…

…-fix'
elastic · Mar 23, 2023 · 32ea954 · 32ea954
1 parent 52f6171
commit 32ea954
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 44 deletions.
diff --git a/packages/kbn-optimizer/src/common/bundle.ts b/packages/kbn-optimizer/src/common/bundle.ts
@@ -168,13 +168,15 @@ export class Bundle {
     // This is only used to build legacy third party plugins in the @kbn/plugin-helpers
 
     if (!isObj(parsed)) {
-      throw new Error(
-        `Expected [${this.manifestPath}] to be a jsonc parseable file`
-      );
+      throw new Error(`Expected [${this.manifestPath}] to be a jsonc parseable file`);
     }
 
-    const requiredBundles = isObj(parsed.plugin) ? parsed.plugin.requiredBundles : parsed.requiredBundles;
-    const requiredPlugins = isObj(parsed.plugin) ? parsed.plugin.requiredPlugins : parsed.requiredPlugins;
+    const requiredBundles = isObj(parsed.plugin)
+      ? parsed.plugin.requiredBundles
+      : parsed.requiredBundles;
+    const requiredPlugins = isObj(parsed.plugin)
+      ? parsed.plugin.requiredPlugins
+      : parsed.requiredPlugins;
     const requiredBundlesStringArray = toStringArray(requiredBundles);
     const requiredPluginsStringArray = toStringArray(requiredPlugins);
     // END-OF-TD: we just need to check for parse.plugin and not for legacy plugins manifest types
@@ -193,10 +195,7 @@ export class Bundle {
 
     return {
       explicit: [...(requiredBundlesStringArray || [])],
-      implicit: [
-        ...DEFAULT_IMPLICIT_BUNDLE_DEPS,
-        ...(requiredPluginsStringArray || [])
-      ],
+      implicit: [...DEFAULT_IMPLICIT_BUNDLE_DEPS, ...(requiredPluginsStringArray || [])],
     };
   }
 }

diff --git a/packages/kbn-plugin-helpers/src/tasks/optimize.ts b/packages/kbn-plugin-helpers/src/tasks/optimize.ts
@@ -20,7 +20,15 @@ import { TaskContext } from '../task_context';
 
 type WorkerMsg = { success: true; warnings: string } | { success: false; error: string };
 
-export async function optimize({ log, dev, dist, watch, plugin, sourceDir, buildDir }: TaskContext) {
+export async function optimize({
+  log,
+  dev,
+  dist,
+  watch,
+  plugin,
+  sourceDir,
+  buildDir,
+}: TaskContext) {
   if (!plugin.manifest.ui) {
     return;
   }
@@ -33,7 +41,7 @@ export async function optimize({ log, dev, dist, watch, plugin, sourceDir, build
       testPlugins: false,
       includeCoreBundle: true,
       dist: !!dist,
-      watch: !!watch
+      watch: !!watch,
     });
 
     const bundle = new Bundle({
@@ -63,21 +71,24 @@ export async function optimize({ log, dev, dist, watch, plugin, sourceDir, build
 
     // Observe all events from child process
     const eventObservable = Rx.merge(
-      observeLines(proc.stdout!).pipe(
-        Rx.map((line) => ({ type: 'stdout', data: line }))
-      ),
-      observeLines(proc.stderr!).pipe(
-        Rx.map((line) => ({ type: 'stderr', data: line }))
-      ),
+      observeLines(proc.stdout!).pipe(Rx.map((line) => ({ type: 'stdout', data: line }))),
+      observeLines(proc.stderr!).pipe(Rx.map((line) => ({ type: 'stderr', data: line }))),
       Rx.fromEvent<[WorkerMsg]>(proc, 'message').pipe(
         Rx.map((msg) => ({ type: 'message', data: msg[0] }))
       ),
-      Rx.fromEvent<Error>(proc, 'error').pipe(
-        Rx.map((error) => ({ type: 'error', data: error }))
-      )
+      Rx.fromEvent<Error>(proc, 'error').pipe(Rx.map((error) => ({ type: 'error', data: error })))
     );
 
-    const simpleOrWatchObservable = watch ? eventObservable : eventObservable.pipe(Rx.take(1), Rx.tap({ complete() { proc.kill('SIGKILL'); }}));
+    const simpleOrWatchObservable = watch
+      ? eventObservable
+      : eventObservable.pipe(
+          Rx.take(1),
+          Rx.tap({
+            complete() {
+              proc.kill('SIGKILL');
+            },
+          })
+        );
 
     // Subscribe to eventObservable to log events
     const eventSubscription = simpleOrWatchObservable.subscribe((event) => {
@@ -96,7 +107,7 @@ export async function optimize({ log, dev, dist, watch, plugin, sourceDir, build
           log.success(`browser bundle created at ${rel}`);
         }
       } else if (event.type === 'error') {
-        log.error(event.data as Error)
+        log.error(event.data as Error);
       }
     });
 

diff --git a/packages/kbn-plugin-helpers/src/tasks/optimize_worker.ts b/packages/kbn-plugin-helpers/src/tasks/optimize_worker.ts
@@ -26,30 +26,33 @@ process.on('message', (msg: any) => {
   const webpackConfig = getWebpackConfig(bundle, remotes, workerConfig);
   const compiler = webpack(webpackConfig);
 
-  compiler.watch({
-    // Example
-    aggregateTimeout: 300,
-    poll: undefined,
-  }, (error, stats) => {
-    if (error) {
-      send.call(process, {
-        success: false,
-        error: error.message,
-      });
-      return;
-    }
+  compiler.watch(
+    {
+      // Example
+      aggregateTimeout: 300,
+      poll: undefined,
+    },
+    (error, stats) => {
+      if (error) {
+        send.call(process, {
+          success: false,
+          error: error.message,
+        });
+        return;
+      }
+
+      if (stats.hasErrors()) {
+        send.call(process, {
+          success: false,
+          error: `Failed to compile with webpack:\n${stats.toString()}`,
+        });
+        return;
+      }
 
-    if (stats.hasErrors()) {
       send.call(process, {
-        success: false,
-        error: `Failed to compile with webpack:\n${stats.toString()}`,
+        success: true,
+        warnings: stats.hasWarnings() ? stats.toString() : '',
       });
-      return;
     }
-
-    send.call(process, {
-      success: true,
-      warnings: stats.hasWarnings() ? stats.toString() : '',
-    });
-  });
+  );
 });