address Spencer's comment p.2

elastic · Mar 20, 2020 · 59759d7 · 59759d7
1 parent 3021e43
commit 59759d7
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -131,14 +131,12 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
                   loader: 'resolve-url-loader',
                   options: {
                     join: (_: string, __: any) => (uri: string, base?: string) => {
-                      if (!base) {
+                      // apply only to legacy platform styles
+                      if (!base || !parseDirPath(base).dirs.includes('legacy')) {
                         return null;
                       }
 
-                      if (
-                        uri.startsWith('ui/assets') &&
-                        parseDirPath(base).dirs.includes('legacy')
-                      ) {
+                      if (uri.startsWith('ui/assets')) {
                         return Path.resolve(
                           worker.repoRoot,
                           'src/core/server/core_app/',
@@ -147,7 +145,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
                       }
 
                       // manually force ui/* urls in legacy styles to resolve to ui/legacy/public
-                      if (uri.startsWith('ui/') && parseDirPath(base).dirs.includes('legacy')) {
+                      if (uri.startsWith('ui/')) {
                         return Path.resolve(
                           worker.repoRoot,
                           'src/legacy/ui/public',