From 343bc9c30394d679791dcae56ea821552fdfeea3 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Fri, 14 Feb 2020 06:54:24 -0700
Subject: [PATCH] [kbn/optimizer] Fix windows support (#57592)

* [kbn/optimizer] simplify run_workers.ts a smidge

* use Path.resolve() to create windows paths from normalized ones

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../src/optimizer/kibana_platform_plugins.ts  |  5 +-
 .../kbn-optimizer/src/worker/run_worker.ts    | 49 ++++++++-----------
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.ts b/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.ts
index b7e5e12f46a7fa..2165878e92ff4d 100644
--- a/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.ts
+++ b/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.ts
@@ -44,7 +44,10 @@ export function findKibanaPlatformPlugins(scanDirs: string[], paths: string[]) {
         absolute: true,
       }
     )
-    .map(path => readKibanaPlatformPlugin(path));
+    .map(path =>
+      // absolute paths returned from globby are using normalize or something so the path separators are `/` even on windows, Path.resolve solves this
+      readKibanaPlatformPlugin(Path.resolve(path))
+    );
 }
 
 function readKibanaPlatformPlugin(manifestPath: string): KibanaPlatformPlugin {
diff --git a/packages/kbn-optimizer/src/worker/run_worker.ts b/packages/kbn-optimizer/src/worker/run_worker.ts
index d6ca2aa94fb1a9..cbec4c3f44c7d8 100644
--- a/packages/kbn-optimizer/src/worker/run_worker.ts
+++ b/packages/kbn-optimizer/src/worker/run_worker.ts
@@ -18,7 +18,6 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap } from 'rxjs/operators';
 
 import { parseBundles, parseWorkerConfig, WorkerMsg, isWorkerMsg, WorkerMsgs } from '../common';
 
@@ -75,33 +74,27 @@ setInterval(() => {
 }, 1000).unref();
 
 Rx.defer(() => {
-  return Rx.of({
-    workerConfig: parseWorkerConfig(process.argv[2]),
-    bundles: parseBundles(process.argv[3]),
-  });
-})
-  .pipe(
-    mergeMap(({ workerConfig, bundles }) => {
-      // set BROWSERSLIST_ENV so that style/babel loaders see it before running compilers
-      process.env.BROWSERSLIST_ENV = workerConfig.browserslistEnv;
+  const workerConfig = parseWorkerConfig(process.argv[2]);
+  const bundles = parseBundles(process.argv[3]);
 
-      return runCompilers(workerConfig, bundles);
-    })
-  )
-  .subscribe(
-    msg => {
-      send(msg);
-    },
-    error => {
-      if (isWorkerMsg(error)) {
-        send(error);
-      } else {
-        send(workerMsgs.error(error));
-      }
+  // set BROWSERSLIST_ENV so that style/babel loaders see it before running compilers
+  process.env.BROWSERSLIST_ENV = workerConfig.browserslistEnv;
 
-      exit(1);
-    },
-    () => {
-      exit(0);
+  return runCompilers(workerConfig, bundles);
+}).subscribe(
+  msg => {
+    send(msg);
+  },
+  error => {
+    if (isWorkerMsg(error)) {
+      send(error);
+    } else {
+      send(workerMsgs.error(error));
     }
-  );
+
+    exit(1);
+  },
+  () => {
+    exit(0);
+  }
+);