[6.x] [ui/bundles][optimizer] only use caches when in dev mode (#15780)…

… (#15854) * [ui/bundles][optimizer] only use caches when in dev mode * [optimize/caching] make cache-loader disabling more explicit * [optimize/caching] clarify why we only want caching in dev
elastic · Jan 5, 2018 · a29c6e4 · a29c6e4
1 parent 56dc541
commit a29c6e4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/src/optimize/base_optimizer.js b/src/optimize/base_optimizer.js
@@ -1,4 +1,3 @@
-import { resolve } from 'path';
 import { writeFile } from 'fs';
 
 import Boom from 'boom';
@@ -70,8 +69,6 @@ export default class BaseOptimizer {
   }
 
   getConfig() {
-    const cacheDirectory = this.uiBundles.getCachePath();
-
     function getStyleLoaders(preProcessors = [], postProcessors = []) {
       return ExtractTextPlugin.extract({
         fallback: {
@@ -101,6 +98,28 @@ export default class BaseOptimizer {
       });
     }
 
+    /**
+     * Adds a cache loader if we're running in dev mode. The reason we're not adding
+     * the cache-loader when running in production mode is that it creates cache
+     * files in optimize/.cache that are not necessary for distributable versions
+     * of Kibana and just make compressing and extracting it more difficult.
+     */
+    function maybeAddCacheLoader(uiBundles, cacheName, loaders) {
+      if (!uiBundles.isDevMode()) {
+        return loaders;
+      }
+
+      return [
+        {
+          loader: 'cache-loader',
+          options: {
+            cacheDirectory: uiBundles.getCacheDirectory(cacheName)
+          }
+        },
+        ...loaders
+      ];
+    }
+
     const commonConfig = {
       node: { fs: 'empty' },
       context: fromRoot('.'),
@@ -136,12 +155,7 @@ export default class BaseOptimizer {
             test: /\.less$/,
             use: getStyleLoaders(
               ['less-loader'],
-              [{
-                loader: 'cache-loader',
-                options: {
-                  cacheDirectory: resolve(cacheDirectory, 'less'),
-                }
-              }]
+              maybeAddCacheLoader(this.uiBundles, 'less', [])
             ),
           },
           {
@@ -168,13 +182,7 @@ export default class BaseOptimizer {
           {
             test: /\.js$/,
             exclude: BABEL_EXCLUDE_RE.concat(this.uiBundles.getWebpackNoParseRules()),
-            use: [
-              {
-                loader: 'cache-loader',
-                options: {
-                  cacheDirectory: resolve(cacheDirectory, 'babel'),
-                }
-              },
+            use: maybeAddCacheLoader(this.uiBundles, 'babel', [
               {
                 loader: 'babel-loader',
                 options: {
@@ -183,8 +191,8 @@ export default class BaseOptimizer {
                     BABEL_PRESET_PATH,
                   ],
                 },
-              },
-            ],
+              }
+            ]),
           },
           ...this.uiBundles.getPostLoaders().map(loader => ({
             enforce: 'post',

diff --git a/src/ui/ui_bundles/ui_bundles_controller.js b/src/ui/ui_bundles/ui_bundles_controller.js
@@ -110,8 +110,8 @@ export class UiBundlesController {
     return resolve(this._workingDir, ...args);
   }
 
-  getCachePath() {
-    return this.resolvePath('../.cache', this.hashBundleEntries());
+  getCacheDirectory(...subPath) {
+    return this.resolvePath('../.cache', this.hashBundleEntries(), ...subPath);
   }
 
   getDescription() {