From 58f91943ab88367310952d0b184b4ad2d67cd554 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 27 Sep 2021 22:16:17 +0200
Subject: [PATCH] cli: improve package.json files diff

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/little-cobras-think.md     |  5 ++++
 packages/cli/src/lib/diff/handlers.ts | 38 ++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/little-cobras-think.md

diff --git a/.changeset/little-cobras-think.md b/.changeset/little-cobras-think.md
new file mode 100644
index 0000000000..e90c7e979c
--- /dev/null
+++ b/.changeset/little-cobras-think.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Improved ´plugin:diff´ check for the `package.json` `"files"` field.
diff --git a/packages/cli/src/lib/diff/handlers.ts b/packages/cli/src/lib/diff/handlers.ts
index 4a17125e5a..046cc9a309 100644
--- a/packages/cli/src/lib/diff/handlers.ts
+++ b/packages/cli/src/lib/diff/handlers.ts
@@ -123,11 +123,41 @@ class PackageJsonHandler {
   }
 
   private async syncFiles() {
-    if (typeof this.targetPkg.configSchema === 'string') {
-      const files = [...this.pkg.files, this.targetPkg.configSchema];
-      await this.syncField('files', { files });
+    const { configSchema } = this.targetPkg;
+    const hasSchemaFile = typeof configSchema === 'string';
+
+    if (!this.targetPkg.files) {
+      const expected = hasSchemaFile ? ['dist', configSchema] : ['dist'];
+      if (
+        await this.prompt(
+          `package.json is missing field "files", set to ${JSON.stringify(
+            expected,
+          )}?`,
+        )
+      ) {
+        this.targetPkg.files = expected;
+        await this.write();
+      }
     } else {
-      await this.syncField('files');
+      const missing = [];
+      if (!this.targetPkg.files.includes('dist')) {
+        missing.push('dist');
+      }
+      if (hasSchemaFile && !this.targetPkg.files.includes(configSchema)) {
+        missing.push(configSchema);
+      }
+      if (missing.length) {
+        if (
+          await this.prompt(
+            `package.json is missing ${JSON.stringify(
+              missing,
+            )} in the "files" field, add?`,
+          )
+        ) {
+          this.targetPkg.files.push(...missing);
+          await this.write();
+        }
+      }
     }
   }