From 75f894bf6c0d58ce24f9d5a6bf453e6471cbb66e Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@joost.at>
Date: Thu, 23 Jun 2022 16:48:19 +0200
Subject: [PATCH] fix(new-design): Avoid issues with package.json files in
 templates

---
 packages/new-design/lib/utils.mjs                     | 11 ++++++++++-
 .../from-bella/{package.json => _package.json}        |  0
 .../from-bent/{package.json => _package.json}         |  0
 .../from-breanna/{package.json => _package.json}      |  0
 .../from-brian/{package.json => _package.json}        |  0
 .../from-scratch/{package.json => _package.json}      |  0
 .../from-titan/{package.json => _package.json}        |  0
 7 files changed, 10 insertions(+), 1 deletion(-)
 rename packages/new-design/templates/from-bella/{package.json => _package.json} (100%)
 rename packages/new-design/templates/from-bent/{package.json => _package.json} (100%)
 rename packages/new-design/templates/from-breanna/{package.json => _package.json} (100%)
 rename packages/new-design/templates/from-brian/{package.json => _package.json} (100%)
 rename packages/new-design/templates/from-scratch/{package.json => _package.json} (100%)
 rename packages/new-design/templates/from-titan/{package.json => _package.json} (100%)

diff --git a/packages/new-design/lib/utils.mjs b/packages/new-design/lib/utils.mjs
index bfea1ef2bc1..2b9ed474b46 100644
--- a/packages/new-design/lib/utils.mjs
+++ b/packages/new-design/lib/utils.mjs
@@ -107,7 +107,16 @@ const copyTemplate = async (config, choices) => {
 
   // Template files
   for (const from of config.files.template) {
-    const to = join(config.dest, from.slice(config.source.template.length -7))
+    /*
+     * We can't include a package.json file in the templates
+     * because doing so will prevent NPM from including those folders
+     * in our package. So we use _package.json, and if we see that we
+     * rename it here to package.json
+     */
+    let to = join(config.dest, from.slice(config.source.template.length -7))
+    if (to.slice(-13) === '_package.json') {
+      to = to.slice(0, -13) + 'package.json'
+    }
     if (!dirs[to]) await ensureDir(to)
     if ([ 'config.js', 'kage.json'].indexOf(from.slice(-9)) !== -1) {
       // Template out file rather than coy it
diff --git a/packages/new-design/templates/from-bella/package.json b/packages/new-design/templates/from-bella/_package.json
similarity index 100%
rename from packages/new-design/templates/from-bella/package.json
rename to packages/new-design/templates/from-bella/_package.json
diff --git a/packages/new-design/templates/from-bent/package.json b/packages/new-design/templates/from-bent/_package.json
similarity index 100%
rename from packages/new-design/templates/from-bent/package.json
rename to packages/new-design/templates/from-bent/_package.json
diff --git a/packages/new-design/templates/from-breanna/package.json b/packages/new-design/templates/from-breanna/_package.json
similarity index 100%
rename from packages/new-design/templates/from-breanna/package.json
rename to packages/new-design/templates/from-breanna/_package.json
diff --git a/packages/new-design/templates/from-brian/package.json b/packages/new-design/templates/from-brian/_package.json
similarity index 100%
rename from packages/new-design/templates/from-brian/package.json
rename to packages/new-design/templates/from-brian/_package.json
diff --git a/packages/new-design/templates/from-scratch/package.json b/packages/new-design/templates/from-scratch/_package.json
similarity index 100%
rename from packages/new-design/templates/from-scratch/package.json
rename to packages/new-design/templates/from-scratch/_package.json
diff --git a/packages/new-design/templates/from-titan/package.json b/packages/new-design/templates/from-titan/_package.json
similarity index 100%
rename from packages/new-design/templates/from-titan/package.json
rename to packages/new-design/templates/from-titan/_package.json