style: 💄 spread array items from one array

elastic · Apr 17, 2020 · 231fd21 · 231fd21
1 parent 14db10f
commit 231fd21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/kbn-optimizer/src/optimizer/optimizer_config.ts b/packages/kbn-optimizer/src/optimizer/optimizer_config.ts
@@ -98,8 +98,7 @@ export class OptimizerConfig {
       Path.resolve(repoRoot, 'src/plugins'),
       ...(oss ? [] : [Path.resolve(repoRoot, 'x-pack/plugins')]),
       Path.resolve(repoRoot, 'plugins'),
-      ...(examples ? [Path.resolve('examples')] : []),
-      ...(examples ? [Path.resolve('x-pack/examples')] : []),
+      ...(examples ? [Path.resolve('examples'), Path.resolve('x-pack/examples')] : []),
       Path.resolve(repoRoot, '../kibana-extra'),
     ];
     if (!pluginScanDirs.every(p => Path.isAbsolute(p))) {

diff --git a/src/core/server/config/env.ts b/src/core/server/config/env.ts
@@ -109,8 +109,9 @@ export class Env {
       resolve(this.homeDir, 'src', 'plugins'),
       ...(options.cliArgs.oss ? [] : [resolve(this.homeDir, 'x-pack', 'plugins')]),
       resolve(this.homeDir, 'plugins'),
-      ...(options.cliArgs.runExamples ? [resolve(this.homeDir, 'examples')] : []),
-      ...(options.cliArgs.runExamples ? [resolve(this.homeDir, 'x-pack', 'examples')] : []),
+      ...(options.cliArgs.runExamples
+        ? [resolve(this.homeDir, 'examples'), resolve(this.homeDir, 'x-pack', 'examples')]
+        : []),
       resolve(this.homeDir, '..', 'kibana-extra'),
     ];