From 08a5023ad445e66b22bc6f83577e9ebe60cbac3e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 7 Apr 2020 00:01:56 +0200
Subject: [PATCH] packages/cli: make plugin:build have built-in caching

---
 packages/cli/src/commands/plugin/build.ts           | 13 ++++++++-----
 .../cli/templates/default-plugin/package.json.hbs   |  2 +-
 packages/core/package.json                          |  2 +-
 plugins/home-page/package.json                      |  2 +-
 plugins/welcome/package.json                        |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/cli/src/commands/plugin/build.ts b/packages/cli/src/commands/plugin/build.ts
index cb28d4cf5f..aa9c68c494 100644
--- a/packages/cli/src/commands/plugin/build.ts
+++ b/packages/cli/src/commands/plugin/build.ts
@@ -17,6 +17,7 @@
 import { rollup, watch, OutputOptions } from 'rollup';
 import conf from './rollup.config';
 import { Command } from 'commander';
+import { withCache, getDefaultCacheOptions } from 'commands/build-cache';
 
 export default async (cmd: Command) => {
   if (cmd.watch) {
@@ -40,10 +41,12 @@ export default async (cmd: Command) => {
     });
   }
 
-  const bundle = await rollup({
-    input: conf.input,
-    plugins: conf.plugins,
+  await withCache(getDefaultCacheOptions(), async () => {
+    const bundle = await rollup({
+      input: conf.input,
+      plugins: conf.plugins,
+    });
+    await bundle.generate(conf.output as OutputOptions);
+    await bundle.write(conf.output as OutputOptions);
   });
-  await bundle.generate(conf.output as OutputOptions);
-  await bundle.write(conf.output as OutputOptions);
 };
diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index dc1500944a..83d998f8e4 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -7,7 +7,7 @@
   "private": true,
   "scripts": {
     "build:watch": "backstage-cli plugin:build --watch",
-    "build": "backstage-cli build-cache -- backstage-cli plugin:build",
+    "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test"
   },
diff --git a/packages/core/package.json b/packages/core/package.json
index 93c2e2fdf7..0bc9165238 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -20,7 +20,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build:watch": "backstage-cli plugin:build --watch",
-    "build": "backstage-cli build-cache -- backstage-cli plugin:build",
+    "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test"
   },
diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json
index 88afe98bd4..4432fe1588 100644
--- a/plugins/home-page/package.json
+++ b/plugins/home-page/package.json
@@ -7,7 +7,7 @@
   "private": true,
   "scripts": {
     "build:watch": "backstage-cli plugin:build --watch",
-    "build": "backstage-cli build-cache -- backstage-cli plugin:build",
+    "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test"
   },
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 8eb9f45f7f..f7e317ce54 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -7,7 +7,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "build:watch": "backstage-cli plugin:build --watch",
-    "build": "backstage-cli build-cache -- backstage-cli plugin:build",
+    "build": "backstage-cli plugin:build",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test"
   },